Package: dh-make Version: 0.41 Severity: minor Tags: patch Hi,
I made some cleanup of the the maintainer script templates: - indentation (no tabs!) - empty lines - typos - comments - forgotten may-be-called comment - use #PACKAGE# in module package postinst Now the scripts only produce minimal diffs when comparing them to each other. Andreas -- System Information: Debian Release: testing/unstable APT prefers testing APT policy: (500, 'testing'), (500, 'stable'), (300, 'unstable'), (30, 'experimental') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.16-1-vserver-k7 Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Versions of packages dh-make depends on: ii debhelper 5.0.35 helper programs for debian/rules ii dpkg-dev 1.13.19 package building tools for Debian ii make 3.81-2 The GNU version of the "make" util ii perl 5.8.8-4 Larry Wall's Practical Extraction dh-make recommends no packages. -- no debconf information
diff -ur lib.orig/debian/postinst.ex lib/debian/postinst.ex --- lib.orig/debian/postinst.ex 2006-06-02 13:02:45.000000000 +0200 +++ lib/debian/postinst.ex 2006-06-05 15:08:05.000000000 +0200 @@ -10,20 +10,19 @@ # * <old-postinst> `abort-upgrade' <new version> # * <conflictor's-postinst> `abort-remove' `in-favour' <package> # <new-version> +# * <postinst> `abort-remove' # * <deconfigured's-postinst> `abort-deconfigure' `in-favour' # <failed-install-package> <version> `removing' # <conflicting-package> <version> # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package -# + case "$1" in configure) - ;; abort-upgrade|abort-remove|abort-deconfigure) - ;; *) diff -ur lib.orig/debian/postrm.ex lib/debian/postrm.ex --- lib.orig/debian/postrm.ex 2006-06-02 13:02:45.000000000 +0200 +++ lib/debian/postrm.ex 2006-06-05 15:08:16.000000000 +0200 @@ -13,21 +13,20 @@ # * <new-postrm> `abort-install' # * <new-postrm> `abort-install' <old-version> # * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - - - ;; + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; *) echo "postrm called with unknown argument \`$1'" >&2 exit 1 - + ;; esac # dh_installdeb will replace this with shell code automatically @@ -36,3 +35,5 @@ #DEBHELPER# exit 0 + + diff -ur lib.orig/debian/preinst.ex lib/debian/preinst.ex --- lib.orig/debian/preinst.ex 2006-06-02 13:02:45.000000000 +0200 +++ lib/debian/preinst.ex 2006-06-05 15:07:54.000000000 +0200 @@ -10,7 +10,6 @@ # * <new-preinst> `install' <old-version> # * <new-preinst> `upgrade' <old-version> # * <old-preinst> `abort-upgrade' <new-version> -# # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package diff -ur lib.orig/debian/prerm.ex lib/debian/prerm.ex --- lib.orig/debian/prerm.ex 2006-06-02 13:02:45.000000000 +0200 +++ lib/debian/prerm.ex 2006-06-05 15:08:22.000000000 +0200 @@ -19,9 +19,11 @@ case "$1" in remove|upgrade|deconfigure) - ;; + ;; + failed-upgrade) - ;; + ;; + *) echo "prerm called with unknown argument \`$1'" >&2 exit 1 diff -ur lib.orig/debiank/package-modules-_KVERS_.postinst.modules.in.ex lib/debiank/package-modules-_KVERS_.postinst.modules.in.ex --- lib.orig/debiank/package-modules-_KVERS_.postinst.modules.in.ex 2006-06-02 13:02:45.000000000 +0200 +++ lib/debiank/package-modules-_KVERS_.postinst.modules.in.ex 2006-06-05 15:41:28.000000000 +0200 @@ -1,39 +1,40 @@ -#! /bin/sh +#!/bin/sh # postinst script for modules package built from #PACKAGE# +set -e + # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> # * <old-postinst> `abort-upgrade' <new version> # * <conflictor's-postinst> `abort-remove' `in-favour' <package> # <new-version> +# * <postinst> `abort-remove' # * <deconfigured's-postinst> `abort-deconfigure' `in-favour' # <failed-install-package> <version> `removing' # <conflicting-package> <version> # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package -# + case "$1" in configure) - if [ -x /usr/sbin/update-devfsd ] ; then - /usr/sbin/update-devfsd 2>/dev/null || true - fi - modprobe foo 2>/dev/null || modprobe bar 2>/dev/null || true - # start or restart after install or upgrade - if test -x /usr/sbin/daemon ; then - if ! -e /var/run/daemon.pid ; then - /etc/init.d/daemon start || true - else - if test -n "$2" ; then - /etc/init.d/daemon restart || true + if [ -x /usr/sbin/update-devfsd ] ; then + /usr/sbin/update-devfsd 2>/dev/null || true + fi + modprobe foo 2>/dev/null || modprobe bar 2>/dev/null || true + # start or restart after install or upgrade + if test -x /usr/sbin/#PACKAGE# ; then + if ! -e /var/run/#PACKAGE#.pid ; then + /etc/init.d/#PACKAGE# start || true + else + if test -n "$2" ; then + /etc/init.d/#PACKAGE# restart || true + fi fi - fi - fi - + fi ;; abort-upgrade|abort-remove|abort-deconfigure) - ;; *)
