* 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)