From 64aefa71763dd8803f9db537f4b16c24092ce763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 11 Dec 2012 03:02:18 +0100 Subject: Use xz (or bzip2) compression for Debian and Ubuntu binary packages (cherry picked from commit e12b7beacb145e0359e66ec5d4cfc0494d3ca908) --- ubuntu/maverick/libraries/kipi-plugins/debian/rules | 3 +++ ubuntu/maverick/libraries/libkdcraw/debian/rules | 3 +++ ubuntu/maverick/libraries/libkexiv2/debian/rules | 3 +++ ubuntu/maverick/libraries/libkipi/debian/rules | 3 +++ ubuntu/maverick/libraries/libksquirrel/debian/rules | 5 ++++- ubuntu/maverick/libraries/mlt++/debian/rules | 5 ++++- ubuntu/maverick/libraries/mlt/debian/rules | 5 ++++- ubuntu/maverick/libraries/pykdeextensions/debian/rules | 3 +++ ubuntu/maverick/libraries/python-trinity/debian/rules | 5 ++++- 9 files changed, 31 insertions(+), 4 deletions(-) (limited to 'ubuntu/maverick/libraries') diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/rules b/ubuntu/maverick/libraries/kipi-plugins/debian/rules index 1caedd446..31dcdd4e7 100755 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/rules +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/rules @@ -20,6 +20,9 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean :: rm -f po/*/*.gmo diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/rules b/ubuntu/maverick/libraries/libkdcraw/debian/rules index f4b4cef98..bbc6f0d96 100755 --- a/ubuntu/maverick/libraries/libkdcraw/debian/rules +++ b/ubuntu/maverick/libraries/libkdcraw/debian/rules @@ -16,3 +16,6 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed" DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/rules b/ubuntu/maverick/libraries/libkexiv2/debian/rules index dc80327f0..60174829a 100755 --- a/ubuntu/maverick/libraries/libkexiv2/debian/rules +++ b/ubuntu/maverick/libraries/libkexiv2/debian/rules @@ -19,6 +19,9 @@ DEB_KDE_ENABLE_FINAL = yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + get-orig-source: @@dh_testdir @@[ -d ../tarballs/. ]||mkdir -p ../tarballs diff --git a/ubuntu/maverick/libraries/libkipi/debian/rules b/ubuntu/maverick/libraries/libkipi/debian/rules index ac4091f53..3dd1a10a6 100755 --- a/ubuntu/maverick/libraries/libkipi/debian/rules +++ b/ubuntu/maverick/libraries/libkipi/debian/rules @@ -18,6 +18,9 @@ DEB_KDE_ENABLE_FINAL = yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean :: rm -f po/*/*.gmo diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/rules b/ubuntu/maverick/libraries/libksquirrel/debian/rules index 02615195b..5fdceafac 100755 --- a/ubuntu/maverick/libraries/libksquirrel/debian/rules +++ b/ubuntu/maverick/libraries/libksquirrel/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -85,7 +88,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/ubuntu/maverick/libraries/mlt++/debian/rules b/ubuntu/maverick/libraries/mlt++/debian/rules index cf8cb1984..cd87c6cce 100755 --- a/ubuntu/maverick/libraries/mlt++/debian/rules +++ b/ubuntu/maverick/libraries/mlt++/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -88,7 +91,7 @@ binary-arch: build install dh_shlibdeps -l/opt/trinity/lib dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/ubuntu/maverick/libraries/mlt/debian/rules b/ubuntu/maverick/libraries/mlt/debian/rules index b4b16188a..d45bb4be3 100755 --- a/ubuntu/maverick/libraries/mlt/debian/rules +++ b/ubuntu/maverick/libraries/mlt/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1) NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) @@ -114,7 +117,7 @@ binary-arch: build install dh_shlibdeps --exclude=libmlt --exclude=libmiracle --exclude=libvalerie dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/rules b/ubuntu/maverick/libraries/pykdeextensions/debian/rules index fb93a8396..046d525d3 100755 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/rules +++ b/ubuntu/maverick/libraries/pykdeextensions/debian/rules @@ -18,6 +18,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/pykdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" diff --git a/ubuntu/maverick/libraries/python-trinity/debian/rules b/ubuntu/maverick/libraries/python-trinity/debian/rules index 98178d114..6051507bb 100755 --- a/ubuntu/maverick/libraries/python-trinity/debian/rules +++ b/ubuntu/maverick/libraries/python-trinity/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + #include /usr/share/dpatch/dpatch.make # This has to be exported to make some magic below work. export DH_OPTIONS @@ -151,7 +154,7 @@ endif dh_shlibdeps -l /opt/trinity/lib dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: install-indep -- cgit v1.2.1