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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ubuntu-desktop/avahi/ubuntu at revision 40

Ubuntu Desktop: Pending requested 2012-05-14

Ubuntu Sponsors: Pending requested 2012-05-14

Diff: 372 lines (+81/-110)

12 files modified

debian/avahi-autoipd.maintscript (+2/-0)
debian/avahi-autoipd.postinst (+3/-25)
debian/avahi-autoipd.preinst (+0/-19)
debian/avahi-daemon.postinst (+4/-12)
debian/avahi-dnsconfd.maintscript (+1/-0)
debian/avahi-dnsconfd.preinst (+0/-32)
debian/changelog (+49/-0)
debian/control (+12/-10)
debian/libavahi-ui-gtk3-0.symbols (+4/-4)
debian/libavahi-ui0.symbols (+4/-4)
debian/pyversions (+0/-1)
debian/rules (+2/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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.

42. By Iain Lane on 2012-05-14

Drop change "Build with CFLAGS=-UGTK_DISABLE_DEPRECATED due to deprecation of gtk_vbox_new." No longer necessary.

41. By Iain Lane on 2012-05-14

Merge with Debian unstable

* Merge with Debian unstable. Remaining changes:
  - Build with CFLAGS=-UGTK_DISABLE_DEPRECATED due to deprecation of
    gtk_vbox_new.
  - 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.
  - Pass CFLAGS from the environment through to configure. This by default
    will turn on optimisations and debug symbol generation, both of which
    are currently disabled.
* 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.
* 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.
* 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)

40. By Iain Lane on 2012-05-14

Build using dh_python2.

39. By Chris Halse Rogers on 2011-10-18

Merge from Debian testing

38. By Chris Halse Rogers on 2011-09-21

Pass CFLAGS through to configure to enable optimisations & debug symbol generation

37. By Sebastien Bacher on 2011-07-07

releasing version 0.6.30-4ubuntu1

36. By Steve Langasek on 2011-06-27

releasing version 0.6.30-3ubuntu3

35. By Steve Langasek on 2011-06-27

Build with CFLAGS=-UGTK_DISABLE_DEPRECATED due to deprecation of
gtk_vbox_new.

34. By Steve Langasek on 2011-06-27

No-change rebuild to get consistent changelog files for multiarch.