Source: libxml2
Version: 2.9.4+dfsg1-4
Severity: serious
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
Control: block 795432 by -1
Besides #876308, libxml2 also fails to build from source, because
debhelper/10.9 became stricter wrt. passing of -p and -N flags, see
#795432. Thus, building libxml2 with the nopython profile currently
fails for referencing libxml2-udeb, which is only present in Ubuntu. I
believe that this affects the profile-less build as well, but we cannot
tell, because the profile less build fails with #876308. Assuming that
this will become a standard FTBFS, I am marking it serious. The attached
patch fixes the nopython build at least. Maybe it also fixes the full
build.
Helmut
diff --minimal -Nru libxml2-2.9.4+dfsg1/debian/changelog
libxml2-2.9.4+dfsg1/debian/changelog
--- libxml2-2.9.4+dfsg1/debian/changelog 2017-09-04 11:46:04.000000000
+0200
+++ libxml2-2.9.4+dfsg1/debian/changelog 2017-09-25 05:57:49.000000000
+0200
@@ -1,3 +1,11 @@
+libxml2 (2.9.4+dfsg1-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS: Fix debhelper -p and -N flags. (Regressed in debhelper/10.9,
+ Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 25 Sep 2017 05:57:49 +0200
+
libxml2 (2.9.4+dfsg1-4) unstable; urgency=medium
* Team upload.
diff --minimal -Nru libxml2-2.9.4+dfsg1/debian/rules
libxml2-2.9.4+dfsg1/debian/rules
--- libxml2-2.9.4+dfsg1/debian/rules 2017-07-04 21:55:22.000000000 +0200
+++ libxml2-2.9.4+dfsg1/debian/rules 2017-09-25 05:57:49.000000000 +0200
@@ -32,7 +32,6 @@
TARGETS += udeb
else
$(if $(shell grep -q libxml2-udeb debian/control && echo yes),$(shell sed -i
/libxml2-udeb/,\$$d debian/control))
-export DH_OPTIONS = -Nlibxml2-udeb
endif
CONFIGURE_FLAGS := --disable-silent-rules --with-history
--cache-file="$(CURDIR)/builddir/config.cache"
@@ -117,18 +116,20 @@
dh_installchangelogs -k NEWS
override_dh_install-arch:
- dh_install -Npython-libxml2-dbg -Npython3-libxml2-dbg -Nlibxml2-udeb
+ dh_install -Npython-libxml2-dbg -Npython3-libxml2-dbg $(if
$(WITH_UDEB),-Nlibxml2-udeb)
ifneq (,$(filter python-libxml2-dbg,$(DOPACKAGES)))
dh_install -ppython-libxml2-dbg --sourcedir=debian/tmp-dbg
endif
ifneq (,$(filter python3-libxml2-dbg,$(DOPACKAGES)))
dh_install -ppython3-libxml2-dbg --sourcedir=debian/tmp-dbg
endif
+ifneq ($(WITH_UDEB),)
dh_install -plibxml2-udeb --sourcedir=debian/tmp-udeb
+endif
sed -i -e 's,/lib/$(DEB_HOST_MULTIARCH),/lib,'
debian/libxml2-dev/usr/bin/xml2-config
override_dh_strip:
- dh_strip -a --dbg-package=libxml2-dbg -Nlibxml2-udeb -Nlibxml2-utils
-Nlibxml2-utils-dbg -Npython-libxml2 -Npython-libxml2-dbg -Npython3-libxml2
-Npython3-libxml2-dbg
+ dh_strip -a --dbg-package=libxml2-dbg $(if $(WITH_UDEB),-Nlibxml2-udeb)
-Nlibxml2-utils -Npython-libxml2 -Npython-libxml2-dbg -Npython3-libxml2
-Npython3-libxml2-dbg
ifneq (,$(filter python-libxml2 python-libxml2-dbg,$(DOPACKAGES)))
dh_strip -ppython-libxml2 --dbg-package=python-libxml2-dbg
endif
