[Pkg-utopia-commits] r1085 - packages/unstable/avahi/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2006-10-20 20:01:01 +0000 (Fri, 20 Oct 2006)
New Revision: 1085

Modified:
   packages/unstable/avahi/debian/avahi-autoipd.ifdown
   packages/unstable/avahi/debian/avahi-autoipd.ifup
   packages/unstable/avahi/debian/changelog
Log:
* debian/avahi-autoipd.ifup,
  debian/avahi-autoipd.ifdown,
  + Also recognize the NetworkManager method as valid for ipv4ll routes
 

Modified: packages/unstable/avahi/debian/avahi-autoipd.ifdown
===================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.ifdown	2006-10-20 17:29:31 UTC (rev 1084)
+++ packages/unstable/avahi/debian/avahi-autoipd.ifdown	2006-10-20 20:01:01 UTC (rev 1085)
@@ -10,7 +10,10 @@
 
 [ "$IFACE" != "lo" ] || exit 0
 [ "$ADDRFAM" = "inet" ] || exit 0
-[ "$METHOD" = "static" -o "$METHOD" = "dhcp" ] || exit 0
+case "$METHOD" in
+	static|dhcp|NetworkManager) ;;
+	*) exit 0
+esac
 
 if [ -x /bin/ip ]; then
 	# route already present?

Modified: packages/unstable/avahi/debian/avahi-autoipd.ifup
===================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.ifup	2006-10-20 17:29:31 UTC (rev 1084)
+++ packages/unstable/avahi/debian/avahi-autoipd.ifup	2006-10-20 20:01:01 UTC (rev 1085)
@@ -8,7 +8,10 @@
 
 [ "$IFACE" != "lo" ] || exit 0
 [ "$ADDRFAM" = "inet" ] || exit 0
-[ "$METHOD" = "static" -o "$METHOD" = "dhcp" ] || exit 0
+case "$METHOD" in
+	static|dhcp|NetworkManager) ;;
+	*) exit 0
+esac
 
 
 if [ -x /bin/ip ]; then

Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog	2006-10-20 17:29:31 UTC (rev 1084)
+++ packages/unstable/avahi/debian/changelog	2006-10-20 20:01:01 UTC (rev 1085)
@@ -1,5 +1,6 @@
 avahi (0.6.14-2) unstable; urgency=low
 
+  [ Sebastian Dröge ]
   * debian/control:
     + Update Standards-Version to 3.7.2
     + Recommend dhcp3-client instead of non-existing dhclient
@@ -25,7 +26,12 @@
       only have a routable address assigned.
       See http://developer.apple.com/qa/qa2004/qa1357.html for more information.
 
- -- Sebastian Dröge <slomo at ubuntu.com>  Tue, 17 Oct 2006 18:45:52 +0200
+  [ Sjoerd Simons ]
+  * debian/avahi-autoipd.ifup,
+    debian/avahi-autoipd.ifdown,
+    + Also recognize the NetworkManager method as valid for ipv4ll routes
+   
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 20 Oct 2006 21:55:17 +0200
 
 avahi (0.6.14-1) unstable; urgency=low