[Pkg-utopia-commits] r1594 - in /packages/unstable/avahi/debian: avahi-autoipd.ifdown avahi-autoipd.ifup avahi-daemon.init avahi-daemon.preinst changelog control
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Fri Jul 6 12:56:31 UTC 2007
Author: sjoerd
Date: Fri Jul 6 12:56:31 2007
New Revision: 1594
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1594
Log:
+ Add depend on python-dbus to python-avahi (Closes: #426365)
* debian/avahi-autoipd.{ifup,ifdown}:
+ Check for the existance of link-local routes on all interfaces
and use some nicer grep rules. Thanks Martin F Krafft and Eloi Granado
(Closes: #426918)
* debian/avahi-daemon.preinst:
+ Added. Remove /etc/avahi/etc/{,localtime} on installation, it's should
no longer be necessary (Closes: #427237)
* debian/avahi-daemon.init:
+ No longer create /etc/avahi/etc/localtime (Closes: #422368)
Added:
packages/unstable/avahi/debian/avahi-daemon.preinst
Modified:
packages/unstable/avahi/debian/avahi-autoipd.ifdown
packages/unstable/avahi/debian/avahi-autoipd.ifup
packages/unstable/avahi/debian/avahi-daemon.init
packages/unstable/avahi/debian/changelog
packages/unstable/avahi/debian/control
Modified: packages/unstable/avahi/debian/avahi-autoipd.ifdown
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-autoipd.ifdown?rev=1594&op=diff
==============================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.ifdown (original)
+++ packages/unstable/avahi/debian/avahi-autoipd.ifdown Fri Jul 6 12:56:31 2007
@@ -20,12 +20,12 @@
if [ -x /bin/ip ]; then
# route already present?
- [ "`ip route show dev $IFACE | grep ^169.254.0.0/16`" ] || exit 0
+ ip route show | grep -q '^169.254.0.0/16[[:space:]]' && exit 0
/bin/ip route del 169.254.0.0/16 dev $IFACE metric 1000 scope link || true
elif [ -x /sbin/route ]; then
# route already present?
- [ "`/sbin/route -n | grep ^169.254.0.0 | grep $IFACE`" ] || exit 0
+ /sbin/route -n | grep -q "^169.254.0.0[[:space:]]" && exit 0
/sbin/route del -net 169.254.0.0 netmask 255.255.0.0 dev $IFACE metric 1000 || true
fi
Modified: packages/unstable/avahi/debian/avahi-autoipd.ifup
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-autoipd.ifup?rev=1594&op=diff
==============================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.ifup (original)
+++ packages/unstable/avahi/debian/avahi-autoipd.ifup Fri Jul 6 12:56:31 2007
@@ -20,12 +20,12 @@
if [ -x /bin/ip ]; then
# route already present?
- [ "`ip route show dev $IFACE | grep ^169.254.0.0/16`" ] && exit 0
+ ip route show | grep -q '^169.254.0.0/16[[:space:]]' && exit 0
/bin/ip route add 169.254.0.0/16 dev $IFACE metric 1000 scope link
elif [ -x /sbin/route ]; then
# route already present?
- [ "`/sbin/route -n | grep ^169.254.0.0 | grep $IFACE`" ] && exit 0
+ /sbin/route -n | egrep -q "^169.254.0.0[[:space:]]" && exit 0
/sbin/route add -net 169.254.0.0 netmask 255.255.0.0 dev $IFACE metric 1000
fi
Modified: packages/unstable/avahi/debian/avahi-daemon.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-daemon.init?rev=1594&op=diff
==============================================================================
--- packages/unstable/avahi/debian/avahi-daemon.init (original)
+++ packages/unstable/avahi/debian/avahi-daemon.init Fri Jul 6 12:56:31 2007
@@ -50,13 +50,6 @@
exit 0;
fi;
- if [ -s /etc/localtime ]; then
- if [ ! -d /etc/avahi/etc ]; then
- mkdir -p /etc/avahi/etc >/dev/null 2>&1
- fi
- cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1
- fi;
-
$DAEMON -D
}
Added: packages/unstable/avahi/debian/avahi-daemon.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-daemon.preinst?rev=1594&op=file
==============================================================================
--- packages/unstable/avahi/debian/avahi-daemon.preinst (added)
+++ packages/unstable/avahi/debian/avahi-daemon.preinst Fri Jul 6 12:56:31 2007
@@ -1,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ install)
+ if dpkg --compare-versions "$2" le "0.6.20-1"; then
+ if [ -d "/etc/avahi/etc" ]; then
+ rm -f /etc/avahi/etc/localtime;
+ rmdir --ignore-fail-on-non-empty /etc/avahi/etc;
+ fi
+ fi
+esac
+
+#DEBHELPER#
+
+exit 0
Modified: packages/unstable/avahi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/changelog?rev=1594&op=diff
==============================================================================
--- packages/unstable/avahi/debian/changelog (original)
+++ packages/unstable/avahi/debian/changelog Fri Jul 6 12:56:31 2007
@@ -3,8 +3,18 @@
* New upstream release
* debian/control:
+ Bump build-depend on libdaemon to (>= 0.11)
-
- -- Sjoerd Simons <sjoerd at debian.org> Fri, 22 Jun 2007 20:27:03 +0100
+ + Add depend on python-dbus to python-avahi (Closes: #426365)
+ * debian/avahi-autoipd.{ifup,ifdown}:
+ + Check for the existance of link-local routes on all interfaces
+ and use some nicer grep rules. Thanks Martin F Krafft and Eloi Granado
+ (Closes: #426918)
+ * debian/avahi-daemon.preinst:
+ + Added. Remove /etc/avahi/etc/{,localtime} on installation, it's should
+ no longer be necessary (Closes: #427237)
+ * debian/avahi-daemon.init:
+ + No longer create /etc/avahi/etc/localtime (Closes: #422368)
+
+ -- Sjoerd Simons <sjoerd at debian.org> Fri, 06 Jul 2007 14:56:24 +0200
avahi (0.6.19-2) unstable; urgency=low
Modified: packages/unstable/avahi/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/control?rev=1594&op=diff
==============================================================================
--- packages/unstable/avahi/debian/control (original)
+++ packages/unstable/avahi/debian/control Fri Jul 6 12:56:31 2007
@@ -64,7 +64,7 @@
Package: python-avahi
Section: python
Architecture: all
-Depends: ${python:Depends}, python-gdbm (>= 2.4.3-1), python-glade2 (>= 2.8.6-2), libavahi-common-data
+Depends: ${python:Depends}, python-gdbm (>= 2.4.3-1), python-glade2 (>= 2.8.6-2), libavahi-common-data, python-dbus
Provides: ${python:Provides}
Replaces: python2.4-avahi (<< 0.6.11), avahi-utils (<< 0.4)
Conflicts: python2.4-avahi (<< 0.6.11)
More information about the Pkg-utopia-commits
mailing list