@@ -1,3 +1,22 @@

+userv (1.0.1.99.1) unstable; urgency=low
+
+  Debian packaging improvements:
+  * Standards-Version 3.6.1.
+  * /etc/init.d/userv nicer output: colons, . printed after done.
+  * Maintainer scripts use invoke-rc.d if it's available.
+  * Maintainer scripts discard stdout from update-rc.d.
+  * No more messing with /usr/doc, must have /usr/share/doc.
+  * Support unstripped binaries in the .deb, with DEB_BUILD_OPTIONS.
+  * Fixed typo in debian/copyright.
+  * When doing /etc/init.d/userv restart, don't mind if not already
+    running.
+  * debian/rules clean removes whole spec.html subdirectory.
+  * Ship spec.ps (Closes: #210859)
+  * added lintian override for suid binary userv (Closes: #211055)
+  (Thanks to Martin Pitt's NMU for inspirations and one-liners.)
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Fri, 31 Oct 2003 22:55:37 +0000
+
 userv (1.0.1.99.0) unstable; urgency=low

   Bugfixes:

diff --git a/debian/changelog b/debian/changelog
index 95df7f509d3fa4f1f3a2feb94f3c33bf310b260c..f168fc55f0803d2dc05a1e28f47451249647a4a1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+userv (1.0.1.99.1) unstable; urgency=low
+
+  Debian packaging improvements:
+  * Standards-Version 3.6.1.
+  * /etc/init.d/userv nicer output: colons, . printed after done.
+  * Maintainer scripts use invoke-rc.d if it's available.
+  * Maintainer scripts discard stdout from update-rc.d.
+  * No more messing with /usr/doc, must have /usr/share/doc.
+  * Support unstripped binaries in the .deb, with DEB_BUILD_OPTIONS.
+  * Fixed typo in debian/copyright.
+  * When doing /etc/init.d/userv restart, don't mind if not already
+    running.
+  * debian/rules clean removes whole spec.html subdirectory.
+  * Ship spec.ps (Closes: #210859)
+  * added lintian override for suid binary userv (Closes: #211055)
+  (Thanks to Martin Pitt's NMU for inspirations and one-liners.)
+  
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Fri, 31 Oct 2003 22:55:37 +0000
+
 userv (1.0.1.99.0) unstable; urgency=low
 
   Bugfixes:

diff --git a/debian/control b/debian/control
index 8fa75469d5b152c1f1cba26e63f6c9fcbddd9252..6bf5d861d81c6945304c2af1975a83628c875afe 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: userv
 Section: admin
 Priority: optional
 Maintainer: Ian Jackson <ian@davenant.greenend.org.uk>
-Standards-Version: 2.1.1.0
 Build-Depends: debiandoc-sgml, tetex-bin
+Standards-Version: 3.6.1
 
 Package: userv
 Architecture: any

diff --git a/debian/copyright b/debian/copyright
index 41b1bb3b56b5b6ac1741f53d6f15d051f32e84d4..2ebce1bb0c7b90851643611958a58b5b408298b4 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-This is Debian/GNU Linux's prepackaged version of Ian Jackson's
+This is Debian GNU/Linux's prepackaged version of Ian Jackson's
 `userv' system utility.
 
 This package was put together from the upstream sources by the

diff --git a/debian/initd b/debian/initd
index 4a01629e280ba3acd21368960e0a68a7ef6047c5..11d5637b9979064e055c3e3195105f3a63a1c2ce 100644 (file)
--- a/debian/initd
+++ b/debian/initd
@@ -4,23 +4,30 @@ test -f /usr/sbin/uservd || exit 0
 
 case "$1" in
 start)
-       echo "Starting user services daemon uservd"
+       echo -n "Starting user services daemon: uservd"
        start-stop-daemon --start --quiet --exec /usr/sbin/uservd -- -daemon
+       echo "."
        ;;
+
 stop)
-       echo "Stopping user services daemon uservd"
+       echo -n "Stopping user services daemon: uservd"
        start-stop-daemon --stop --quiet --user root --exec /usr/sbin/uservd
+       echo "."
        ;;
+
 restart)
-       echo "Restarting user services daemon uservd"
-       start-stop-daemon --stop --quiet --user root --exec /usr/sbin/uservd
+       echo -n "Restarting user services daemon: uservd"
+       start-stop-daemon --stop --oknodo --quiet --user root \
+               --exec /usr/sbin/uservd
        sleep 1
        start-stop-daemon --start --quiet --exec /usr/sbin/uservd -- -daemon
+       echo "."
        ;;
+
 reload | force-reload)
        ;;
 *)
-       echo "Usage: /etc/init.d/userv {start|stop|reload}"
+       echo "Usage: /etc/init.d/userv {start|stop|restart|reload|force-reload}"
        exit 1
 esac
 

diff --git a/debian/lintian b/debian/lintian
new file mode 100644 (file)
index 0000000..b497efa
--- /dev/null
+++ b/debian/lintian
@@ -0,0 +1 @@
+userv: setuid-binary usr/bin/userv 4755 root/root

diff --git a/debian/postinst b/debian/postinst
index 8e10e0e8b08f08e59e00046c0daee01c731145fe..0341112c35655a66cd1b5c77bea87a955534d0ed 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,11 +1,9 @@
 #!/bin/sh
 set -e
-update-rc.d userv defaults 19 50
-/etc/init.d/userv start >/dev/null
+update-rc.d userv defaults 19 50 > /dev/null
 
-if [ "$1" = "configure" ]; then
- if [ -d /usr/doc -a ! -e /usr/doc/userv -a -d /usr/share/doc/userv ]; then
-   ln -sf ../share/doc/userv /usr/doc/userv
-  fi
+if type -p invoke-rc.d >/dev/null 2>&1; then
+    invoke-rc.d userv start
+else
+    /etc/init.d/userv start
 fi
-

diff --git a/debian/postrm b/debian/postrm
index caab5529f12a7fc4c6a1d88addfe4ed64947fe99..9072e11bf62eafc6733aa63f093cee8481871c25 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -2,5 +2,5 @@
 set -e
 if test "$1" = purge
 then
-       update-rc.d userv remove
+       update-rc.d userv remove >/dev/null
 fi

diff --git a/debian/prerm b/debian/prerm
index cfb68f1ee006b6cebf6f4c6dd0a4e4242eea996c..fb21d38f71ece0c97b5721323a07f2d3a4c2313c 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,8 +1,11 @@
 #!/bin/sh
 set -e
-/etc/init.d/userv stop >/dev/null
+if type -p invoke-rc.d >/dev/null 2>&1; then
+       invoke-rc.d userv stop
+else
+       /etc/init.d/userv stop
+fi
 
 if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/userv ]; then
-   rm -f /usr/doc/userv
+       rm -f /usr/doc/userv
 fi
-

diff --git a/debian/rules b/debian/rules
index 66c929984674d24c40b1eda14cb9d380bc378067..bdd1fa991a2563431d219f62e07b745a69a62fc3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,14 @@
 
 package=userv
 
+t=debian/tmp
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+       INSTOPTS= LDFLAGS=-s INSTALL_PROGRAM='install -c -s'
+else
+       INSTOPTS= INSTALL_PROGRAM='install -c'
+endif
+
 build:
        $(checkdir)
        ./configure --prefix=/usr
@@ -12,7 +20,8 @@ clean:
        $(checkdir)
        -rm -f build
        -$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean
-       -rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars*
+       -rm -rf *~ $t debian/*~ debian/files* debian/substvars*
+       -rm -rf spec.html
 
 binary-indep:  checkroot build
        $(checkdir)
@@ -22,36 +31,35 @@ binary-indep:       checkroot build
 
 binary-arch:   checkroot build
        $(checkdir)
-       -rm -rf debian/tmp
-       install -d debian/tmp/{DEBIAN,etc/init.d} debian/tmp/usr/{sbin,bin}
-       install -d debian/tmp/etc/userv/{override,default}.d
-       install -d debian/tmp/usr/doc/$(package)/examples/
-       install -d debian/tmp/var/run/$(package)/
-       cp debian/{postinst,prerm,postrm,conffiles} debian/tmp/DEBIAN/.
-       cp debian/initd debian/tmp/etc/init.d/userv
-       chmod 755 debian/tmp/DEBIAN/{postinst,prerm,postrm}
-       chmod 755 debian/tmp/etc/init.d/userv
-       $(MAKE) LDFLAGS=-s INSTALL_PROGRAM='install -c -s' \
-               prefix=debian/tmp/usr etcdir=debian/tmp/etc \
-               docdir=debian/tmp/usr/doc/userv \
+       -rm -rf $t
+       install -d $t/{DEBIAN,etc/init.d} $t/usr/{sbin,bin}
+       install -d $t/etc/userv/{override,default}.d
+       install -d $t/usr/share/doc/$(package)/examples/
+       install -d $t/var/run/$(package)/
+       install -d $t/usr/share/lintian/overrides/
+       cp debian/{postinst,prerm,postrm,conffiles} $t/DEBIAN/.
+       cp debian/initd $t/etc/init.d/userv
+       chmod 755 $t/DEBIAN/{postinst,prerm,postrm}
+       chmod 755 $t/etc/init.d/userv
+       $(MAKE) $(INSTOPTS) \
+               prefix=$t/usr etcdir=$t/etc \
+               docdir=$t/usr/share/doc/userv \
+               mandir=$t/usr/share/man \
                install install-doc
-       cp debian/copyright debian/tmp/usr/doc/$(package)/.
-       cp debian/changelog debian/tmp/usr/doc/$(package)/changelog
-       cp README debian/tmp/usr/doc/$(package)/README.upstream
-       cp system.default system.override debian/tmp/usr/doc/$(package)/examples
-       ln -s changelog.gz debian/tmp/usr/doc/$(package)/changelog.Debian.gz
-       gzip -9v debian/tmp/usr/doc/$(package)/changelog debian/tmp/usr/man/man1/*.1
-       rm debian/tmp/usr/doc/userv/*.ps
-       -mkdir -p -m 0755 debian/tmp/usr/share/doc
-       mv debian/tmp/usr/doc/* debian/tmp/usr/share/doc/
-       mv debian/tmp/usr/man debian/tmp/usr/share/man
-       rm -rf debian/tmp/usr/doc
+       cp debian/copyright $t/usr/share/doc/$(package)/.
+       cp debian/changelog $t/usr/share/doc/$(package)/changelog
+       cp README $t/usr/share/doc/$(package)/README.upstream
+       cp system.default system.override $t/usr/share/doc/$(package)/examples
+       ln -s changelog.gz $t/usr/share/doc/$(package)/changelog.Debian.gz
+       gzip -9v $t/usr/share/doc/$(package)/changelog \
+               $t/usr/share/man/man1/*.1 $t/usr/share/doc/userv/*.ps
+       cp debian/lintian $t/usr/share/lintian/overrides/userv
        dpkg-shlibdeps daemon client
        dpkg-gencontrol -isp
-       chown -R root.root debian/tmp
-       chmod -R og=rX debian/tmp
-       chmod 700 debian/tmp/var/run/userv
-       dpkg --build debian/tmp ..
+       chown -R root.root $t
+       chmod -R og=rX $t
+       chmod 700 $t/var/run/userv
+       dpkg --build $t ..
 
 define checkdir
        test -f overlord.c -a -f lexer.l.m4 -a -f debian/rules