I messed up the kfreebsd removal so here's another version. Ben.
-- Ben Hutchings If at first you don't succeed, you're doing about average.
diff -Nru libunwind-1.1/debian/changelog libunwind-1.1/debian/changelog --- libunwind-1.1/debian/changelog 2013-08-04 08:33:35.000000000 +0100 +++ libunwind-1.1/debian/changelog 2013-10-27 17:04:43.000000000 +0000 @@ -1,3 +1,21 @@ +libunwind (1.1-2.2) unstable; urgency=low + + * Non-maintainer upload + * Disable kfreebsd architectures for *all* binary packages + + -- Ben Hutchings <b...@decadent.org.uk> Sun, 27 Oct 2013 17:02:22 +0000 + +libunwind (1.1-2.1) unstable; urgency=low + + * Non-maintainer upload + * Remove dependence of libunwind-setjmp0 maintainer scripts on dpkg-dev + by substituting architecture at build time (Closes: #709125) + * Disable the test suite without depending on $DEB_BUILD_OPTIONS + (Closes: #727840) + * Disable kfreebsd architectures again, as they are not yet supported + + -- Ben Hutchings <b...@decadent.org.uk> Sun, 27 Oct 2013 16:25:44 +0000 + libunwind (1.1-2) unstable; urgency=low * debian/control: diff -Nru libunwind-1.1/debian/clean libunwind-1.1/debian/clean --- libunwind-1.1/debian/clean 1970-01-01 01:00:00.000000000 +0100 +++ libunwind-1.1/debian/clean 2013-10-27 15:47:11.000000000 +0000 @@ -0,0 +1,2 @@ +debian/libunwind-setjmp0.preinst +debian/libunwind-setjmp0.postrm diff -Nru libunwind-1.1/debian/control libunwind-1.1/debian/control --- libunwind-1.1/debian/control 2013-08-04 08:33:35.000000000 +0100 +++ libunwind-1.1/debian/control 2013-10-27 17:01:56.000000000 +0000 @@ -11,7 +11,7 @@ Package: libunwind8-dev Section: libdevel -Architecture: ia64 i386 amd64 ppc64 powerpc armel armhf kfreebsd-amd64 kfreebsd-i386 mips +Architecture: ia64 i386 amd64 ppc64 powerpc armel armhf mips Depends: ${misc:Depends}, libunwind8 (= ${binary:Version}) Conflicts: libunwind1-dev, libunwind7-dev Replaces: libunwind7-dev @@ -27,7 +27,7 @@ This package includes the development support files. Package: libunwind8 -Architecture: ia64 i386 amd64 ppc64 powerpc armel armhf kfreebsd-amd64 kfreebsd-i386 mips +Architecture: ia64 i386 amd64 ppc64 powerpc armel armhf mips Pre-Depends: multiarch-support Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: libunwind1-dev @@ -46,7 +46,7 @@ Package: libunwind8-dbg Section: debug Priority: extra -Architecture: ia64 i386 amd64 ppc64 powerpc armel armhf kfreebsd-amd64 kfreebsd-i386 mips +Architecture: ia64 i386 amd64 ppc64 powerpc armel armhf mips Depends: ${misc:Depends}, ${shlibs:Depends}, libunwind8 (= ${binary:Version}) Description: library to determine the call-chain of a program - runtime Contains debugging symbols for libunwind8. @@ -57,7 +57,7 @@ Package: libunwind-setjmp0-dev Section: libdevel -Architecture: ia64 i386 amd64 ppc64 powerpc armel armhf kfreebsd-amd64 kfreebsd-i386 mips +Architecture: ia64 i386 amd64 ppc64 powerpc armel armhf mips Depends: ${misc:Depends}, libunwind8-dev (= ${binary:Version}), libunwind-setjmp0 (= ${binary:Version}) Description: libunwind-based non local goto - development The unwind-setjmp library offers a libunwind-based implementation of @@ -69,9 +69,9 @@ This package includes the development support files Package: libunwind-setjmp0 -Architecture: ia64 i386 amd64 ppc64 powerpc armel armhf kfreebsd-amd64 kfreebsd-i386 mips +Architecture: ia64 i386 amd64 ppc64 powerpc armel armhf mips Pre-Depends: multiarch-support -Depends: ${misc:Depends}, ${shlibs:Depends}, dpkg-dev +Depends: ${misc:Depends}, ${shlibs:Depends} Description: libunwind-based non local goto - runtime The unwind-setjmp library offers a libunwind-based implementation of non-local gotos. This implementation is intended to be a drop-in @@ -84,7 +84,7 @@ Package: libunwind-setjmp0-dbg Section: debug Priority: extra -Architecture: ia64 i386 amd64 ppc64 powerpc armel armhf kfreebsd-amd64 kfreebsd-i386 mips +Architecture: ia64 i386 amd64 ppc64 powerpc armel armhf mips Depends: ${misc:Depends}, ${shlibs:Depends}, libunwind-setjmp0 (= ${binary:Version}) Description: libunwind-based non local goto - runtime Contains debugging symbols for libunwind8. diff -Nru libunwind-1.1/debian/libunwind-setjmp0.postrm libunwind-1.1/debian/libunwind-setjmp0.postrm --- libunwind-1.1/debian/libunwind-setjmp0.postrm 2013-08-04 08:33:35.000000000 +0100 +++ libunwind-1.1/debian/libunwind-setjmp0.postrm 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh -set -e -ARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH` -if [ remove = "$1" ]; then - dpkg-divert --package libunwind-setjmp0 --remove --rename --divert /usr/lib/$ARCH/libunwind-setjmp.so.0.0.0.old /usr/lib/$ARCH/libunwind-setjmp.so.0.0.0 - dpkg-divert --package libunwind-setjmp0 --remove --rename --divert /usr/lib/$ARCH/libunwind-setjmp.so.0.old /usr/lib/$ARCH/libunwind-setjmp.so.0 -fi -#DEBHELPER# diff -Nru libunwind-1.1/debian/libunwind-setjmp0.postrm.in libunwind-1.1/debian/libunwind-setjmp0.postrm.in --- libunwind-1.1/debian/libunwind-setjmp0.postrm.in 1970-01-01 01:00:00.000000000 +0100 +++ libunwind-1.1/debian/libunwind-setjmp0.postrm.in 2013-10-27 15:47:11.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +if [ remove = "$1" ]; then + dpkg-divert --package libunwind-setjmp0 --remove --rename --divert /usr/lib/@DEB_HOST_MULTIARCH@/libunwind-setjmp.so.0.0.0.old /usr/lib/@DEB_HOST_MULTIARCH@/libunwind-setjmp.so.0.0.0 + dpkg-divert --package libunwind-setjmp0 --remove --rename --divert /usr/lib/@DEB_HOST_MULTIARCH@/libunwind-setjmp.so.0.old /usr/lib/@DEB_HOST_MULTIARCH@/libunwind-setjmp.so.0 +fi +#DEBHELPER# diff -Nru libunwind-1.1/debian/libunwind-setjmp0.preinst libunwind-1.1/debian/libunwind-setjmp0.preinst --- libunwind-1.1/debian/libunwind-setjmp0.preinst 2013-08-04 08:33:35.000000000 +0100 +++ libunwind-1.1/debian/libunwind-setjmp0.preinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh -set -e -ARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH` -if [ install = "$1" ]; then - dpkg-divert --package libunwind-setjmp0 --add --rename --divert /usr/lib/$ARCH/libunwind-setjmp.so.0.0.0.old /usr/lib/$ARCH/libunwind-setjmp.so.0.0.0 - dpkg-divert --package libunwind-setjmp0 --add --rename --divert /usr/lib/$ARCH/libunwind-setjmp.so.0.old /usr/lib/$ARCH/libunwind-setjmp.so.0 -fi -#DEBHELPER# diff -Nru libunwind-1.1/debian/libunwind-setjmp0.preinst.in libunwind-1.1/debian/libunwind-setjmp0.preinst.in --- libunwind-1.1/debian/libunwind-setjmp0.preinst.in 1970-01-01 01:00:00.000000000 +0100 +++ libunwind-1.1/debian/libunwind-setjmp0.preinst.in 2013-10-27 15:47:11.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +if [ install = "$1" ]; then + dpkg-divert --package libunwind-setjmp0 --add --rename --divert /usr/lib/@DEB_HOST_MULTIARCH@/libunwind-setjmp.so.0.0.0.old /usr/lib/@DEB_HOST_MULTIARCH@/libunwind-setjmp.so.0.0.0 + dpkg-divert --package libunwind-setjmp0 --add --rename --divert /usr/lib/@DEB_HOST_MULTIARCH@/libunwind-setjmp.so.0.old /usr/lib/@DEB_HOST_MULTIARCH@/libunwind-setjmp.so.0 +fi +#DEBHELPER# diff -Nru libunwind-1.1/debian/rules libunwind-1.1/debian/rules --- libunwind-1.1/debian/rules 2013-08-04 08:33:35.000000000 +0100 +++ libunwind-1.1/debian/rules 2013-10-27 15:47:11.000000000 +0000 @@ -5,14 +5,23 @@ #export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format -DEB_BUILD_OPTIONS=nocheck %: dh $@ --parallel --with autoreconf +binary binary-arch: debian/libunwind-setjmp0.preinst debian/libunwind-setjmp0.postrm + +debian/libunwind-setjmp0.%: debian/libunwind-setjmp0.%.in + $(if $(DEB_HOST_MULTIARCH),:,$(error DEB_HOST_MULTIARCH is not defined)) + sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ + override_dh_auto_configure: dh_auto_configure -- --with-pic --enable-cxx-exceptions --enable-minidebuginfo +# Test suite currently always fails +override_dh_auto_test: + : + override_dh_install: dh_install for d in libunwind8 libunwind8-dev ; do \
signature.asc
Description: This is a digitally signed message part