diff -u avahi-0.6.23/debian/rules avahi-0.6.23/debian/rules --- avahi-0.6.23/debian/rules +++ avahi-0.6.23/debian/rules @@ -48,6 +48,13 @@ clean:: rm -f po/*.pot +common-build-arch:: + # create an up to date PO template + cd po; intltool-update -p --verbose + +clean:: + rm -f po/*.pot + binary-install/avahi-discover:: dh_pysupport -p$(cdbs_curpkg) rm -f debian/tmp/usr/lib/python*/site-packages/avahi/*.py[co] diff -u avahi-0.6.23/debian/changelog avahi-0.6.23/debian/changelog --- avahi-0.6.23/debian/changelog +++ avahi-0.6.23/debian/changelog @@ -1,3 +1,13 @@ +avahi (0.6.23-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: LP: #308856 + - debian/patches/01_avahi-daemon.conf.patch: Disable IPv6. According to + upstream it is not ready yet and causes hiccups. + - debian/rules: Create an up to date PO template during build. + - debian/control: Build against libcap-dev instead of libcap2-dev + + -- Bhavani Shankar Wed, 17 Dec 2008 11:37:25 +0530 + avahi (0.6.23-3) unstable; urgency=low [ Loic Minier ] @@ -17,6 +27,24 @@ -- Sjoerd Simons Sun, 14 Dec 2008 19:39:58 +0000 +avahi (0.6.23-2ubuntu2) intrepid; urgency=low + + * Build against libcap-dev instead of libcap2-dev + + -- Jonathan Riddell Sun, 27 Jul 2008 19:26:13 +0100 + +avahi (0.6.23-2ubuntu1) intrepid; urgency=low + + * Merge with Debian unstable (LP: #245682), remaining changes: + * Remaining Ubuntu changes: + - debian/patches/01_avahi-daemon.conf.patch: Disable IPv6. According to + upstream it is not ready yet and causes hiccups. (LP #116984) + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477714 + - debian/rules: Create an up to date PO template during build. (LP #188690) + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=486908 + + -- James Westby Fri, 04 Jul 2008 16:55:24 +0100 + avahi (0.6.23-2) unstable; urgency=low * debian/control @@ -63,6 +91,18 @@ -- Sjoerd Simons Tue, 24 Jun 2008 16:41:23 +0200 +avahi (0.6.22-5ubuntu1) intrepid; urgency=low + + * Merge with Debian unstable. + * debian/rules: Do not use langpack.mk, but call intltool-update manually, + so that the change becomes applicable to Debian, too. + * Remaining Ubuntu changes: + - debian/patches/01_avahi-daemon.conf.patch: Disable IPv6. According to + upstream it is not ready yet and causes hiccups. (LP #116984) + - debian/rules: Create an up to date PO template during build. (LP #188690) + + -- Martin Pitt Wed, 18 Jun 2008 11:11:52 +0200 + avahi (0.6.22-5) unstable; urgency=low * debian/patches/85_gobject_service_remove_key.patch @@ -639,7 +679,6 @@ -- Sjoerd Simons Sun, 3 Sep 2006 19:27:13 +0200 - avahi (0.6.13-2) unstable; urgency=low * debian/patches/02_static-hosts.patch: @@ -1008,0 +1048 @@ + diff -u avahi-0.6.23/debian/control avahi-0.6.23/debian/control --- avahi-0.6.23/debian/control +++ avahi-0.6.23/debian/control @@ -1,7 +1,8 @@ Source: avahi Section: net Priority: optional -Maintainer: Utopia Maintenance Team +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Utopia Maintenance Team Uploaders: Sjoerd Simons , Sebastian Dröge , Loic Minier , @@ -10,7 +11,7 @@ cdbs (>= 0.4.43), pkg-config, python-support (>= 0.6), - libcap2-dev (>= 2.10) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386], + libcap-dev, libgdbm-dev, libglib2.0-dev (>= 2.4), libgtk2.0-dev (>= 2.4), diff -u avahi-0.6.23/debian/patches/01_avahi-daemon.conf.patch avahi-0.6.23/debian/patches/01_avahi-daemon.conf.patch --- avahi-0.6.23/debian/patches/01_avahi-daemon.conf.patch +++ avahi-0.6.23/debian/patches/01_avahi-daemon.conf.patch @@ -8,8 +8,7 @@ -browse-domains=0pointer.de, zeroconf.org +#browse-domains=0pointer.de, zeroconf.org use-ipv4=yes --use-ipv6=no -+use-ipv6=yes + use-ipv6=no #check-response-ttl=no #use-iff-running=no #enable-dbus=yes