[Pkg-utopia-commits] r3598 - in /packages/unstable/avahi/debian: ./ patches/

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jul  7 18:14:30 2010
New Revision: 3598

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3598
Log:
* Remove patches that were merged upstream
  - debian/patches/11_avahi-autoipd.action-add-routes.patch
  - debian/patches/15-manpage-typo-fixes.patch
  - debian/patches/20_avahi-daemon_kfreebsd.patch
  - debian/patches/25_check_net_if_dl_h_for_pfroute.patch
  - debian/patches/30_dont_reflect_link-local_addresses.patch

Removed:
    packages/unstable/avahi/debian/patches/11_avahi-autoipd.action-add-routes.patch
    packages/unstable/avahi/debian/patches/15-manpage-typo-fixes.patch
    packages/unstable/avahi/debian/patches/20_avahi-daemon_kfreebsd.patch
    packages/unstable/avahi/debian/patches/25_check_net_if_dl_h_for_pfroute.patch
    packages/unstable/avahi/debian/patches/30_dont_reflect_link-local_addresses.patch
Modified:
    packages/unstable/avahi/debian/changelog
    packages/unstable/avahi/debian/patches/01_avahi-daemon.conf.patch
    packages/unstable/avahi/debian/patches/26_am_maintainer_mode.patch
    packages/unstable/avahi/debian/patches/series

Modified: packages/unstable/avahi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/changelog?rev=3598&op=diff
==============================================================================
--- packages/unstable/avahi/debian/changelog (original)
+++ packages/unstable/avahi/debian/changelog Wed Jul  7 18:14:30 2010
@@ -1,6 +1,12 @@
 avahi (0.6.26-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Remove patches that were merged upstream
+    - debian/patches/11_avahi-autoipd.action-add-routes.patch
+    - debian/patches/15-manpage-typo-fixes.patch
+    - debian/patches/20_avahi-daemon_kfreebsd.patch
+    - debian/patches/25_check_net_if_dl_h_for_pfroute.patch
+    - debian/patches/30_dont_reflect_link-local_addresses.patch
 
  -- Michael Biebl <biebl at debian.org>  Wed, 30 Jun 2010 02:47:56 +0200
 

Modified: packages/unstable/avahi/debian/patches/01_avahi-daemon.conf.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/01_avahi-daemon.conf.patch?rev=3598&op=diff
==============================================================================
--- packages/unstable/avahi/debian/patches/01_avahi-daemon.conf.patch (original)
+++ packages/unstable/avahi/debian/patches/01_avahi-daemon.conf.patch Wed Jul  7 18:14:30 2010
@@ -1,8 +1,8 @@
 Index: b/avahi-daemon/avahi-daemon.conf
 ===================================================================
---- a/avahi-daemon/avahi-daemon.conf	2010-06-25 11:30:47.202932592 +0200
-+++ b/avahi-daemon/avahi-daemon.conf	2010-06-25 11:30:50.982931931 +0200
-@@ -23,9 +23,9 @@
+--- a/avahi-daemon/avahi-daemon.conf	2010-06-29 02:19:57.000000000 +0200
++++ b/avahi-daemon/avahi-daemon.conf	2010-07-07 20:03:01.987655481 +0200
+@@ -21,9 +21,9 @@
  [server]
  #host-name=foo
  #domain-name=local

Modified: packages/unstable/avahi/debian/patches/26_am_maintainer_mode.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/26_am_maintainer_mode.patch?rev=3598&op=diff
==============================================================================
--- packages/unstable/avahi/debian/patches/26_am_maintainer_mode.patch (original)
+++ packages/unstable/avahi/debian/patches/26_am_maintainer_mode.patch Wed Jul  7 18:14:30 2010
@@ -1,12 +1,13 @@
 Index: b/configure.ac
 ===================================================================
---- a/configure.ac	2010-06-25 11:31:06.274935613 +0200
-+++ b/configure.ac	2010-06-25 11:31:08.842935333 +0200
-@@ -25,6 +25,7 @@
- AC_CONFIG_SRCDIR([avahi-core/server.c])
+--- a/configure.ac	2010-06-29 02:30:32.000000000 +0200
++++ b/configure.ac	2010-07-07 20:08:47.055659393 +0200
+@@ -25,6 +25,8 @@
  AC_CONFIG_HEADERS([config.h])
- AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
+ AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
+ 
 +AM_MAINTAINER_MODE
- 
++
  AC_SUBST(PACKAGE_URL, [http://avahi.org/])
  
+ AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [8:2:5])

Modified: packages/unstable/avahi/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/series?rev=3598&op=diff
==============================================================================
--- packages/unstable/avahi/debian/patches/series (original)
+++ packages/unstable/avahi/debian/patches/series Wed Jul  7 18:14:30 2010
@@ -1,9 +1,4 @@
 # Debian patches for Avahi
 01_avahi-daemon.conf.patch
-11_avahi-autoipd.action-add-routes.patch
-15-manpage-typo-fixes.patch
-20_avahi-daemon_kfreebsd.patch
-25_check_net_if_dl_h_for_pfroute.patch
 26_am_maintainer_mode.patch
-30_dont_reflect_link-local_addresses.patch
 99_autoreconf.patch