~ubuntu-branches/ubuntu/jaunty/avahi/jaunty-updates

Viewing all changes in revision 74.

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2008-06-18 11:11:52 UTC
  • Revision ID: james.westby@ubuntu.com-20080618111152-lz82fokobtnf89ds
Tags: 0.6.22-5ubuntu1
* 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)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: