I'm attaching two patches to fix this. Please review soon if possible. If I don't hear back by Dec 26, I'll NMU this. That's the latest possible day to meet the cutoff for stretch.
>From 65bd793529cc6aae5f6f1946396cde03e55a2620 Mon Sep 17 00:00:00 2001 From: Dima Kogan <dko...@debian.org> Date: Sun, 25 Dec 2016 14:55:05 -0800 Subject: [PATCH 1/2] We can now build arch-dependent and arch-independent packages only I.e. "dpkg-buildpackage -A" and "dpkg-buildpackage -B" works. Closes: #806092 --- debian/rules | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/debian/rules b/debian/rules index 759ed3d..e7df4c7 100755 --- a/debian/rules +++ b/debian/rules @@ -10,26 +10,31 @@ CONFIGURE_OPTS=--disable-rpath --enable-dbus --disable-update-desktop-database - %: dh $@ --with=autotools_dev +# I configure build-gtk unconditionally (arch-dependent and arch-independent) +# because I need a single configure invocation in both cases override_dh_auto_configure: - dh_auto_configure --builddirectory build_gtk -- $(CONFIGURE_OPTS) --with-gui=gtk - dh_auto_configure --builddirectory build_lesstif -- $(CONFIGURE_OPTS) --with-gui=lesstif + dh_auto_configure --builddirectory build_gtk -- $(CONFIGURE_OPTS) --with-gui=gtk + dh_auto_configure -a --builddirectory build_lesstif -- $(CONFIGURE_OPTS) --with-gui=lesstif override_dh_auto_build: - dh_auto_build --builddirectory build_gtk - dh_auto_build --builddirectory build_lesstif + dh_auto_build -a --builddirectory build_gtk + dh_auto_build -a --builddirectory build_lesstif override_dh_auto_test: - dh_auto_test --builddirectory build_gtk - dh_auto_test --builddirectory build_lesstif + dh_auto_test -a --builddirectory build_gtk + dh_auto_test -a --builddirectory build_lesstif -override_dh_auto_install: - dh_auto_install --builddirectory build_gtk +override_dh_auto_install-arch: + make -C build_gtk install-exec DESTDIR=$$PWD/debian/tmp AM_UPDATE_INFO_DIR=no + +override_dh_auto_install-indep: + make -C build_gtk install-data DESTDIR=$$PWD/debian/tmp AM_UPDATE_INFO_DIR=no override_dh_auto_clean: dh_auto_clean --builddirectory build_gtk dh_auto_clean --builddirectory build_lesstif -override_dh_install: +override_dh_install-arch: # Remove needlessly installed static library and header file before # installing common files: rm -rf $(CURDIR)/debian/tmp/usr/lib @@ -42,6 +47,13 @@ override_dh_install: # Install pcb-lesstif binary: install build_lesstif/src/pcb debian/$(package)-lesstif/usr/bin/pcb-lesstif +override_dh_install-indep: + # Remove needlessly installed static library and header file before + # installing common files: + rm -rf $(CURDIR)/debian/tmp/usr/lib + rm -rf $(CURDIR)/debian/tmp/usr/include + dh_install -Xusr/bin -Xusr/share/pcb- -Xusr/share/doc -Xexamples -Xtutorial -Xusr/share/info + # Set executable bit for pcb tools: [ ! -d debian/$(package)-common ] || chmod a+x debian/$(package)-common/usr/share/pcb/tools/MergePCBPS [ ! -d debian/$(package)-common ] || chmod a+x debian/$(package)-common/usr/share/pcb/tools/Merge_dimPCBPS @@ -52,7 +64,7 @@ override_dh_install: # Remove empty dirs: [ ! -d debian/$(package)-common ] || find debian/$(package)-common -type d -empty -delete -override_dh_fixperms: +override_dh_fixperms-indep: dh_fixperms # Fix permissions of a couple of example files: [ ! -d debian/$(package)-common ] || chmod -x debian/$(package)-common/usr/share/doc/$(package)-common/examples/LED.pcb -- 2.10.1
>From 77ee5069c455bd3458a20875c328c9642ded0fdf Mon Sep 17 00:00:00 2001 From: Dima Kogan <dko...@debian.org> Date: Sun, 25 Dec 2016 14:56:11 -0800 Subject: [PATCH 2/2] changelog bump --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1fa754f..62c65c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pcb (20140316-3.1) unstable; urgency=medium + + * Non-maintainer upload + * Closes: #806092 + + -- Dima Kogan <dko...@debian.org> Sun, 25 Dec 2016 14:56:02 -0800 + pcb (20140316-3) unstable; urgency=medium * (Build-)Depend on unversioned tcl/tk -- 2.10.1
