Hi Michael! On 04/20/2016 03:23 PM, Michael Biebl wrote: > Please check the lintian errors regarding specifiers. > > I also think you don't want findstring here, as this would match a > (hypothetical) stage10 stage. > Splitting up qt_conf_flags and gtk_conf_flags doesn't seem necessary, > wookey's patch was simpler in that regard.
You are right. I shouldn't have used Daniel's patch without further review. I have now revised and simplified my patch and verified that the package builds correctly with both --profile=stage1 and without. I have dropped the DH_PACKAGE_EXCLUDE mechanism completely and used the Build-Profiles field in debian/control. In debian/rules, I have used "filter" instead of "findstring" and just tuned CONFFLAGS depending on the current build profile. I'm also not getting any lintian errors regarding specifiers anymore. Attaching the updated patch. Let me know what you think! 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/changelog avahi-0.6.32~rc+dfsg/debian/changelog --- avahi-0.6.32~rc+dfsg/debian/changelog 2015-11-04 21:48:19.000000000 +0100 +++ avahi-0.6.32~rc+dfsg/debian/changelog 2016-04-21 14:39:20.000000000 +0200 @@ -1,3 +1,11 @@ +avahi (0.6.32~rc+dfsg-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add a stage1 build profile which disables GTK, Qt4 and + Python-GTK bindings in order to reduce build dependencies. + + -- John Paul Adrian Glaubitz <[email protected]> Thu, 21 Apr 2016 14:39:03 +0200 + avahi (0.6.32~rc+dfsg-1) unstable; urgency=medium * Team upload. 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-21 13:51:59.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 @@ -105,6 +105,7 @@ libavahi-common-data (>= 0.6.22), python-dbus Provides: ${python:Provides} +Build-Profiles: <!stage1> Description: Python utility package for Avahi Avahi is a fully LGPL framework for Multicast DNS Service Discovery. It allows programs to publish and discover services and hosts @@ -138,6 +139,7 @@ python-gtk2 (>= 2.8.6-2), python-glade2, avahi-daemon +Build-Profiles: <!stage1> Description: Service discover user interface for avahi Avahi is a fully LGPL framework for Multicast DNS Service Discovery. It allows programs to publish and discover services and hosts @@ -346,6 +348,7 @@ ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same +Build-Profiles: <!stage1> 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 @@ -363,6 +366,7 @@ ${misc:Depends}, libqt4-dev, libavahi-common-dev +Build-Profiles: <!stage1> Description: Development headers for the 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 @@ -413,6 +417,7 @@ ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same +Build-Profiles: <!stage1> 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 @@ -430,6 +435,7 @@ libavahi-client-dev, libavahi-glib-dev, libgtk2.0-dev +Build-Profiles: <!stage1> Description: Development headers for the 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 @@ -446,6 +452,7 @@ ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same +Build-Profiles: <!stage1> Description: Avahi GTK+ User interface library for GTK3 Avahi is a fully LGPL framework for Multicast DNS Service Discovery. It allows programs to publish and discover services and hosts @@ -464,6 +471,7 @@ libavahi-glib-dev, libgtk-3-dev Conflicts: libavahi-ui-dev +Build-Profiles: <!stage1> Description: Development headers for the 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 @@ -479,6 +487,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: ssh-client, vnc-viewer +Build-Profiles: <!stage1> Description: Avahi GTK+ utilities Avahi is a fully LGPL framework for Multicast DNS Service Discovery. It allows programs to publish and discover services and hosts 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-21 14:17:14.000000000 +0200 @@ -13,13 +13,18 @@ # symbols, and speed up loading. export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed +ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),) + CONFFLAGS += --disable-qt3 --disable-qt4 \ + --disable-gtk3 --disable-gtk \ + --disable-pygtk --disable-python-dbus +endif + override_dh_auto_configure: dh_auto_configure -- $(CONFFLAGS) \ --enable-compat-libdns_sd \ --disable-mono \ --disable-monodoc \ --disable-qt3 \ - --enable-gtk3 \ --with-systemdsystemunitdir=/lib/systemd/system override_dh_auto_build:
signature.asc
Description: OpenPGP digital signature
