[Pkg-utopia-commits] r1062 - in packages/unstable/avahi/debian: .
patches
Sebastian Dröge
slomo-guest at costa.debian.org
Tue Oct 17 17:17:45 UTC 2006
Author: slomo-guest
Date: 2006-10-17 17:17:44 +0000 (Tue, 17 Oct 2006)
New Revision: 1062
Added:
packages/unstable/avahi/debian/patches/10_initscripts-scriptname.patch
Modified:
packages/unstable/avahi/debian/changelog
packages/unstable/avahi/debian/control
packages/unstable/avahi/debian/rules
Log:
* fix a few bugs in avahi and make some smaller cleanup
Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog 2006-10-12 14:38:12 UTC (rev 1061)
+++ packages/unstable/avahi/debian/changelog 2006-10-17 17:17:44 UTC (rev 1062)
@@ -1,3 +1,22 @@
+avahi (0.6.14-2) unstable; urgency=low
+
+ * debian/control:
+ + Update Standards-Version to 3.7.2
+ + Recommend dhcp3-client instead of non-existing dhclient
+ (Closes: #392076, #391924)
+ + Change QT to Qt in all descriptions (Closes: #384783)
+ + Change Maintainer to pkg-utopia team
+ + Add XS-X-Vcs-Svn control field
+ * debian/control,
+ debian/rules:
+ + Don't build avahi-autoipd on something else than Linux until it is
+ ported (Closes: #391298). Thanks to Aurelien Jarno <aurel32 at debian.org>
+ for the patch.
+ * debian/patches/10_initscripts-scriptname.patch:
+ + Set SCRIPTNAME variable in init scripts (Closes: #386957)
+
+ -- Sebastian Dröge <slomo at ubuntu.com> Tue, 17 Oct 2006 18:45:52 +0200
+
avahi (0.6.14-1) unstable; urgency=low
[ Sebastian Dröge ]
Modified: packages/unstable/avahi/debian/control
===================================================================
--- packages/unstable/avahi/debian/control 2006-10-12 14:38:12 UTC (rev 1061)
+++ packages/unstable/avahi/debian/control 2006-10-17 17:17:44 UTC (rev 1062)
@@ -1,10 +1,11 @@
Source: avahi
Section: net
Priority: optional
-Maintainer: Ross Burton <ross at debian.org>
+Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers at lists.alioth.debian.org>
Uploaders: Sjoerd Simons <sjoerd at debian.org>, Sebastian Dröge <slomo at ubuntu.com>
Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.3), libcap-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386], libgdbm-dev, libglib2.0-dev (>= 2.4), libgtk2.0-dev (>= 2.4), libglade2-dev, libexpat-dev, libdaemon-dev, libdbus-1-dev (>= 0.60), python-all-dev (>= 2.3.5-11), python-gdbm (>= 2.4.3-1), python-dbus, python-gtk2 (>= 2.8.6-2), libqt3-mt-dev, libqt4-dev, xmltoman
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
+XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/avahi
Package: avahi-daemon
Section: net
@@ -42,9 +43,9 @@
Package: avahi-autoipd
Section: net
-Architecture: any
+Architecture: i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Recommends: dhclient, iproute
+Recommends: dhcp3-client, iproute
Conflicts: zeroconf
Description: Avahi DNS configuration tool
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
@@ -248,7 +249,7 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Avahi QT3 integration library
+Description: Avahi Qt3 integration library
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
running on a local network with no specific configuration. For
@@ -256,13 +257,13 @@
print to, files to look at and people to talk to.
.
This library contains the the interface to integrate the Avahi libraries
- into a QT3 main loop application.
+ into a Qt3 main loop application.
Package: libavahi-qt3-dev
Section: libdevel
Architecture: any
Depends: libavahi-qt3-1 (= ${Source-Version}), libqt3-mt-dev, ${misc:Depends}, libavahi-common-dev
-Description: Development headers for the Avahi QT3 integration library
+Description: Development headers for the Avahi Qt3 integration library
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
running on a local network with no specific configuration. For
@@ -270,13 +271,13 @@
print to, files to look at and people to talk to.
.
This package contains the development headers for the interface
- to integrate the Avahi libraries into a QT3 main loop application.
+ to integrate the Avahi libraries into a Qt3 main loop application.
Package: libavahi-qt4-1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Avahi QT4 integration library
+Description: Avahi Qt4 integration library
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
running on a local network with no specific configuration. For
@@ -284,13 +285,13 @@
print to, files to look at and people to talk to.
.
This library contains the the interface to integrate the Avahi libraries
- into a QT4 main loop application.
+ into a Qt4 main loop application.
Package: libavahi-qt4-dev
Section: libdevel
Architecture: any
Depends: libavahi-qt4-1 (= ${Source-Version}), libqt4-dev, ${misc:Depends}, libavahi-common-dev
-Description: Development headers for the Avahi QT4 integration library
+Description: Development headers for the Avahi Qt4 integration library
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
running on a local network with no specific configuration. For
@@ -298,7 +299,7 @@
print to, files to look at and people to talk to.
.
This package contains the development headers for the interface
- to integrate the Avahi libraries into a QT4 main loop application.
+ to integrate the Avahi libraries into a Qt4 main loop application.
Package: libavahi-compat-howl0
Section: libs
Added: packages/unstable/avahi/debian/patches/10_initscripts-scriptname.patch
===================================================================
--- packages/unstable/avahi/debian/patches/10_initscripts-scriptname.patch (rev 0)
+++ packages/unstable/avahi/debian/patches/10_initscripts-scriptname.patch 2006-10-17 17:17:44 UTC (rev 1062)
@@ -0,0 +1,20 @@
+--- initscript/debian/avahi-daemon.in.old 2006-10-17 18:58:43.005681000 +0200
++++ initscript/debian/avahi-daemon.in 2006-10-17 18:58:59.382704500 +0200
+@@ -83,6 +83,7 @@
+ DESC="Avahi mDNS/DNS-SD Daemon"
+ NAME="avahi-daemon"
+ DAEMON="@sbindir@/$NAME"
++SCRIPTNAME=/etc/init.d/$NAME
+
+ # Gracefully exit if the package has been removed.
+ test -x $DAEMON || exit 0
+--- initscript/debian/avahi-dnsconfd.in.old 2006-10-17 18:58:47.705974750 +0200
++++ initscript/debian/avahi-dnsconfd.in 2006-10-17 18:58:53.890361250 +0200
+@@ -83,6 +83,7 @@
+ DESC="Avahi Unicast DNS Configuration Daemon"
+ NAME="avahi-dnsconfd"
+ DAEMON="@sbindir@/$NAME"
++SCRIPTNAME=/etc/init.d/$NAME
+
+ # Gracefully exit if the package has been removed.
+ test -x $DAEMON || exit 0
Modified: packages/unstable/avahi/debian/rules
===================================================================
--- packages/unstable/avahi/debian/rules 2006-10-12 14:38:12 UTC (rev 1061)
+++ packages/unstable/avahi/debian/rules 2006-10-17 17:17:44 UTC (rev 1062)
@@ -9,6 +9,8 @@
include /usr/share/cdbs/1/rules/utils.mk
common-binary-post-install-arch:: list-missing
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
# Ensure at build time that the library has no dependencies on undefined
# symbols, and speed up loading.
LDFLAGS += -Wl,-z,defs -Wl,-O1
@@ -16,6 +18,9 @@
DEB_CONFIGURE_EXTRA_FLAGS += --enable-compat-libdns_sd --enable-compat-howl \
--disable-mono --disable-monodoc
+ifneq (linux,$(DEB_HOST_ARCH_OS))
+ DEB_CONFIGURE_EXTRA_FLAGS += --disable-autoipd
+endif
DEB_INSTALL_DOCS_ALL += docs/README docs/NEWS
More information about the Pkg-utopia-commits
mailing list