- Backported fixes from opensides for lintian warnings

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

diff --git a/gosa-core/debian/control b/gosa-core/debian/control
index 8a9e556e5dbdaf1a1ab046917c25fb96d7659739..2378c310e41c042439569d8a31395a5e8a096d56 100644 (file)
--- a/gosa-core/debian/control
+++ b/gosa-core/debian/control
@@ -3,7 +3,8 @@ Section: web
 Priority: optional
 Maintainer: GOsa packages mainteners group <gosa-pkg@oss.gonicus.de>
 Uploaders: Cajus Pollmeier <cajus@debian.org>, Benoit Mortier <benoit.mortier@opensides.be>
-Build-Depends: debhelper (>= 5), dpatch, po-debconf
+Build-Depends: debhelper (>= 5), dpatch
+Build-Depends-Indep: po-debconf
 Standards-Version: 3.8.3
 Homepage: https://oss.gonicus.de/labs/gosa/
 Vcs-Browser: https://oss.gonicus.de/repositories/gosa/trunk

diff --git a/gosa-core/debian/copyright b/gosa-core/debian/copyright
index f7706ed77281edce484ad0c9b3caa82a9ba0b71e..807742074166c835c710f9f9fc4a4116cf12e1b2 100644 (file)
--- a/gosa-core/debian/copyright
+++ b/gosa-core/debian/copyright
@@ -24,8 +24,8 @@ License:
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-The Debian packaging is (C) 2008, Cajus Pollmeier <cajus@debian.org> and
+The Debian packaging is Copyright (C) 2008, Cajus Pollmeier <cajus@debian.org> and
 is licensed under the GPL, see above.
 

diff --git a/gosa-core/debian/gosa-desktop.config b/gosa-core/debian/gosa-desktop.config
index 85204c8971bd65b9d1741b59e3f2aafd98d99b12..2b251a7fc2d8cc678e33c046bd902654fbca68f5 100644 (file)
--- a/gosa-core/debian/gosa-desktop.config
+++ b/gosa-core/debian/gosa-desktop.config
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+set -e
+
 # Source debconf library.
 . /usr/share/debconf/confmodule
 

diff --git a/gosa-core/debian/gosa-desktop.desktop b/gosa-core/debian/gosa-desktop.desktop
index 18749eaf812d43b36da3d5bad8e186eae1aa0d60..1ff534edf76102030d17e0bcd1de9a62623912f7 100644 (file)
--- a/gosa-core/debian/gosa-desktop.desktop
+++ b/gosa-core/debian/gosa-desktop.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
-MimeType=text/plain
+MimeType=text/plain;
 GenericName=GOsa²
 Exec=/usr/bin/gosa
 Icon=gosa
-Path=
+Path=/usr/bin
 Type=Application
 Terminal=false
 Name=GOsa

diff --git a/gosa-core/debian/gosa-desktop.postinst b/gosa-core/debian/gosa-desktop.postinst
index 6eb0f922f0b63b60d03a231d4fc1f1410881d33f..cd8b7792ed76a9f670df26d74ff01a5ae64d4c2a 100644 (file)
--- a/gosa-core/debian/gosa-desktop.postinst
+++ b/gosa-core/debian/gosa-desktop.postinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 #DEBHELPER#
 

diff --git a/gosa-core/debian/gosa-desktop.postrm b/gosa-core/debian/gosa-desktop.postrm
index b1329005f21367729b18aa02100d89cdd4d539c8..8c3d081cfe98a7607014e0959b4c7128da0841d5 100644 (file)
--- a/gosa-core/debian/gosa-desktop.postrm
+++ b/gosa-core/debian/gosa-desktop.postrm
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 #DEBHELPER#