[Pkg-utopia-commits] r2279 - in /packages/unstable/avahi/debian: avahi-daemon.postinst avahi-dnsconfd.postinst changelog rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri May 30 06:16:42 2008
New Revision: 2279

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2279
Log:
* debian/avahi-{daemon,dnsconfd}.postinst
  - Remove old start/stop symlinks, so they are properly updated on package
    upgrades.
* debian/rules
  - Start avahi-daemon at priority 14, stop it at 86.
    Services like CUPS can utilize avahi if it is running, so avahi-daemon
    has to be started earlier in the boot sequence.
  - Start avahi-dnsconfd at priority 16, stop it at 84. avahi-dnsconfd
    requires avahi-daemon, so it has to start after it.

Added:
    packages/unstable/avahi/debian/avahi-dnsconfd.postinst
Modified:
    packages/unstable/avahi/debian/avahi-daemon.postinst
    packages/unstable/avahi/debian/changelog
    packages/unstable/avahi/debian/rules

Modified: packages/unstable/avahi/debian/avahi-daemon.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-daemon.postinst?rev=2279&op=diff
==============================================================================
--- packages/unstable/avahi/debian/avahi-daemon.postinst (original)
+++ packages/unstable/avahi/debian/avahi-daemon.postinst Fri May 30 06:16:42 2008
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for avahi
+# postinst script for avahi-daemon
 
 set -e
 
@@ -31,6 +31,15 @@
       addgroup --quiet --system netdev || true
     fi
 
+    # update init script symlinks for new runlevels and priorities for upgrades
+    # from older versions
+    if dpkg --compare-versions "$2" lt-nl 0.6.22-4; then
+      echo "Reinstalling init script for new runlevels and priorities ..." >&2
+      # remove old init script symlinks; dh_installinit adds the proper
+      # update-rc.d snippet later on
+      update-rc.d -f avahi-daemon remove >/dev/null
+    fi
+ 
     # Ask the bus to reload the config file
     if [ -x "/etc/init.d/dbus" ]; then
       invoke-rc.d dbus force-reload || true

Added: packages/unstable/avahi/debian/avahi-dnsconfd.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-dnsconfd.postinst?rev=2279&op=file
==============================================================================
--- packages/unstable/avahi/debian/avahi-dnsconfd.postinst (added)
+++ packages/unstable/avahi/debian/avahi-dnsconfd.postinst Fri May 30 06:16:42 2008
@@ -1,0 +1,16 @@
+#!/bin/sh
+# postinst script for avahi-dnsconfd
+
+set -e
+
+# update init script symlinks for new runlevels and priorities for upgrades
+# from older versions
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 0.6.22-4; then
+  echo "Reinstalling init script for new runlevels and priorities ..." >&2
+  # remove old init script symlinks; dh_installinit adds the proper
+  # update-rc.d snippet later on
+  update-rc.d -f avahi-dnsconfd remove >/dev/null
+fi
+
+#DEBHELPER#
+

Modified: packages/unstable/avahi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/changelog?rev=2279&op=diff
==============================================================================
--- packages/unstable/avahi/debian/changelog (original)
+++ packages/unstable/avahi/debian/changelog Fri May 30 06:16:42 2008
@@ -1,8 +1,17 @@
-avahi (0.6.22-3.1) UNRELEASED; urgency=high
+avahi (0.6.22-4) UNRELEASED; urgency=high
 
   [ Michael Biebl ]
   * debian/control
     - Add Build-Depends on pkg-config.
+  * debian/avahi-{daemon,dnsconfd}.postinst
+    - Remove old start/stop symlinks, so they are properly updated on package
+      upgrades.
+  * debian/rules
+    - Start avahi-daemon at priority 14, stop it at 86.
+      Services like CUPS can utilize avahi if it is running, so avahi-daemon
+      has to be started earlier in the boot sequence.
+    - Start avahi-dnsconfd at priority 16, stop it at 84. avahi-dnsconfd
+      requires avahi-daemon, so it has to start after it.
 
   [ Sjoerd Simons ]
   * debian/patches/01_avahi-daemon.conf.patch

Modified: packages/unstable/avahi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/rules?rev=2279&op=diff
==============================================================================
--- packages/unstable/avahi/debian/rules (original)
+++ packages/unstable/avahi/debian/rules Fri May 30 06:16:42 2008
@@ -22,7 +22,8 @@
   DEB_CONFIGURE_EXTRA_FLAGS += --disable-stack-protector
 endif
 
-DEB_DH_INSTALLINIT_ARGS := -- start 24 2 3 4 5 . stop 16 0 1 6 .
+DEB_UPDATE_RCD_PARAMS_avahi-daemon := start 14 2 3 4 5 . stop 86 0 1 6 .
+DEB_UPDATE_RCD_PARAMS_avahi-dnsconfd := start 16 2 3 4 5 . stop 84 0 1 6 .
 
 ifneq (linux,$(DEB_HOST_ARCH_OS))
 	DEB_CONFIGURE_EXTRA_FLAGS += --disable-autoipd