diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-12-11 03:02:18 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-12-11 03:51:58 +0100 |
| commit | 64aefa71763dd8803f9db537f4b16c24092ce763 (patch) | |
| tree | 6a3d62e0a6c7d2aee9d0ecac288cd746d06f8714 /ubuntu/maverick/dependencies | |
| parent | d14557087bc123c802c56d30190a2c4f6151b586 (diff) | |
| download | tde-packaging-64aefa71763dd8803f9db537f4b16c24092ce763.tar.gz tde-packaging-64aefa71763dd8803f9db537f4b16c24092ce763.zip | |
Use xz (or bzip2) compression for Debian and Ubuntu binary packages
(cherry picked from commit e12b7beacb145e0359e66ec5d4cfc0494d3ca908)
Diffstat (limited to 'ubuntu/maverick/dependencies')
6 files changed, 20 insertions, 2 deletions
diff --git a/ubuntu/maverick/dependencies/arts/debian/rules b/ubuntu/maverick/dependencies/arts/debian/rules index 63cfa2119..e192c8e45 100755 --- a/ubuntu/maverick/dependencies/arts/debian/rules +++ b/ubuntu/maverick/dependencies/arts/debian/rules @@ -23,6 +23,9 @@ DEB_BUILD_PARALLEL = true DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity DEB_DH_MAKESHLIBS_ARGS_ALL := -V diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/rules b/ubuntu/maverick/dependencies/avahi-tqt/debian/rules index d4694a4bf..54a22a44f 100755 --- a/ubuntu/maverick/dependencies/avahi-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/rules @@ -13,6 +13,9 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --disable-gtk3 \ --with-systemdsystemunitdir=/lib/systemd/system +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/maverick/dependencies/dbus-1-tqt/debian/rules b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules index c6e5c11f5..6a0f5bbed 100755 --- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules @@ -4,3 +4,6 @@ include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules b/ubuntu/maverick/dependencies/dbus-tqt/debian/rules index d0c9ab9a7..3edd7c59c 100755 --- a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/dbus-tqt/debian/rules @@ -10,3 +10,6 @@ include /usr/share/cdbs/1/class/cmake.mk # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules index be4c49e74..fe7b55dc0 100755 --- a/ubuntu/maverick/dependencies/qt3/debian/rules +++ b/ubuntu/maverick/dependencies/qt3/debian/rules @@ -11,6 +11,9 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -326,7 +329,7 @@ binary-indep: build install dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) binary-arch: build install @@ -468,7 +471,7 @@ binary-arch: build install dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) - dh_builddeb -a $(IBASE) + dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build binary-indep binary-arch binary install clean patch unpatch diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/rules b/ubuntu/maverick/dependencies/tqtinterface/debian/rules index 928631538..ed3f07a6d 100755 --- a/ubuntu/maverick/dependencies/tqtinterface/debian/rules +++ b/ubuntu/maverick/dependencies/tqtinterface/debian/rules @@ -14,6 +14,9 @@ DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_LIBRARY_PATH="/usr/lib" -DCMAKE_INCLUDE_PATH="/usr/include" -DCMAKE_VERBOSE_MAKEFILE="ON" -DWITH_QT3="ON" -DQTDIR="/usr/share/qt3" -DQT_LIBRARY_DIRS="/usr/share/qt3/lib" -DBUILD_ALL="ON" -DUSE_QT3="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true |