Please merge from debian unstable (0.6.22-1)

New debian revision (again)

 avahi (0.6.22-2) unstable; urgency=low
 .
   * Fix typo in the control file (missing ,)
   * debian/avahi-discover.install: Install some forgotten files

Pedro, can you update your merge to include the changes in 0.6.22-2?

Done Daniel.

Martin: can you take a look at it?

Pedro: Please note that your changelog is not ideal. The remaining changes should describe the existing changes, not what has been fixed in those changes in the past. :) (I. e. "Start avahi before cups", not "fix the migration to do blablaba"). I'll fix the changelog and upload after the Alpha-3 release.

This bug was fixed in the package avahi - 0.6.22-2ubuntu1

---------------
avahi (0.6.22-2ubuntu1) hardy; urgency=low

  * Merge from Debian unstable (LP: #180989), Ubuntu remaining changes:
    - debian/rules, debian/avahi-daemon.postinst: Start the avahi-daemon before
      CUPS so that CUPS-shared printers appears in mDNS. (LP #173470)

avahi (0.6.22-2) unstable; urgency=low

  * Fix typo in the control file (missing ,)
  * debian/avahi-discover.install: Install some forgotten files

avahi (0.6.22-1) unstable; urgency=low

  [ Michael Biebl ]
  * Deprecate the AVAHI_DAEMON_START option and remove it from
    /etc/default/avahi-daemon. Print a warning message in the init script if
    this option is still used.

  [ Sjoerd Simons ]
  * New upstream release
  * debian/patches/70_gobject_libs_typo.patch
    - Added. Fix typo in the Makefiles causing avahi-gobject build to fail
  * debian/libavahi-common-data.install
    - service-type.db moved to /usr/lib/avahi (Closes: #458851)
  * debian/patches/01_avahi-daemon.conf.patch
    - Updated. Switch on ipv6 support by default
  * Package libavahi-gobject
  * debian/copyright: Updated
  * debian/control: Let libavahi-common3 depend on
    libavahi-common-data (>= 0.6.22)
  * debian/paches/20_avahi-libdns_sd-crash.patch
    - Removed. Fixed upstream

avahi (0.6.21-5) experimental; urgency=low

  * Add a -dbg package; thanks Sam Morris; closes: #379953.
    - Target at experimental to avoid blocking uploads to unstable.
    - Update control.

 -- Pedro Fragoso <email address hidden> Tue, 08 Jan 2008 09:42:00 +0000