From 57ab1a3ad66b350a04304bacb7c2af8aa8928de3 Mon Sep 17 00:00:00 2001 From: opensides Date: Sat, 28 Nov 2009 18:50:24 +0000 Subject: [PATCH] - Backported fixes from opensides for lintian warnings git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14845 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/debian/control | 3 ++- gosa-core/debian/copyright | 4 ++-- gosa-core/debian/gosa-desktop.config | 2 ++ gosa-core/debian/gosa-desktop.desktop | 5 ++--- gosa-core/debian/gosa-desktop.postinst | 4 +++- gosa-core/debian/gosa-desktop.postrm | 4 +++- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/gosa-core/debian/control b/gosa-core/debian/control index 8a9e556e5..2378c310e 100644 --- a/gosa-core/debian/control +++ b/gosa-core/debian/control @@ -3,7 +3,8 @@ Section: web Priority: optional Maintainer: GOsa packages mainteners group Uploaders: Cajus Pollmeier , Benoit Mortier -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 f7706ed77..807742074 100644 --- 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 and +The Debian packaging is Copyright (C) 2008, Cajus Pollmeier 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 85204c897..2b251a7fc 100644 --- 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 18749eaf8..1ff534edf 100644 --- 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 6eb0f922f..cd8b7792e 100644 --- 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 b1329005f..8c3d081cf 100644 --- 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# -- 2.30.2