Bug#893482: dconf FTCBFS: Exec format error during ./dconf-scan

[Helmut Grohne]

Source: dconf
Version: 0.26.1-3
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

dconf fails to cross build from source, because it fails running
./dconf-scan with an Exec format error. Bummer. Now looking closer, this
happens in the docs subdirectory. Aren't docs in an Architecture: all
package? Yes, why are we building them? So when I pass --disable-gtk-doc
for arch-only builds, a cross build succeeds. And with reproducible
builds, I checked that it results in bit-identical packages to
--enable-gtk-doc. So we can make it cross build, reduce Build-Depends
and make the build faster. Can you apply the attached patch?

Helmut
-------------- next part --------------
diff --minimal -Nru dconf-0.26.1/debian/changelog dconf-0.26.1/debian/changelog
--- dconf-0.26.1/debian/changelog	2018-01-19 20:57:36.000000000 +0100
+++ dconf-0.26.1/debian/changelog	2018-03-19 10:00:41.000000000 +0100
@@ -1,3 +1,10 @@
+dconf (0.26.1-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: --disable-gtk-doc during arch-only builds. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 19 Mar 2018 10:00:41 +0100
+
 dconf (0.26.1-3) unstable; urgency=medium
 
   * Rename source package from d-conf to dconf to match the upstream name.
diff --minimal -Nru dconf-0.26.1/debian/control dconf-0.26.1/debian/control
--- dconf-0.26.1/debian/control	2018-01-19 20:57:36.000000000 +0100
+++ dconf-0.26.1/debian/control	2018-03-19 10:00:41.000000000 +0100
@@ -8,14 +8,14 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Iain Lane <laney at debian.org>, Jeremy Bicha <jbicha at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 11),
+               docbook-xsl,
                gnome-pkg-tools,
-               gtk-doc-tools (>= 1.15),
                intltool (>= 0.50.0),
                xsltproc,
                valac (>= 0.18.0),
                libglib2.0-dev (>= 2.44.0),
                libxml2-dev
-Build-Depends-Indep: libglib2.0-doc
+Build-Depends-Indep: gtk-doc-tools (>= 1.15), libglib2.0-doc
 Standards-Version: 4.1.3
 Vcs-Browser: https://salsa.debian.org/gnome-team/dconf
 Vcs-Git: https://salsa.debian.org/gnome-team/dconf.git
diff --minimal -Nru dconf-0.26.1/debian/rules dconf-0.26.1/debian/rules
--- dconf-0.26.1/debian/rules	2018-01-19 20:57:36.000000000 +0100
+++ dconf-0.26.1/debian/rules	2018-03-19 10:00:39.000000000 +0100
@@ -9,7 +9,7 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--enable-gtk-doc \
+		--$(if $(filter libdconf-doc,$(shell dh_listpackages)),enable,disable)-gtk-doc \
 		--libexecdir=/usr/lib/dconf \
 		--with-gio-modules-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/gio/modules