- Removed obslete linda file

- Backported fixes for debian menu from trunk

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@12121 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/debian/gosa-desktop.menu b/debian/gosa-desktop.menu
index ba39a861c0abe56628ac2ee0346db3646b1a01cd..d47e0d096f8393dc194c058226b1b0e09bc08186 100644 (file)
--- a/debian/gosa-desktop.menu
+++ b/debian/gosa-desktop.menu
@@ -1,6 +1,6 @@
 ?package(gosa-desktop):\
        needs="x11"\
-       section="Apps/System"\
+       section="Applications/System/Administration"\
        hints="KDE"\
         icon32x32="/usr/share/pixmaps/gosa.xpm"\
         icon16x16="/usr/share/pixmaps/gosa-16.xpm"\

diff --git a/debian/overrides-linda b/debian/overrides-linda
deleted file mode 100644 (file)
index 04c158c..0000000
--- a/debian/overrides-linda
+++ /dev/null
@@ -1,8 +0,0 @@
-Tag: extra-license-file
-Data: /usr/share/gosa/setup/class_setupStep_License.inc
-
-Tag: extra-license-file
-Data: /usr/share/gosa/setup/license.txt
-
-Tag: extra-license-file
-Data: /usr/share/gosa/setup/setup_license.tpl

diff --git a/debian/rules b/debian/rules
index 8654e0f250cd72db7650263de8f27c3bd3f258ca..9977415ed48c3b619be3ace4a781f444c3b1fba0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -102,7 +102,6 @@ install-stamp:
                mv debian/gosa/usr/share/gosa/include/php_setup.inc.new debian/gosa/usr/share/gosa/include/php_setup.inc; \
        fi
        install -D -m 644 debian/overrides-lintian debian/gosa/usr/share/lintian/overrides/gosa
-       install -D -m 644 debian/overrides-linda debian/gosa/usr/share/linda/overrides/gosa
        touch install-stamp
 
 patch: patch-stamp