Control: tags -1 + patch
On Tue, 24 Nov 2015 at 15:27:06 +0000, Santiago Vila wrote:
> I tried to build this package with "dpkg-buildpackage -A"
> (i.e. only architecture-independent packages), and it failed
This also affects Salvatore Bonaccorso's recent security-fix NMU.
> * If not, debian/rules should be modified so that the binary-indep
> target works in all cases, even when binary-arch is not used (this is
> what the "Architecture: all" autobuilder does).
See attached patch, also available from:
ssh://git.debian.org/git/users/smcv/libxml2.git -b arch-all-only
Regards,
S
>From 629f6b4f524386811f79636fb862575c4b591d89 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Fri, 3 Jun 2016 08:16:23 +0100
Subject: [PATCH] Add -arch suffix to some architecture-specific debhelper
overrides
This fixes FTBFS with dpkg-buildpackage -A or when source-only uploads
are used (Closes: #806065)
Do a build for the default Python version even when we are
building arch-indep-only: we need something for gtk-doc to analyze.
---
debian/changelog | 11 +++++++++++
debian/rules | 11 ++++++++---
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 40f4a43..0df1dec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libxml2 (2.9.3+dfsg1-1.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add -arch suffix to some architecture-specific debhelper overrides,
+ fixing FTBFS with dpkg-buildpackage -A or when source-only uploads
+ are used (Closes: #806065)
+ - Do a build for the default Python version even when we are
+ building arch-indep-only: we need something for gtk-doc to analyze
+
+ -- Simon McVittie <s...@debian.org> Fri, 03 Jun 2016 08:07:56 +0100
+
libxml2 (2.9.3+dfsg1-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/rules b/debian/rules
index 5b849df..c9e47a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,19 +63,24 @@ dobuild-python%-dbg: BUILD_FLAGS += PYTHON_INCLUDES="$(shell $(DEB_HOST_GNU_TYPE
#override_dh_auto_build: $(TARGETS:%=dobuild-%)
build-arch: $(TARGETS:%=dobuild-%)
-build-indep:
+build-indep: dobuild-main
build: build-arch build-indep
override_dh_auto_clean:
rm -rf builddir debian/tmp-dbg debian/tmp-udeb
dh_auto_clean
-override_dh_auto_install: $(TARGETS:%=doinstall-%)
+override_dh_auto_install-arch: $(TARGETS:%=doinstall-%)
+ find debian/ -name *.la -delete
+
+override_dh_auto_install-indep: doinstall-main
find debian/ -name *.la -delete
doinstall-main:
dh_auto_install --builddirectory=builddir/main
mv debian/tmp/usr/share/aclocal/libxml.m4 debian/tmp/usr/share/aclocal/libxml2.m4
+
+override_dh_auto_install-indep:
# Properly install documentation in /usr/share/doc/libxml2-doc
install -d debian/tmp/usr/share/doc/libxml2-doc/examples
install -m 644 \
@@ -113,7 +118,7 @@ override_dh_installchangelogs:
dh_installchangelogs -plibxml2 ChangeLog
dh_installchangelogs -Nlibxml2 -XChangeLog
-override_dh_install:
+override_dh_install-arch:
dh_install -Npython-libxml2-dbg -Nlibxml2-udeb
ifneq ($(DEB_BUILD_PROFILE),stage1)
dh_install -ppython-libxml2-dbg --sourcedir=debian/tmp-dbg
--
2.8.1
