From e61a4ddd2f7f1fb7cfffab45442769b24d8b19fe Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Wed, 12 May 2010 12:54:20 +0200 Subject: [PATCH] lintian cleanup --- debian/bsdutils.dirs | 1 + debian/bsdutils.lintian-overrides | 1 + debian/control | 26 +++++++++---------- debian/hwclock.sh | 2 +- debian/mount.dirs | 1 + ...ntian-override => mount.lintian-overrides} | 1 - debian/rules | 3 ++- debian/util-linux.lintian-overrides | 1 + debian/util-linux.postrm | 6 ++--- debian/uuid-runtime.dirs | 1 + 10 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 debian/bsdutils.lintian-overrides rename debian/{lintian-override => mount.lintian-overrides} (64%) create mode 100644 debian/util-linux.lintian-overrides create mode 100644 debian/uuid-runtime.dirs diff --git a/debian/bsdutils.dirs b/debian/bsdutils.dirs index 57a11054..59cdba95 100644 --- a/debian/bsdutils.dirs +++ b/debian/bsdutils.dirs @@ -7,3 +7,4 @@ usr/share/man/man8/ usr/share/man/man1/ usr/share/doc/ usr/share/doc/bsdutils/ +usr/share/lintian/overrides/ diff --git a/debian/bsdutils.lintian-overrides b/debian/bsdutils.lintian-overrides new file mode 100644 index 00000000..e57e60b0 --- /dev/null +++ b/debian/bsdutils.lintian-overrides @@ -0,0 +1 @@ +bsdutils: setgid-binary usr/bin/wall 2755 root/tty diff --git a/debian/control b/debian/control index 76a47094..316dbe70 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Architecture: any Section: utils Priority: required Essential: yes -Depends: lsb-base (>= 3.0-6), tzdata (>=2006c-2) +Depends: lsb-base (>= 3.0-6), tzdata (>=2006c-2), install-info, ${misc:Depends} Pre-Depends: ${shlibs:Depends} Suggests: util-linux-locales, kbd | console-tools, dosfstools Replaces: schedutils, miscutils, setterm, fdisk, linux32, sparc-utils, e2fsprogs, ${util-linux:Conflicts} @@ -29,7 +29,7 @@ Package: util-linux-locales Architecture: all Section: utils Priority: optional -Depends: util-linux (>= ${Upstream}-0), util-linux (<< ${Upstream}.0-0) +Depends: util-linux (>= ${Upstream}-0), util-linux (<< ${Upstream}.0-0), ${misc:Depends} Replaces: util-linux (<< 2.11b) Description: Locales files for util-linux This package contains the internationalization files of for the util-linux @@ -52,7 +52,7 @@ Package: bsdutils Architecture: any Essential: yes Section: utils -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: bsdmainutils Description: Basic utilities from 4.4BSD-Lite This package contains the bare minimum number of BSD utilities needed @@ -63,7 +63,7 @@ Package: fdisk-udeb Architecture: alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 sh4 sparc s390 Priority: extra Section: debian-installer -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} XC-Package-Type: udeb XB-Installer-Menu-Item: 99999 Description: Manually partition a hard drive (fdisk) @@ -72,7 +72,7 @@ Package: cfdisk-udeb Architecture: alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 sh4 s390 Priority: extra Section: debian-installer -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} XC-Package-Type: udeb XB-Installer-Menu-Item: 99999 Description: Manually partition a hard drive (cfdisk) @@ -80,7 +80,7 @@ Description: Manually partition a hard drive (cfdisk) Package: libblkid1 Section: libs Priority: required -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Architecture: any Description: block device id library The blkid library which allows system programs like fsck and @@ -93,7 +93,7 @@ Package: libblkid1-udeb XC-Package-Type: udeb Section: debian-installer Priority: optional -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Architecture: any Description: block device id library The blkid library which allows system programs like fsck and @@ -107,7 +107,7 @@ Description: block device id library Package: libblkid-dev Section: libdevel Priority: extra -Depends: libc6-dev | libc-dev, libblkid1 (= ${binary:Version}), uuid-dev +Depends: libc6-dev | libc-dev, libblkid1 (= ${binary:Version}), uuid-dev, ${misc:Depends} Architecture: any Description: block device id library - headers and static libraries The blkid library which allows system programs like fsck and @@ -120,7 +120,7 @@ Description: block device id library - headers and static libraries Package: libuuid1 Section: libs -Depends: passwd, ${shlibs:Depends} +Depends: passwd, ${shlibs:Depends}, ${misc:Depends} Recommends: uuid-runtime Replaces: e2fsprogs (<< 1.34-1) Architecture: any @@ -137,7 +137,7 @@ Description: Universally Unique ID library Package: uuid-runtime Section: libs Priority: optional -Depends: passwd, libuuid1 (>> 1.40.3-1), ${shlibs:Depends} +Depends: passwd, libuuid1 (>> 1.40.3-1), ${shlibs:Depends}, ${misc:Depends} Replaces: e2fsprogs (<= 1.40.3-1ubuntu1) Architecture: any Description: runtime components for the Universally Unique ID library @@ -162,7 +162,7 @@ Package: libuuid1-udeb XC-Package-Type: udeb Section: debian-installer Priority: optional -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Architecture: any Description: stripped down universally unique id library, for debian-installer libuuid generates and parses 128-bit universally unique ids (UUIDs). @@ -173,7 +173,7 @@ Description: stripped down universally unique id library, for debian-installer Package: uuid-dev Section: libdevel Priority: extra -Depends: libc6-dev | libc-dev, libuuid1 (= ${binary:Version}) +Depends: libc6-dev | libc-dev, libuuid1 (= ${binary:Version}), ${misc:Depends} Replaces: e2fslibs-dev (<< 1.15) Architecture: any Description: universally unique id library - headers and static libraries @@ -186,7 +186,7 @@ Package: util-linux-udeb Architecture: any Priority: optional Section: debian-installer -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} XC-Package-Type: udeb Description: Miscellaneous system utilities This is a minimal version of util-linux for debian-installer. It only diff --git a/debian/hwclock.sh b/debian/hwclock.sh index d5002878..fafd3c9f 100644 --- a/debian/hwclock.sh +++ b/debian/hwclock.sh @@ -18,7 +18,7 @@ ### BEGIN INIT INFO # Provides: hwclock -# Required-Start: checkroot +# Required-Start: $local_fs # Required-Stop: $local_fs # Default-Start: S # Default-Stop: 0 6 diff --git a/debian/mount.dirs b/debian/mount.dirs index d96dbaa5..93485796 100644 --- a/debian/mount.dirs +++ b/debian/mount.dirs @@ -8,3 +8,4 @@ usr/share/man/man5/ usr/share/doc/ usr/share/doc/mount/ usr/share/doc/mount/examples/ +usr/share/lintian/overrides/ diff --git a/debian/lintian-override b/debian/mount.lintian-overrides similarity index 64% rename from debian/lintian-override rename to debian/mount.lintian-overrides index 674a7185..1a9f42de 100644 --- a/debian/lintian-override +++ b/debian/mount.lintian-overrides @@ -1,3 +1,2 @@ mount: setuid-binary bin/mount 4755 root/root mount: setuid-binary bin/umount 4755 root/root -bsdutils: setgid-binary usr/bin/wall 2755 root/tty diff --git a/debian/rules b/debian/rules index 70c8a3e1..33283bc4 100755 --- a/debian/rules +++ b/debian/rules @@ -71,6 +71,7 @@ install: build dh_installmenu -i -s dh_installcron -i -s dh_installinfo -i -s + rm -f debian/util-linux/usr/share/info/dir debian/util-linux/usr/share/info/dir.gz dh_installchangelogs docs/v*-ReleaseNotes -i -s dh_movefiles --sourcedir=debian/util-linux -i -s # @@ -101,7 +102,7 @@ endif # mv debian/util-linux/usr/share/getopt/* debian/util-linux/usr/share/doc/util-linux/examples rmdir debian/util-linux/usr/share/getopt - install -m 644 debian/lintian-override debian/util-linux/usr/share/lintian/overrides/util-linux + for pkg in bsdutils mount uuid-runtime; do install -m 644 debian/$${pkg}.lintian-overrides debian/$${pkg}/usr/share/lintian/overrides/$${pkg}; done install -m 644 debian/mime.util-linux debian/util-linux/usr/lib/mime/packages/util-linux if [ -f debian/util-linux/sbin/hwclock ] ; then \ install -m 755 debian/hwclock.sh debian/util-linux/etc/init.d/hwclock.sh; \ diff --git a/debian/util-linux.lintian-overrides b/debian/util-linux.lintian-overrides new file mode 100644 index 00000000..bcb81f20 --- /dev/null +++ b/debian/util-linux.lintian-overrides @@ -0,0 +1 @@ +util-linux: init.d-script-possible-missing-stop diff --git a/debian/util-linux.postrm b/debian/util-linux.postrm index 5e02ad26..f12aa29a 100644 --- a/debian/util-linux.postrm +++ b/debian/util-linux.postrm @@ -1,11 +1,11 @@ -#!/bin/sh +#!/bin/sh -e case "$1" in remove) ;; purge) - update-rc.d hwclock.sh remove >/dev/null - update-rc.d hwclockfirst.sh remove >/dev/null + update-rc.d hwclock.sh remove >/dev/null || true + update-rc.d hwclockfirst.sh remove >/dev/null || true rm -f /etc/adjtime ;; *) diff --git a/debian/uuid-runtime.dirs b/debian/uuid-runtime.dirs new file mode 100644 index 00000000..dc1b1585 --- /dev/null +++ b/debian/uuid-runtime.dirs @@ -0,0 +1 @@ +usr/share/lintian/overrides/ -- 2.39.5