Merge lp:~laney/ubuntu/quantal/avahi/merge-0.6.31-1 into lp:~ubuntu-desktop/avahi/ubuntu

[Iain Lane]

[Sebastien Bacher (seb128)]

Thanks for the work Iain, just looking over for today but I've some comments,questions:

- do we still need the udeb for the installer with openstack?
- is the CFLAGS change something that could go to Debian?
- does it hurt in any way to ship systemd files if we don't use it?

(I realize that you didn't come with those changes but still it would be could to revisit if they are needed)

[Sebastien Bacher (seb128)]

the udeb is still required apparently, it would be nice if the change was sent to the BTS though, Colin (he introduced the diff) said he can do it in the next days so maybe check with him to not dup work if you want to do that

[Iain Lane (laney)]

CFLAGS> I don't see any difference in the build with this change or not, and I think it is implied by using compat 9 ("All of the dh_auto_* debhelper programs and dh set environment variables listed by dpkg-buildflags"), so let's drop it.

systemd> Shouldn't be a problem. Lots of packages already ship files in /lib/systemd, and I don't see how this could cause us harm. I don't even see how it could be harmful to ship the symlinks into /etc (I see rsylog does this on my system), but it wasn't any work to keep this change.

udeb> I'll let Colin follow up, but if he doesn't get around to it then I'll ping next week

[lp:~laney/ubuntu/quantal/avahi/merge-0.6.31-1]

43. By Iain Lane on 2012-05-22

Drop change:

Pass CFLAGS from the environment through to configure. Seems to be no
longer necessary with the move to compat 9.

=== added file 'debian/avahi-autoipd.maintscript'
--- debian/avahi-autoipd.maintscript	1970-01-01 00:00:00 +0000
+++ debian/avahi-autoipd.maintscript	2012-05-22 21:34:20 +0000
@@ -0,0 +1,2 @@
+mv_conffile /etc/dhcp3/dhclient-enter-hooks.d/avahi-autoipd /etc/dhcp/dhclient-enter-hooks.d/avahi-autoipd 0.6.25-3 avahi-autoipd
+mv_conffile /etc/dhcp3/dhclient-exit-hooks.d/zzz_avahi-autoipd /etc/dhcp/dhclient-exit-hooks.d/zzz_avahi-autoipd 0.6.25-3 avahi-autoipd

=== modified file 'debian/avahi-autoipd.postinst'
--- debian/avahi-autoipd.postinst	2011-02-24 17:16:33 +0000
+++ debian/avahi-autoipd.postinst	2012-05-22 21:34:20 +0000
@@ -2,33 +2,11 @@
 
 set -e
 
-# Move a conffile without triggering a dpkg question
-mv_conffile() {
-    local OLDCONFFILE="$1"
-    local NEWCONFFILE="$2"
-
-    [ -e "$OLDCONFFILE" ] || return 0
-
-    echo "Preserving user changes to $NEWCONFFILE ..."
-    mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
-    mv -f "$OLDCONFFILE" "$NEWCONFFILE"
-}
-
 case "$1" in
   configure)
-    if ! getent passwd avahi-autoipd >/dev/null; then
-      adduser --disabled-password --quiet --system \
-        --home /var/lib/avahi-autoipd \
-        --gecos "Avahi autoip daemon" --group avahi-autoipd
-    fi
-
-    # When upgradig from previous versions move dhclient hooks to new location
-    if dpkg --compare-versions "$2" lt "0.6.27-3ubuntu1"; then
-        mv_conffile "/etc/dhcp3/dhclient-enter-hooks.d/avahi-autoipd" \
-                    "/etc/dhcp/dhclient-enter-hooks.d/avahi-autoipd"
-        mv_conffile "/etc/dhcp3/dhclient-exit-hooks.d/zzz_avahi-autoipd" \
-                    "/etc/dhcp/dhclient-exit-hooks.d/zzz_avahi-autoipd"
-    fi
+    adduser --disabled-password --quiet --system \
+      --home /var/lib/avahi-autoipd \
+      --gecos "Avahi autoip daemon" --group avahi-autoipd
 
     # FIXME: restart it somehow... SIGHUP?
   ;;

=== modified file 'debian/avahi-autoipd.preinst'
--- debian/avahi-autoipd.preinst	2011-02-24 17:16:33 +0000
+++ debian/avahi-autoipd.preinst	2012-05-22 21:34:20 +0000
@@ -2,27 +2,8 @@
 
 set -e
 
-# Prepare to move a conffile without triggering a dpkg question
-prep_mv_conffile() {
-    local PKGNAME="$1"
-    local CONFFILE="$2"
-
-    [ -e "$CONFFILE" ] || return 0
-
-    local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
-    local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
-            sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
-    if [ "$md5sum" = "$old_md5sum" ]; then
-        rm -f "$CONFFILE"
-    fi
-}
-
 case "$1" in
 install|upgrade)
-    if dpkg --compare-versions "$2" lt "0.6.27-3ubuntu1"; then
-        prep_mv_conffile avahi-autoipd "/etc/dhcp3/dhclient-enter-hooks.d/avahi-autoipd"
-        prep_mv_conffile avahi-autoipd "/etc/dhcp3/dhclient-exit-hooks.d/zzz_avahi-autoipd"
-    fi
     # Remove compat symlinks for dhcp3-client which might have been
     # created during upgrades.
     if dpkg --compare-versions "$2" lt "0.6.28-3"; then

=== modified file 'debian/avahi-daemon.postinst'
--- debian/avahi-daemon.postinst	2010-12-06 15:31:43 +0000
+++ debian/avahi-daemon.postinst	2012-05-22 21:34:20 +0000
@@ -16,20 +16,12 @@
 
 case "$1" in
   configure)
-    if ! getent passwd avahi >/dev/null; then
-      adduser --disabled-password  --quiet --system \
-        --home /var/run/avahi-daemon --no-create-home \
-        --gecos "Avahi mDNS daemon" --group avahi
-    fi
-    # If the Avahi user has the old home, change it
-    if ! getent passwd avahi | grep -q /var/run/avahi-daemon; then
-        usermod -d /var/run/avahi-daemon avahi
-    fi
+    adduser --disabled-password  --quiet --system \
+      --home /var/run/avahi-daemon --no-create-home \
+      --gecos "Avahi mDNS daemon" --group avahi
 
     # Add the netdev group unless it's already there
-    if ! getent group netdev >/dev/null; then
-      addgroup --quiet --system netdev || true
-    fi
+    addgroup --quiet --system netdev || true
 
     # Ask the bus to reload the config file
     if [ -x "/etc/init.d/dbus" ]; then

=== added file 'debian/avahi-dnsconfd.maintscript'
--- debian/avahi-dnsconfd.maintscript	1970-01-01 00:00:00 +0000
+++ debian/avahi-dnsconfd.maintscript	2012-05-22 21:34:20 +0000
@@ -0,0 +1,1 @@
+rm_conffile /etc/default/avahi-dnsconfd 0.6.25-4 avahi-dnsconfd

=== removed file 'debian/avahi-dnsconfd.preinst'
--- debian/avahi-dnsconfd.preinst	2010-08-25 05:38:39 +0000
+++ debian/avahi-dnsconfd.preinst	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Remove a no-longer used conffile
-rm_conffile() {
-    local PKGNAME="$1"
-    local CONFFILE="$2"
-
-    [ -e "$CONFFILE" ] || return 0
-
-    local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
-    local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
-            sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
-    if [ "$md5sum" != "$old_md5sum" ]; then
-        echo "Obsolete conffile $CONFFILE has been modified by you."
-        echo "Saving as $CONFFILE.dpkg-bak ..."
-        mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-    else
-        echo "Removing obsolete conffile $CONFFILE ..."
-        rm -f "$CONFFILE"
-    fi
-}
-
-case "$1" in
-install|upgrade)
-    if dpkg --compare-versions "$2" lt "0.6.26-1"; then
-        rm_conffile avahi-dnsconfd "/etc/default/avahi-dnsconfd"
-    fi
-esac
-
-#DEBHELPER#

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-18 03:51:07 +0000
+++ debian/changelog	2012-05-22 21:34:20 +0000
@@ -1,3 +1,52 @@
+avahi (0.6.31-1ubuntu1) UNRELEASED; urgency=low
+
+  * Merge with Debian unstable.  Remaining changes:
+    - debian/control: Add versioned dependency on the dbus that satisfies our
+      upstart job dependency.
+    - Add udebs corresponding to libavahi-common3 and libavahi-core7, so
+      that we can use them for Eucalyptus integration in the installer.
+    - Add debian/avahi-daemon.upstart, debian/avahi-dnsconfd.upstart
+    - debian/avahi-{daemon,dnsconfd}.links: Remove systemd configuration
+      symlinks.
+  * Dropped changes
+    - debian/avahi-autoipd.{pre,post}inst: Adjust package versions for conffile
+      migration for the version when Ubuntu did the DHCP4 migration. We're now
+      one LTS cycle since this, so there's no need to keep code paths for this
+      upgrade.
+    - Build with CFLAGS=-UGTK_DISABLE_DEPRECATED due to deprecation of
+      gtk_vbox_new. No longer necessary.
+    - Pass CFLAGS from the environment through to configure. Seems to be no
+      longer necessary with the move to compat 9.
+
+ -- Iain Lane <[e-mail]>  Tue, 22 May 2012 22:21:27 +0100
+
+avahi (0.6.31-1) unstable; urgency=low
+
+  * New upstream release.
+  * Mark private stdb_* symbols in libavahi-ui and libavahi-ui-gtk3 as
+    optional.
+  * Bump Build-Depends on debhelper to (>= 9).
+  * Bump Standards-Version to 3.9.3. No further changes.
+  * Use new dh_installdeb maintscript facility to (re)move the old conffiles
+    for avahi-autoipd and avahi-dnsconfd.
+
+ -- Michael Biebl <[e-mail]>  Sun, 04 Mar 2012 05:23:49 +0100
+
+avahi (0.6.30-6) unstable; urgency=low
+
+  * Switch to dh_python2. (Closes: #637552)
+  * Simplify postinst for avahi-autoipd and avahi-daemon.
+  * Rebuild to enable hardened build flags. (Closes: #655188)
+  * Use term GLib consistently in the package description. (Closes: #633783)
+
+ -- Michael Biebl <[e-mail]>  Tue, 10 Jan 2012 00:59:49 +0100
+
+avahi (0.6.30-5ubuntu2) precise; urgency=low
+
+  * Build using dh_python2.
+
+ -- Matthias Klose <[e-mail]>  Sat, 17 Dec 2011 12:06:42 +0100
+
 avahi (0.6.30-5ubuntu1) precise; urgency=low
 
   * Merge from Debian testing.  Remaining changes:

=== modified file 'debian/control'
--- debian/control	2011-07-07 09:49:46 +0000
+++ debian/control	2012-05-22 21:34:20 +0000
@@ -7,9 +7,8 @@
            Sebastian Dröge <[e-mail]>,
            Loic Minier <[e-mail]>,
            Michael Biebl <[e-mail]>
-Build-Depends: debhelper (>= 8.1.3),
+Build-Depends: debhelper (>= 9),
                pkg-config,
-               python-support (>= 0.6),
                libcap-dev (>= 1:2.16) [linux-any],
                libgdbm-dev,
                libglib2.0-dev (>= 2.4),
@@ -18,14 +17,15 @@
                libexpat-dev,
                libdaemon-dev (>= 0.11),
                libdbus-1-dev (>= 0.60),
-               python-all-dev (>= 2.3.5-11),
+               python-all-dev (>= 2.6.6-3~),
                python-gdbm (>= 2.4.3),
                python-dbus,
                python-gtk2 (>= 2.8.6-2),
                libqt4-dev,
                xmltoman,
                intltool (>= 0.35.0)
-Standards-Version: 3.9.2
+X-Python-Version: >= 2.4
+Standards-Version: 3.9.3
 XS-Debian-Vcs-Git: git://git.debian.org/git/pkg-utopia/avahi.git
 XS-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-utopia/avahi.git;a=summary
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/avahi/ubuntu
@@ -58,6 +58,7 @@
 Package: avahi-dnsconfd
 Section: net
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          avahi-daemon,
@@ -77,6 +78,7 @@
 Package: avahi-autoipd
 Section: net
 Architecture: linux-any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          adduser
@@ -198,7 +200,7 @@
  of Avahis components and client applications.
 
 Package: libavahi-common3-udeb
-XC-Package-Type: udeb
+Package-Type: udeb
 Section: debian-installer
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -247,7 +249,7 @@
  shoudl use libavahi-client-dev which interacts with the avahi daemon.
 
 Package: libavahi-core7-udeb
-XC-Package-Type: udeb
+Package-Type: udeb
 Section: debian-installer
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -295,7 +297,7 @@
          ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
-Description: Avahi glib integration library
+Description: Avahi GLib integration library
  Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
  It allows programs to publish and discover services and hosts
  running on a local network with no specific configuration. For
@@ -303,7 +305,7 @@
  print to, files to look at and people to talk to.
  .
  This library contains the interface to integrate the Avahi libraries
- into a GLIB main loop application, including GTK+ applications.
+ into a GLib main loop application, including GTK+ applications.
 
 Package: libavahi-glib-dev
 Section: libdevel
@@ -312,7 +314,7 @@
          ${misc:Depends},
          libglib2.0-dev,
          libavahi-common-dev
-Description: Development headers for the Avahi glib integration library
+Description: Development headers for the Avahi GLib integration library
  Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
  It allows programs to publish and discover services and hosts
  running on a local network with no specific configuration. For
@@ -320,7 +322,7 @@
  print to, files to look at and people to talk to.
  .
  This package contains the development headers for the interface
- to integrate the Avahi libraries  into a GLIB main loop application,
+ to integrate the Avahi libraries  into a GLib main loop application,
  including GTK+ applications.
 
 Package: libavahi-gobject0

=== modified file 'debian/libavahi-ui-gtk3-0.symbols'
--- debian/libavahi-ui-gtk3-0.symbols	2011-05-16 19:41:44 +0000
+++ debian/libavahi-ui-gtk3-0.symbols	2012-05-22 21:34:20 +0000
@@ -22,7 +22,7 @@
  aui_service_dialog_set_service_name@Base 0.6.30
  aui_service_dialog_set_service_type@Base 0.6.30
  aui_service_dialog_set_service_type_name@Base 0.6.30
- stdb_getent@Base 0.6.30
- stdb_lookup@Base 0.6.30
- stdb_setent@Base 0.6.30
- stdb_shutdown@Base 0.6.30
+ (optional)stdb_getent@Base 0.6.30
+ (optional)stdb_lookup@Base 0.6.30
+ (optional)stdb_setent@Base 0.6.30
+ (optional)stdb_shutdown@Base 0.6.30

=== modified file 'debian/libavahi-ui0.symbols'
--- debian/libavahi-ui0.symbols	2009-06-04 04:17:14 +0000
+++ debian/libavahi-ui0.symbols	2012-05-22 21:34:20 +0000
@@ -22,7 +22,7 @@
  aui_service_dialog_set_service_name@Base 0.6.21
  aui_service_dialog_set_service_type@Base 0.6.21
  aui_service_dialog_set_service_type_name@Base 0.6.22
- stdb_getent@Base 0.6.21
- stdb_lookup@Base 0.6.21
- stdb_setent@Base 0.6.21
- stdb_shutdown@Base 0.6.21
+ (optional)stdb_getent@Base 0.6.21
+ (optional)stdb_lookup@Base 0.6.21
+ (optional)stdb_setent@Base 0.6.21
+ (optional)stdb_shutdown@Base 0.6.21

=== removed file 'debian/pyversions'
--- debian/pyversions	2009-06-04 04:17:14 +0000
+++ debian/pyversions	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2.4-

=== modified file 'debian/rules'
--- debian/rules	2011-09-21 08:01:42 +0000
+++ debian/rules	2012-05-22 21:34:20 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with python2
 
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
@@ -20,8 +20,7 @@
 		--disable-monodoc \
 		--disable-qt3 \
 		--enable-gtk3 \
-		--with-systemdsystemunitdir=/lib/systemd/system \
-		CFLAGS="$(CFLAGS) -UGTK_DISABLE_DEPRECATED"
+		--with-systemdsystemunitdir=/lib/systemd/system
 
 override_dh_auto_build:
 	dh_auto_build