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,15 @@
+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 <james.westby@canonical.com>  Fri, 04 Jul 2008 16:55:24 +0100
+
 avahi (0.6.23-2) unstable; urgency=low
 
   * debian/control
@@ -44,6 +56,18 @@
 
  -- Sjoerd Simons <sjoerd@debian.org>  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 <martin.pitt@ubuntu.com>  Wed, 18 Jun 2008 11:11:52 +0200
+
 avahi (0.6.22-5) unstable; urgency=low
 
   * debian/patches/85_gobject_service_remove_key.patch
@@ -620,7 +644,6 @@
 
  -- Sjoerd Simons <sjoerd@debian.org>  Sun,  3 Sep 2006 19:27:13 +0200
 
-
 avahi (0.6.13-2) unstable; urgency=low
 
   * debian/patches/02_static-hosts.patch:
@@ -989,0 +1013 @@
+
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
@@ -41,6 +41,13 @@
 pre-build::
 	-rm -f avahi-python/avahi/ServiceTypeDatabase.py 
 
+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/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 <pkg-utopia-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Sjoerd Simons <sjoerd@debian.org>,
            Sebastian Dröge <slomo@debian.org>,
            Loic Minier <lool@dooz.org>,
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