Hi!
Attaching now a debdiff which patches debian/control and debian/rules
in the current version of the avahi package. With this patch applied,
I can build a stage1 version of avahi which allows to break the
dependency cycle between avahi and Qt/GTK.
I would be happy to do an NMU with the updated package, but it is, of
course, up to the maintainers to decide. In any case, the Debian
bootstrap folks and porters would be very happy when this bug
gets resolved.
Thanks,
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - [email protected]
`. `' Freie Universitaet Berlin - [email protected]
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
diff -Nru avahi-0.6.32~rc+dfsg/debian/control avahi-0.6.32~rc+dfsg/debian/control
--- avahi-0.6.32~rc+dfsg/debian/control 2015-11-04 21:48:19.000000000 +0100
+++ avahi-0.6.32~rc+dfsg/debian/control 2016-04-20 14:00:05.000000000 +0200
@@ -16,15 +16,15 @@
libgdbm-dev,
libglib2.0-dev (>= 2.4),
libgtk2.0-dev (>= 2.14.0),
- libgtk-3-dev,
+ libgtk-3-dev <!stage1>,
libexpat-dev,
libdaemon-dev (>= 0.11),
libdbus-1-dev (>= 0.60),
python-all-dev (>= 2.6.6-3~),
python-gdbm (>= 2.4.3),
- python-dbus,
- python-gtk2 (>= 2.8.6-2),
- libqt4-dev,
+ python-dbus <!stage1>,
+ python-gtk2 (>= 2.8.6-2) <!stage1>,
+ libqt4-dev <!stage1>,
xmltoman,
intltool (>= 0.35.0)
Standards-Version: 3.9.6
diff -Nru avahi-0.6.32~rc+dfsg/debian/rules avahi-0.6.32~rc+dfsg/debian/rules
--- avahi-0.6.32~rc+dfsg/debian/rules 2015-11-04 21:48:19.000000000 +0100
+++ avahi-0.6.32~rc+dfsg/debian/rules 2016-04-20 13:57:52.000000000 +0200
@@ -1,7 +1,14 @@
#!/usr/bin/make -f
+ifneq (,$(findstring stage1,$(DEB_BUILD_PROFILES)))
+DH_PACKAGE_EXCLUDES := -Npython-avahi -Navahi-discover \
+ -Nlibavahi-qt4-1 -Nlibavahi-qt4-dev \
+ -Nlibavahi-ui0 -Nlibavahi-ui-dev -Navahi-ui-utils \
+ -Nlibavahi-ui-gtk3-0 -Nlibavahi-ui-gtk3-dev
+endif
+
%:
- dh $@ --with autotools-dev,python2,systemd,autoreconf
+ dh $@ --with autotools-dev,python2,systemd,autoreconf $(DH_PACKAGE_EXCLUDES)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
@@ -13,13 +20,22 @@
# symbols, and speed up loading.
export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+ifneq (,$(findstring stage1,$(DEB_BUILD_PROFILES)))
+qt_conf_flags := --disable-qt3 --disable-qt4
+gtk_conf_flags := --disable-gtk3 --disable-gtk --disable-pygtk \
+ --disable-python-dbus
+else
+qt_conf_flags := --disable-qt3
+gtk_conf_flags := --enable-gtk3
+endif
+
override_dh_auto_configure:
dh_auto_configure -- $(CONFFLAGS) \
--enable-compat-libdns_sd \
--disable-mono \
--disable-monodoc \
- --disable-qt3 \
- --enable-gtk3 \
+ $(qt_conf_flags) \
+ $(gtk_conf_flags) \
--with-systemdsystemunitdir=/lib/systemd/system
override_dh_auto_build:
@@ -51,10 +67,10 @@
dh_installinit -pavahi-dnsconfd --restart-after-upgrade
override_dh_installdocs:
- dh_installdocs --all docs/NEWS docs/README
+ dh_installdocs --all $(DH_PACKAGE_EXCLUDES) docs/NEWS docs/README
override_dh_strip:
- dh_strip --dbg-package=avahi-dbg
+ dh_strip $(DH_PACKAGE_EXCLUDES) --dbg-package=avahi-dbg
override_dh_autoreconf:
NOCONFIGURE=1 dh_autoreconf --as-needed ./autogen.sh
