Tags: patch

The changes Santiago Vila suggested do fix the FTBFS. However, it will
build all arch-dependent files (except the packages) anyway. Fixing that
would need further diving into the build system.

The attached patch makes the suggested changes. It applies against
3.3.5+dfsg-1 and 3.3.4+dfsg-6.
--- rules_original	2016-09-07 06:01:45.650884699 +0200
+++ rules	2016-09-07 05:39:22.320417413 +0200
@@ -242,28 +242,47 @@
 
 # Build architecture-independent files here.
 binary-indep: install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installchangelogs -i Changelog
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_install -i --sourcedir=debian/tmp/
+	dh_install -i --sourcedir=debian/tmp/
+	dh_installman -i
+	dh_lintian -i
+	dh_link -i
+	dh_strip -i --dbg-package=libwt-dbg
+	dh_compress -i -Xwt.doc -Xauth.doc -Xdbo.doc -XDoxyfile -X.html -X.C -X.h -X.txt -X.map -X.xml -X.js -X.csv -XWQApplication -X.qch -A
+	dh_makeshlibs -i -V
+	dh_shlibdeps -i -- -S$(CURDIR)/debian/tmp/usr/lib/
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs Changelog
-	dh_installdocs
-	dh_installexamples
-	dh_install --sourcedir=debian/tmp/
-	dh_install --sourcedir=debian/tmp/
-	dh_installman
-	dh_lintian
-	dh_link
-	dh_strip --dbg-package=libwt-dbg
-	dh_compress -Xwt.doc -Xauth.doc -Xdbo.doc -XDoxyfile -X.html -X.C -X.h -X.txt -X.map -X.xml -X.js -X.csv -XWQApplication -X.qch -A
-	dh_makeshlibs -V
+	dh_testdir -a
+	dh_testroot -a
+	dh_installchangelogs -a Changelog
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_install -a --sourcedir=debian/tmp/
+	dh_install -a --sourcedir=debian/tmp/
+	dh_installman -a
+	dh_lintian -a
+	dh_link -a
+	dh_strip -a --dbg-package=libwt-dbg
+	dh_compress -a -Xwt.doc -Xauth.doc -Xdbo.doc -XDoxyfile -X.html -X.C -X.h -X.txt -X.map -X.xml -X.js -X.csv -XWQApplication -X.qch -A
+	dh_makeshlibs -a -V
 	dh_shlibdeps -a -- -S$(CURDIR)/debian/tmp/usr/lib/
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

Reply via email to