From e12b7beacb145e0359e66ec5d4cfc0494d3ca908 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 --- ubuntu/precise/libraries/kipi-plugins/debian/rules | 3 +++ ubuntu/precise/libraries/libkdcraw/debian/rules | 3 +++ ubuntu/precise/libraries/libkexiv2/debian/rules | 3 +++ ubuntu/precise/libraries/libkipi/debian/rules | 3 +++ ubuntu/precise/libraries/libksquirrel/debian/rules | 5 ++++- ubuntu/precise/libraries/libtdeldap/debian/rules | 3 +++ ubuntu/precise/libraries/libtqt-perl/debian/rules | 3 +++ ubuntu/precise/libraries/mlt++/debian/rules | 5 ++++- ubuntu/precise/libraries/mlt/debian/rules | 5 ++++- ubuntu/precise/libraries/pytdeextensions/debian/rules | 3 +++ ubuntu/precise/libraries/python-trinity/debian/rules | 5 ++++- 11 files changed, 37 insertions(+), 4 deletions(-) (limited to 'ubuntu/precise/libraries') diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/rules b/ubuntu/precise/libraries/kipi-plugins/debian/rules index 5177da213..c9f8bd279 100755 --- a/ubuntu/precise/libraries/kipi-plugins/debian/rules +++ b/ubuntu/precise/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/tde +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/precise/libraries/libkdcraw/debian/rules b/ubuntu/precise/libraries/libkdcraw/debian/rules index 7785e4bcc..f58c12e61 100755 --- a/ubuntu/precise/libraries/libkdcraw/debian/rules +++ b/ubuntu/precise/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/precise/libraries/libkexiv2/debian/rules b/ubuntu/precise/libraries/libkexiv2/debian/rules index 28a1c06e8..705840830 100755 --- a/ubuntu/precise/libraries/libkexiv2/debian/rules +++ b/ubuntu/precise/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/precise/libraries/libkipi/debian/rules b/ubuntu/precise/libraries/libkipi/debian/rules index 94eb41df3..ff0f40f12 100755 --- a/ubuntu/precise/libraries/libkipi/debian/rules +++ b/ubuntu/precise/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/precise/libraries/libksquirrel/debian/rules b/ubuntu/precise/libraries/libksquirrel/debian/rules index 4d113ccd7..f5bc572dc 100755 --- a/ubuntu/precise/libraries/libksquirrel/debian/rules +++ b/ubuntu/precise/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) @@ -88,7 +91,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/precise/libraries/libtdeldap/debian/rules b/ubuntu/precise/libraries/libtdeldap/debian/rules index 242fb2c84..9bed17b05 100755 --- a/ubuntu/precise/libraries/libtdeldap/debian/rules +++ b/ubuntu/precise/libraries/libtdeldap/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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/libraries/libtqt-perl/debian/rules b/ubuntu/precise/libraries/libtqt-perl/debian/rules index 7bf57d40b..1d77c70fc 100755 --- a/ubuntu/precise/libraries/libtqt-perl/debian/rules +++ b/ubuntu/precise/libraries/libtqt-perl/debian/rules @@ -32,6 +32,9 @@ DEB_MAKE_INSTALL_TARGET := install \ PREFIX=$(CURDIR)/debian/libtqt-perl/usr \ SITEPREFIX=$(CURDIR)/debian/libtqt-perl/usr \ +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + pre-build:: pre-build-stamp pre-build-stamp: diff --git a/ubuntu/precise/libraries/mlt++/debian/rules b/ubuntu/precise/libraries/mlt++/debian/rules index 0232c83be..99606e440 100755 --- a/ubuntu/precise/libraries/mlt++/debian/rules +++ b/ubuntu/precise/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/precise/libraries/mlt/debian/rules b/ubuntu/precise/libraries/mlt/debian/rules index 3889b6a3a..ce607fb77 100755 --- a/ubuntu/precise/libraries/mlt/debian/rules +++ b/ubuntu/precise/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/precise/libraries/pytdeextensions/debian/rules b/ubuntu/precise/libraries/pytdeextensions/debian/rules index 4dcfaaae8..b4ae203da 100755 --- a/ubuntu/precise/libraries/pytdeextensions/debian/rules +++ b/ubuntu/precise/libraries/pytdeextensions/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/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/pytdeextensions-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/precise/libraries/python-trinity/debian/rules b/ubuntu/precise/libraries/python-trinity/debian/rules index ffa56ad63..67af8c2d8 100755 --- a/ubuntu/precise/libraries/python-trinity/debian/rules +++ b/ubuntu/precise/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.3