diff -Nru libarchive-3.0.3/debian/changelog libarchive-3.0.3/debian/changelog --- libarchive-3.0.3/debian/changelog 2012-03-05 16:30:09.000000000 +0100 +++ libarchive-3.0.3/debian/changelog 2012-03-13 15:09:55.000000000 +0100 @@ -1,3 +1,9 @@ +libarchive (3.0.3-7) UNRELEASED; urgency=low + + * rules, control: Use cmake buildsystem to allow test verbosity + + -- Savvas Radevic Tue, 13 Mar 2012 14:44:35 +0100 + libarchive (3.0.3-6) unstable; urgency=low * Add patch to fix infinite loop in xps files (Closes: #662603) diff -Nru libarchive-3.0.3/debian/control libarchive-3.0.3/debian/control --- libarchive-3.0.3/debian/control 2012-03-05 16:28:36.000000000 +0100 +++ libarchive-3.0.3/debian/control 2012-03-13 15:09:21.000000000 +0100 @@ -12,6 +12,7 @@ libattr1-dev, sharutils, nettle-dev, + cmake, locales | locales-all Standards-Version: 3.9.3 Section: libs diff -Nru libarchive-3.0.3/debian/libarchive12.install libarchive-3.0.3/debian/libarchive12.install --- libarchive-3.0.3/debian/libarchive12.install 2012-03-05 16:28:36.000000000 +0100 +++ libarchive-3.0.3/debian/libarchive12.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/lib*.so.* diff -Nru libarchive-3.0.3/debian/libarchive-dev.install libarchive-3.0.3/debian/libarchive-dev.install --- libarchive-3.0.3/debian/libarchive-dev.install 2012-03-05 16:28:36.000000000 +0100 +++ libarchive-3.0.3/debian/libarchive-dev.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -usr/include -usr/lib/*/lib*.a -usr/lib/*/lib*.so -usr/lib/*/pkgconfig/* diff -Nru libarchive-3.0.3/debian/rules libarchive-3.0.3/debian/rules --- libarchive-3.0.3/debian/rules 2012-03-05 16:28:36.000000000 +0100 +++ libarchive-3.0.3/debian/rules 2012-03-13 18:32:10.000000000 +0100 @@ -3,22 +3,37 @@ .PHONY: build %: - dh $@ --parallel + dh $@ --parallel --buildsystem=cmake build: - dh $@ --parallel + dh $@ --parallel --buildsystem=cmake override_dh_auto_configure: - dh_auto_configure -- --without-openssl --with-nettle \ - --enable-bsdtar=shared --enable-bsdcpio=shared + #dh_auto_configure -- --without-openssl --with-nettle \ + # --enable-bsdtar=shared --enable-bsdcpio=shared + dh_auto_configure -v --buildsystem=cmake -- \ + -DENABLE_TAR_SHARED=TRUE -DENABLE_CPIO_SHARED=TRUE \ + -DENABLE_OPENSSL=FALSE -DENABLE_NETTLE=TRUE + +override_dh_auto_install: + dh_auto_install -v --parallel --buildsystem=cmake + #Couldn't find a variable to setup multiarch libdir + #cmake doesn't support multiarch on ubuntu 12.04 precise? + dh_install -plibarchive12 usr/lib/lib*.so.* usr/lib/$(DEB_HOST_MULTIARCH) + dh_install -plibarchive-dev usr/include + dh_install -plibarchive-dev usr/lib/lib*.a usr/lib/$(DEB_HOST_MULTIARCH) + dh_install -plibarchive-dev usr/lib/lib*.so usr/lib/$(DEB_HOST_MULTIARCH) + #There's no .pc file? + #dh_install -plibarchive-dev usr/lib/pkgconfig/* usr/lib/$(DEB_HOST_MULTIARCH) + #ls -R debian/ override_dh_auto_test: ifneq (,$(shell locale -a | grep en_US.utf8)) - dh_auto_test --parallel + dh_auto_test --parallel -v --buildsystem=cmake -- ARGS\+=-VV else mkdir -p tmp-locales localedef -i /usr/share/i18n/locales/en_US -c -f UTF-8 \ -A /usr/share/locale/locale.alias tmp-locales/en_US.UTF-8 - LOCPATH=$(CURDIR)/tmp-locales dh_auto_test --parallel + LOCPATH=$(CURDIR)/tmp-locales dh_auto_test --parallel -v --buildsystem=cmake -- ARGS\+=-VV rm -rf tmp-locales endif