Source: avahi Version: 0.6.30-3 Tags: patch User: [email protected] Usertags: origin-ubuntu oneiric ubuntu-patch
Hi folks, Please find attached a patch to avahi to transition it to use of the multiarch library paths as described at <http://wiki.debian.org/Multiarch/Implementation>. This patch has been applied and is being used successfully in Ubuntu 11.04, and should be safe to apply in Debian now that multiarch has been bootstrapped there. Would be great if you could apply this patch to the Debian package, so we can whittle away ia32-libs for wheezy. :) Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ [email protected] [email protected]
=== modified file 'debian/compat'
--- debian/compat 2011-02-24 17:16:33 +0000
+++ debian/compat 2011-04-06 01:15:07 +0000
@@ -1,1 +1,1 @@
-8
+9
=== modified file 'debian/control'
--- debian/control 2011-02-24 17:16:33 +0000
+++ debian/control 2011-04-06 01:16:07 +0000
@@ -7,7 +7,7 @@
Sebastian Dröge <[email protected]>,
Loic Minier <[email protected]>,
Michael Biebl <[email protected]>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3),
pkg-config,
python-support (>= 0.6),
libcap-dev (>= 1:2.16) [linux-any],
@@ -43,6 +43,7 @@
bind9-host | host
Recommends: libnss-mdns
Suggests: avahi-autoipd
+Multi-Arch: foreign
Description: Avahi mDNS/DNS-SD daemon
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
@@ -97,7 +98,7 @@
Package: python-avahi
Section: python
-Architecture: all
+Architecture: any
Depends: ${python:Depends},
${misc:Depends},
python-gdbm (>= 2.4.3-1),
@@ -154,6 +155,8 @@
Depends: ${shlibs:Depends},
${misc:Depends},
libavahi-common-data
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Avahi common library
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
@@ -168,6 +171,7 @@
Section: libs
Architecture: any
Depends: ${misc:Depends}
+Multi-Arch: same
Description: Avahi common data files
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
@@ -206,6 +210,8 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Avahi's embeddable mDNS/DNS-SD library
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
@@ -253,6 +259,8 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Avahi client library
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
@@ -285,6 +293,8 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
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
@@ -318,6 +328,8 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Avahi GObject library
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
@@ -350,6 +362,8 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Avahi Qt 3 integration library
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
@@ -382,6 +396,8 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Avahi Qt 4 integration library
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
@@ -415,6 +431,8 @@
Depends: ${shlibs:Depends},
${misc:Depends}
Recommends: libnss-mdns
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Avahi Apple Bonjour compatibility library
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
@@ -445,6 +463,8 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Avahi GTK+ User interface library
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
=== modified file 'debian/libavahi-client-dev.install'
--- debian/libavahi-client-dev.install 2009-06-04 04:17:14 +0000
+++ debian/libavahi-client-dev.install 2011-04-06 01:15:07 +0000
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/libavahi-client.so
-debian/tmp/usr/lib/libavahi-client.la
-debian/tmp/usr/lib/libavahi-client.a
+/usr/lib/*/libavahi-client.so
+/usr/lib/*/libavahi-client.la
+/usr/lib/*/libavahi-client.a
debian/tmp/usr/include/avahi-client
-debian/tmp/usr/lib/pkgconfig/avahi-client.pc
+/usr/lib/*/pkgconfig/avahi-client.pc
=== modified file 'debian/libavahi-client3.install'
--- debian/libavahi-client3.install 2009-06-04 04:17:14 +0000
+++ debian/libavahi-client3.install 2011-04-06 01:15:07 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libavahi-client.so.*
+/usr/lib/*/libavahi-client.so.*
=== modified file 'debian/libavahi-common-data.install'
--- debian/libavahi-common-data.install 2010-08-25 05:38:39 +0000
+++ debian/libavahi-common-data.install 2011-04-06 01:15:07 +0000
@@ -1,3 +1,3 @@
debian/tmp/usr/share/avahi/service-types
-debian/tmp/usr/lib/avahi/service-types.db
+debian/tmp/usr/lib/*/avahi/service-types.db
debian/tmp/usr/share/locale/
=== modified file 'debian/libavahi-common-dev.install'
--- debian/libavahi-common-dev.install 2009-06-04 04:17:14 +0000
+++ debian/libavahi-common-dev.install 2011-04-06 01:15:07 +0000
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libavahi-common.so
-debian/tmp/usr/lib/libavahi-common.la
-debian/tmp/usr/lib/libavahi-common.a
+/usr/lib/*/libavahi-common.so
+/usr/lib/*/libavahi-common.la
+/usr/lib/*/libavahi-common.a
debian/tmp/usr/include/avahi-common
=== modified file 'debian/libavahi-common3-udeb.install'
--- debian/libavahi-common3-udeb.install 2010-08-25 05:38:39 +0000
+++ debian/libavahi-common3-udeb.install 2011-04-06 01:15:07 +0000
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/libavahi-common.so.*
-debian/tmp/usr/share/avahi/service-types
-debian/tmp/usr/lib/avahi/service-types.db
+/usr/lib/*/libavahi-common.so.* /usr/lib
+/usr/share/avahi/service-types
+/usr/lib/*/avahi/service-types.db
=== modified file 'debian/libavahi-common3.install'
--- debian/libavahi-common3.install 2009-06-04 04:17:14 +0000
+++ debian/libavahi-common3.install 2011-04-06 01:15:07 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libavahi-common.so.*
+/usr/lib/*/libavahi-common.so.*
=== modified file 'debian/libavahi-compat-libdnssd-dev.install'
--- debian/libavahi-compat-libdnssd-dev.install 2010-12-06 15:31:43 +0000
+++ debian/libavahi-compat-libdnssd-dev.install 2011-04-06 01:15:07 +0000
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libdns_sd.so
-debian/tmp/usr/lib/libdns_sd.a
+/usr/lib/*/libdns_sd.so
+/usr/lib/*/libdns_sd.a
debian/tmp/usr/include/avahi-compat-libdns_sd
-debian/tmp/usr/lib/pkgconfig/avahi-compat-libdns_sd.pc
+/usr/lib/*/pkgconfig/avahi-compat-libdns_sd.pc
=== modified file 'debian/libavahi-compat-libdnssd1.install'
--- debian/libavahi-compat-libdnssd1.install 2009-06-04 04:17:14 +0000
+++ debian/libavahi-compat-libdnssd1.install 2011-04-06 01:15:07 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libdns_sd.so.*
+/usr/lib/*/libdns_sd.so.*
=== modified file 'debian/libavahi-core-dev.install'
--- debian/libavahi-core-dev.install 2010-12-06 15:31:43 +0000
+++ debian/libavahi-core-dev.install 2011-04-06 01:15:07 +0000
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libavahi-core.so
-debian/tmp/usr/lib/libavahi-core.a
+/usr/lib/*/libavahi-core.so
+/usr/lib/*/libavahi-core.a
debian/tmp/usr/include/avahi-core
-debian/tmp/usr/lib/pkgconfig/avahi-core.pc
+/usr/lib/*/pkgconfig/avahi-core.pc
=== modified file 'debian/libavahi-core7-udeb.install'
--- debian/libavahi-core7-udeb.install 2010-08-25 05:38:39 +0000
+++ debian/libavahi-core7-udeb.install 2011-04-06 01:15:07 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libavahi-core.so.*
+/usr/lib/*/libavahi-core.so.* /usr/lib
=== modified file 'debian/libavahi-core7.install'
--- debian/libavahi-core7.install 2010-08-25 05:38:39 +0000
+++ debian/libavahi-core7.install 2011-04-06 01:15:07 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libavahi-core.so.*
+/usr/lib/*/libavahi-core.so.*
=== modified file 'debian/libavahi-glib-dev.install'
--- debian/libavahi-glib-dev.install 2010-12-06 15:31:43 +0000
+++ debian/libavahi-glib-dev.install 2011-04-06 01:15:07 +0000
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libavahi-glib.so
-debian/tmp/usr/lib/libavahi-glib.a
+/usr/lib/*/libavahi-glib.so
+/usr/lib/*/libavahi-glib.a
debian/tmp/usr/include/avahi-glib
-debian/tmp/usr/lib/pkgconfig/avahi-glib.pc
+/usr/lib/*/pkgconfig/avahi-glib.pc
=== modified file 'debian/libavahi-glib1.install'
--- debian/libavahi-glib1.install 2009-06-04 04:17:14 +0000
+++ debian/libavahi-glib1.install 2011-04-06 01:15:07 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libavahi-glib.so.*
+/usr/lib/*/libavahi-glib.so.*
=== modified file 'debian/libavahi-gobject-dev.install'
--- debian/libavahi-gobject-dev.install 2009-06-04 04:17:14 +0000
+++ debian/libavahi-gobject-dev.install 2011-04-06 01:15:07 +0000
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libavahi-gobject.so
-debian/tmp/usr/lib/libavahi-gobject.a
+/usr/lib/*/libavahi-gobject.so
+/usr/lib/*/libavahi-gobject.a
debian/tmp/usr/include/avahi-gobject
-debian/tmp/usr/lib/pkgconfig/avahi-gobject.pc
+/usr/lib/*/pkgconfig/avahi-gobject.pc
=== modified file 'debian/libavahi-gobject0.install'
--- debian/libavahi-gobject0.install 2009-06-04 04:17:14 +0000
+++ debian/libavahi-gobject0.install 2011-04-06 01:15:07 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libavahi-gobject.so.*
+/usr/lib/*/libavahi-gobject.so.*
=== modified file 'debian/libavahi-qt3-1.install'
--- debian/libavahi-qt3-1.install 2009-06-04 04:17:14 +0000
+++ debian/libavahi-qt3-1.install 2011-04-06 01:15:07 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libavahi-qt3.so.*
+/usr/lib/*/libavahi-qt3.so.*
=== modified file 'debian/libavahi-qt3-dev.install'
--- debian/libavahi-qt3-dev.install 2009-06-04 04:17:14 +0000
+++ debian/libavahi-qt3-dev.install 2011-04-06 01:15:07 +0000
@@ -1,5 +1,5 @@
debian/tmp/usr/include/avahi-qt3/qt-watch.h
-debian/tmp/usr/lib/libavahi-qt3.so
-debian/tmp/usr/lib/libavahi-qt3.la
-debian/tmp/usr/lib/libavahi-qt3.a
-debian/tmp/usr/lib/pkgconfig/avahi-qt3.pc
+/usr/lib/*/libavahi-qt3.so
+/usr/lib/*/libavahi-qt3.la
+/usr/lib/*/libavahi-qt3.a
+/usr/lib/*/pkgconfig/avahi-qt3.pc
=== modified file 'debian/libavahi-qt4-1.install'
--- debian/libavahi-qt4-1.install 2009-06-04 04:17:14 +0000
+++ debian/libavahi-qt4-1.install 2011-04-06 01:15:07 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libavahi-qt4.so.*
+/usr/lib/*/libavahi-qt4.so.*
=== modified file 'debian/libavahi-qt4-dev.install'
--- debian/libavahi-qt4-dev.install 2010-12-06 15:31:43 +0000
+++ debian/libavahi-qt4-dev.install 2011-04-06 01:15:07 +0000
@@ -1,4 +1,4 @@
debian/tmp/usr/include/avahi-qt4/qt-watch.h
-debian/tmp/usr/lib/libavahi-qt4.so
-debian/tmp/usr/lib/libavahi-qt4.a
-debian/tmp/usr/lib/pkgconfig/avahi-qt4.pc
+/usr/lib/*/libavahi-qt4.so
+/usr/lib/*/libavahi-qt4.a
+/usr/lib/*/pkgconfig/avahi-qt4.pc
=== modified file 'debian/libavahi-ui-dev.install'
--- debian/libavahi-ui-dev.install 2010-12-06 15:31:43 +0000
+++ debian/libavahi-ui-dev.install 2011-04-06 01:15:07 +0000
@@ -1,4 +1,4 @@
debian/tmp/usr/include/avahi-ui/avahi-ui.h
-debian/tmp/usr/lib/libavahi-ui.so
-debian/tmp/usr/lib/libavahi-ui.a
-debian/tmp/usr/lib/pkgconfig/avahi-ui.pc
+/usr/lib/*/libavahi-ui.so
+/usr/lib/*/libavahi-ui.a
+/usr/lib/*/pkgconfig/avahi-ui.pc
=== modified file 'debian/libavahi-ui0.install'
--- debian/libavahi-ui0.install 2009-06-04 04:17:14 +0000
+++ debian/libavahi-ui0.install 2011-04-06 01:15:07 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libavahi-ui.so.*
+/usr/lib/*/libavahi-ui.so.*
=== modified file 'debian/rules'
--- debian/rules 2011-02-24 17:16:33 +0000
+++ debian/rules 2011-04-06 01:15:07 +0000
@@ -46,7 +46,7 @@
debian/tmp/etc/dhcp/dhclient-exit-hooks.d/zzz_avahi-autoipd
endif
# cleanup dependency_libs from libtool .la files
- sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/*.la
+ sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/*/*.la
# List any files which are not installed
override_dh_install:
signature.asc
Description: Digital signature
