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:23:05 +0100 |
| commit | e12b7beacb145e0359e66ec5d4cfc0494d3ca908 (patch) | |
| tree | e86872f1a89da47dcecfbec08d7d2d9749d8cf38 /ubuntu | |
| parent | cbad8f3b74c7eae27da2e4fac11b736a879e2f47 (diff) | |
| download | tde-packaging-e12b7beacb145e0359e66ec5d4cfc0494d3ca908.tar.gz tde-packaging-e12b7beacb145e0359e66ec5d4cfc0494d3ca908.zip | |
Use xz (or bzip2) compression for Debian and Ubuntu binary packages
Diffstat (limited to 'ubuntu')
285 files changed, 939 insertions, 86 deletions
diff --git a/ubuntu/maverick/applications/abakus/debian/rules b/ubuntu/maverick/applications/abakus/debian/rules index d0a475105..c856f7cae 100755 --- a/ubuntu/maverick/applications/abakus/debian/rules +++ b/ubuntu/maverick/applications/abakus/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 diff --git a/ubuntu/maverick/applications/adept/debian/rules b/ubuntu/maverick/applications/adept/debian/rules index ee86e8e4f..742307eb6 100755 --- a/ubuntu/maverick/applications/adept/debian/rules +++ b/ubuntu/maverick/applications/adept/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_MAKE_CHECK_TARGET := check DEB_CONFIGURE_EXTRA_FLAGS += --enable-adept --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) + # Enable us to locate the old libept-trinity library and includes CPPFLAGS += -I/opt/trinity/include LDFLAGS += -L/opt/trinity/lib -lept diff --git a/ubuntu/maverick/applications/amarok/debian/rules b/ubuntu/maverick/applications/amarok/debian/rules index deb43ebf7..77b0e3159 100755 --- a/ubuntu/maverick/applications/amarok/debian/rules +++ b/ubuntu/maverick/applications/amarok/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --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) + ### VARIABLES # Exempt amarok engines from being handled as proper public libraries # by dh_makeshlibs diff --git a/ubuntu/maverick/applications/basket/debian/rules b/ubuntu/maverick/applications/basket/debian/rules index 46b74ab7e..d3cf5255e 100755 --- a/ubuntu/maverick/applications/basket/debian/rules +++ b/ubuntu/maverick/applications/basket/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) + # 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) @@ -101,7 +104,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/applications/bibletime/debian/rules b/ubuntu/maverick/applications/bibletime/debian/rules index ea4b62326..4106bf0f4 100755 --- a/ubuntu/maverick/applications/bibletime/debian/rules +++ b/ubuntu/maverick/applications/bibletime/debian/rules @@ -19,6 +19,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + binary-install/bibletime-trinity:: chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules index c5dd59ccb..85efaa2fa 100755 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules +++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/rules b/ubuntu/maverick/applications/desktop-effects-tde/debian/rules index 7bf3e3306..d494616db 100755 --- a/ubuntu/maverick/applications/desktop-effects-tde/debian/rules +++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/rules @@ -9,5 +9,8 @@ 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) + binary-install/desktop-effects-tde-trinity:: dh_pycentral -pdesktop-effects-tde-trinity diff --git a/ubuntu/maverick/applications/digikam/debian/rules b/ubuntu/maverick/applications/digikam/debian/rules index 4edd6e763..76fa321bc 100755 --- a/ubuntu/maverick/applications/digikam/debian/rules +++ b/ubuntu/maverick/applications/digikam/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine TARBALL_EXT=tar.bz2 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3 --prefix=/opt/trinity --disable-static DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" diff --git a/ubuntu/maverick/applications/dolphin/debian/rules b/ubuntu/maverick/applications/dolphin/debian/rules index 1534d2f29..66ea98891 100755 --- a/ubuntu/maverick/applications/dolphin/debian/rules +++ b/ubuntu/maverick/applications/dolphin/debian/rules @@ -18,6 +18,9 @@ include debian/cdbs/debian-qt-kde.mk DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/dolphin-trinity:: mkdir -p debian/dolphin-trinity/opt/trinity/bin ln -s d3lphin debian/dolphin-trinity/opt/trinity/bin/dolphin diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/rules b/ubuntu/maverick/applications/filelight-l10n/debian/rules index 9255102ce..84a2f4975 100755 --- a/ubuntu/maverick/applications/filelight-l10n/debian/rules +++ b/ubuntu/maverick/applications/filelight-l10n/debian/rules @@ -19,6 +19,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/filelight/debian/rules b/ubuntu/maverick/applications/filelight/debian/rules index 247e26b9d..efa61f0f7 100755 --- a/ubuntu/maverick/applications/filelight/debian/rules +++ b/ubuntu/maverick/applications/filelight/debian/rules @@ -20,6 +20,9 @@ DEB_DH_ALWAYS_EXCLUDE=.svn DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --disable-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/maverick/applications/fusion-icon/debian/rules b/ubuntu/maverick/applications/fusion-icon/debian/rules index 5d3ed1e14..8c79610db 100755 --- a/ubuntu/maverick/applications/fusion-icon/debian/rules +++ b/ubuntu/maverick/applications/fusion-icon/debian/rules @@ -7,6 +7,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/python-distutils-custom.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/fusion-icon-trinity:: mkdir -p debian/fusion-icon-trinity/usr/local/lib cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/ diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/rules b/ubuntu/maverick/applications/gtk-qt-engine/debian/rules index 20c8468ec..8c78b986c 100755 --- a/ubuntu/maverick/applications/gtk-qt-engine/debian/rules +++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/rules @@ -27,6 +27,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/gtk-qt-engine-trinity:: mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ diff --git a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/rules b/ubuntu/maverick/applications/gtk3-tqt-engine/debian/rules index 242fb2c84..9bed17b05 100755 --- a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/rules +++ b/ubuntu/maverick/applications/gtk3-tqt-engine/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/maverick/applications/gwenview-i18n/debian/rules b/ubuntu/maverick/applications/gwenview-i18n/debian/rules index ef4e97ec1..3070a9c9d 100755 --- a/ubuntu/maverick/applications/gwenview-i18n/debian/rules +++ b/ubuntu/maverick/applications/gwenview-i18n/debian/rules @@ -9,6 +9,9 @@ include /usr/share/cdbs/1/rules/utils.mk -include debian/debiandirs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_INSTALL_DOCS_ALL := DOC_LANGS = da de et fr it nl pl pt ru sv pt_BR diff --git a/ubuntu/maverick/applications/gwenview/debian/rules b/ubuntu/maverick/applications/gwenview/debian/rules index 447938cef..d6423c512 100755 --- a/ubuntu/maverick/applications/gwenview/debian/rules +++ b/ubuntu/maverick/applications/gwenview/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-kipi --enable-final --prefix=/opt/trinity DEB_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL := NEWS +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_DH_MAKESHLIBS_ARGS_ALL := -V DEB_SHLIBDEPS_INCLUDE = debian/gwenview-trinity/opt/trinity/lib diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/rules b/ubuntu/maverick/applications/k3b-i18n/debian/rules index 2048362b9..1e6d35926 100755 --- a/ubuntu/maverick/applications/k3b-i18n/debian/rules +++ b/ubuntu/maverick/applications/k3b-i18n/debian/rules @@ -15,6 +15,9 @@ DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -102,7 +105,7 @@ binary-indep: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb -- -Z bzip2 + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install diff --git a/ubuntu/maverick/applications/k3b/debian/rules b/ubuntu/maverick/applications/k3b/debian/rules index 3a19a0ec8..cc895cd83 100755 --- a/ubuntu/maverick/applications/k3b/debian/rules +++ b/ubuntu/maverick/applications/k3b/debian/rules @@ -17,6 +17,9 @@ DEB_INSTALL_MANPAGES_k3b = debian/k3b.1 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/ +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/applications/k9copy/debian/rules b/ubuntu/maverick/applications/k9copy/debian/rules index 0887c2d07..5f97b6de2 100755 --- a/ubuntu/maverick/applications/k9copy/debian/rules +++ b/ubuntu/maverick/applications/k9copy/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +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/applications/kaffeine-mozilla/debian/rules b/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules index 80fe9807b..c04c761e2 100755 --- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules +++ b/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules @@ -14,6 +14,9 @@ export DH_OPTIONS DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity @@ -177,7 +180,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/applications/kaffeine/debian/rules b/ubuntu/maverick/applications/kaffeine/debian/rules index 7791988e7..9021f8fb0 100755 --- a/ubuntu/maverick/applications/kaffeine/debian/rules +++ b/ubuntu/maverick/applications/kaffeine/debian/rules @@ -17,6 +17,9 @@ DEB_INSTALL_MANPAGES_kaffeine-trinity := debian/kaffeine.1 DEB_FIXPERMS_EXCLUDE := install-css.sh install-codecs +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/applications/katapult/debian/rules b/ubuntu/maverick/applications/katapult/debian/rules index 6340f855d..779671876 100755 --- a/ubuntu/maverick/applications/katapult/debian/rules +++ b/ubuntu/maverick/applications/katapult/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine export KUBUNTU_DESKTOP_POT=extragear-utils_katapult 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) + cleanbuilddir/katapult-trinity:: rm -f katapult.1 diff --git a/ubuntu/maverick/applications/kbarcode/debian/rules b/ubuntu/maverick/applications/kbarcode/debian/rules index b8267f39c..cdbae3c90 100755 --- a/ubuntu/maverick/applications/kbarcode/debian/rules +++ b/ubuntu/maverick/applications/kbarcode/debian/rules @@ -16,6 +16,9 @@ DEB_INSTALL_MANPAGES_kbarcode-trinity := debian/kbarcode.1 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/kbfx/debian/rules b/ubuntu/maverick/applications/kbfx/debian/rules index 2bffe9b78..97b64d997 100755 --- a/ubuntu/maverick/applications/kbfx/debian/rules +++ b/ubuntu/maverick/applications/kbfx/debian/rules @@ -24,6 +24,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + get-orig-source: @@dh_testdir @@[ -d ../tarballs/. ] @@ -74,6 +77,6 @@ binary-arch: build dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch diff --git a/ubuntu/maverick/applications/kbookreader/debian/rules b/ubuntu/maverick/applications/kbookreader/debian/rules index 6f4a82d1b..53794c4fe 100755 --- a/ubuntu/maverick/applications/kbookreader/debian/rules +++ b/ubuntu/maverick/applications/kbookreader/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +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/applications/kchmviewer/debian/rules b/ubuntu/maverick/applications/kchmviewer/debian/rules index a496effa9..c22afc5a3 100755 --- a/ubuntu/maverick/applications/kchmviewer/debian/rules +++ b/ubuntu/maverick/applications/kchmviewer/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) @@ -114,7 +117,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/applications/kcmautostart/debian/rules b/ubuntu/maverick/applications/kcmautostart/debian/rules index 242fb2c84..9bed17b05 100644..100755 --- a/ubuntu/maverick/applications/kcmautostart/debian/rules +++ b/ubuntu/maverick/applications/kcmautostart/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/maverick/applications/kcmldap/debian/rules b/ubuntu/maverick/applications/kcmldap/debian/rules index 242fb2c84..9bed17b05 100755 --- a/ubuntu/maverick/applications/kcmldap/debian/rules +++ b/ubuntu/maverick/applications/kcmldap/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/maverick/applications/kcmldapcontroller/debian/rules b/ubuntu/maverick/applications/kcmldapcontroller/debian/rules index 242fb2c84..9bed17b05 100755 --- a/ubuntu/maverick/applications/kcmldapcontroller/debian/rules +++ b/ubuntu/maverick/applications/kcmldapcontroller/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/maverick/applications/kcmldapmanager/debian/rules b/ubuntu/maverick/applications/kcmldapmanager/debian/rules index 242fb2c84..9bed17b05 100755 --- a/ubuntu/maverick/applications/kcmldapmanager/debian/rules +++ b/ubuntu/maverick/applications/kcmldapmanager/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/maverick/applications/kcpuload/debian/rules b/ubuntu/maverick/applications/kcpuload/debian/rules index e13398f63..20eca167c 100755 --- a/ubuntu/maverick/applications/kcpuload/debian/rules +++ b/ubuntu/maverick/applications/kcpuload/debian/rules @@ -12,6 +12,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) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -184,7 +187,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/rules b/ubuntu/maverick/applications/kdbusnotification/debian/rules index 2acd9ab0f..94d0ad5bd 100755 --- a/ubuntu/maverick/applications/kdbusnotification/debian/rules +++ b/ubuntu/maverick/applications/kdbusnotification/debian/rules @@ -12,6 +12,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) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -173,7 +176,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/ubuntu/maverick/applications/kdiff3/debian/rules b/ubuntu/maverick/applications/kdiff3/debian/rules index bc64fcc06..19ea44a07 100755 --- a/ubuntu/maverick/applications/kdiff3/debian/rules +++ b/ubuntu/maverick/applications/kdiff3/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) + # 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) @@ -97,7 +100,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -118,7 +121,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/applications/kdirstat/debian/rules b/ubuntu/maverick/applications/kdirstat/debian/rules index b15f5a9a5..8c0a950a3 100755 --- a/ubuntu/maverick/applications/kdirstat/debian/rules +++ b/ubuntu/maverick/applications/kdirstat/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + LDFLAGS += -Wl,--as-needed post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kdpkg/debian/rules b/ubuntu/maverick/applications/kdpkg/debian/rules index ff163f6a7..455414f69 100755 --- a/ubuntu/maverick/applications/kdpkg/debian/rules +++ b/ubuntu/maverick/applications/kdpkg/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/maverick/applications/keep/debian/rules b/ubuntu/maverick/applications/keep/debian/rules index b6eae04ee..1b5054df6 100755 --- a/ubuntu/maverick/applications/keep/debian/rules +++ b/ubuntu/maverick/applications/keep/debian/rules @@ -16,6 +16,9 @@ DEB_INSTALL_MANPAGES_keep := keep.1 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/kerberostray/debian/rules b/ubuntu/maverick/applications/kerberostray/debian/rules index 242fb2c84..9bed17b05 100755 --- a/ubuntu/maverick/applications/kerberostray/debian/rules +++ b/ubuntu/maverick/applications/kerberostray/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/maverick/applications/kerry/debian/rules b/ubuntu/maverick/applications/kerry/debian/rules index 7dc0fbe23..dea466c17 100755 --- a/ubuntu/maverick/applications/kerry/debian/rules +++ b/ubuntu/maverick/applications/kerry/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_INSTALL_MANPAGES_kerry-trinity = kerry.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/kerry-trinity:: docbook2x-man debian/kerry.1.docbook diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/rules b/ubuntu/maverick/applications/kgtk-qt3/debian/rules index 15ab99eb2..b4cb7a953 100755 --- a/ubuntu/maverick/applications/kgtk-qt3/debian/rules +++ b/ubuntu/maverick/applications/kgtk-qt3/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 diff --git a/ubuntu/maverick/applications/kile/debian/rules b/ubuntu/maverick/applications/kile/debian/rules index 3e19a08ea..d7f547296 100755 --- a/ubuntu/maverick/applications/kile/debian/rules +++ b/ubuntu/maverick/applications/kile/debian/rules @@ -17,6 +17,9 @@ DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kile := debian/kile.1 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/kima/debian/rules b/ubuntu/maverick/applications/kima/debian/rules index 519575104..45e052b96 100755 --- a/ubuntu/maverick/applications/kima/debian/rules +++ b/ubuntu/maverick/applications/kima/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) + # Add here any variable or target overrides you need. post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kio-apt/debian/rules b/ubuntu/maverick/applications/kio-apt/debian/rules index 9b82c21ad..93f63f8ee 100755 --- a/ubuntu/maverick/applications/kio-apt/debian/rules +++ b/ubuntu/maverick/applications/kio-apt/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/kio-locate/debian/rules b/ubuntu/maverick/applications/kio-locate/debian/rules index 7a837110e..ecf59da08 100755 --- a/ubuntu/maverick/applications/kio-locate/debian/rules +++ b/ubuntu/maverick/applications/kio-locate/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules b/ubuntu/maverick/applications/kio-umountwrapper/debian/rules index ae8903f41..6672eae5b 100755 --- a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules +++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/kiosktool/debian/rules b/ubuntu/maverick/applications/kiosktool/debian/rules index 4e38353a1..507e5a458 100755 --- a/ubuntu/maverick/applications/kiosktool/debian/rules +++ b/ubuntu/maverick/applications/kiosktool/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/maverick/applications/kmplayer/debian/rules b/ubuntu/maverick/applications/kmplayer/debian/rules index 63bf848d1..166ca76e2 100755 --- a/ubuntu/maverick/applications/kmplayer/debian/rules +++ b/ubuntu/maverick/applications/kmplayer/debian/rules @@ -22,6 +22,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --wi DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1 +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/applications/kmyfirewall/debian/rules b/ubuntu/maverick/applications/kmyfirewall/debian/rules index 8fa664c8a..28035c796 100755 --- a/ubuntu/maverick/applications/kmyfirewall/debian/rules +++ b/ubuntu/maverick/applications/kmyfirewall/debian/rules @@ -13,6 +13,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) @@ -126,7 +129,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/applications/kmymoney/debian/rules b/ubuntu/maverick/applications/kmymoney/debian/rules index 192c6019c..4c3b55cb4 100755 --- a/ubuntu/maverick/applications/kmymoney/debian/rules +++ b/ubuntu/maverick/applications/kmymoney/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3 --disable-pdf-docs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + LDFLAGS += -Wl,--as-needed post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/knemo/debian/rules b/ubuntu/maverick/applications/knemo/debian/rules index fd71fe17f..4fb03f005 100755 --- a/ubuntu/maverick/applications/knemo/debian/rules +++ b/ubuntu/maverick/applications/knemo/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_DOCS_knemo = -XNEWS 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/knetload/debian/rules b/ubuntu/maverick/applications/knetload/debian/rules index f5784f7ae..d955fbe4a 100755 --- a/ubuntu/maverick/applications/knetload/debian/rules +++ b/ubuntu/maverick/applications/knetload/debian/rules @@ -9,6 +9,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) + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -178,7 +181,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/ubuntu/maverick/applications/knetstats/debian/rules b/ubuntu/maverick/applications/knetstats/debian/rules index 7b1522933..1a573fb20 100755 --- a/ubuntu/maverick/applications/knetstats/debian/rules +++ b/ubuntu/maverick/applications/knetstats/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_knetstats-trinity = knetstats.1 +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/applications/knetworkmanager8/debian/rules b/ubuntu/maverick/applications/knetworkmanager8/debian/rules index a4ba9688c..9c7e598e1 100755 --- a/ubuntu/maverick/applications/knetworkmanager8/debian/rules +++ b/ubuntu/maverick/applications/knetworkmanager8/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp +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/applications/knetworkmanager9/debian/rules b/ubuntu/maverick/applications/knetworkmanager9/debian/rules index c9fa2b866..00ac9877f 100755 --- a/ubuntu/maverick/applications/knetworkmanager9/debian/rules +++ b/ubuntu/maverick/applications/knetworkmanager9/debian/rules @@ -20,6 +20,9 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/network-manager-kde-trinity:: # Install autostart file install -D -m 644 tdenetworkmanager-0.8/src/tdenetworkmanager.desktop \ diff --git a/ubuntu/maverick/applications/knights/debian/rules b/ubuntu/maverick/applications/knights/debian/rules index ab81cb6e3..f4f406c79 100755 --- a/ubuntu/maverick/applications/knights/debian/rules +++ b/ubuntu/maverick/applications/knights/debian/rules @@ -13,6 +13,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) @@ -107,7 +110,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/applications/knowit/debian/rules b/ubuntu/maverick/applications/knowit/debian/rules index 3ed456df4..0a090fdb6 100755 --- a/ubuntu/maverick/applications/knowit/debian/rules +++ b/ubuntu/maverick/applications/knowit/debian/rules @@ -14,6 +14,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) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -95,7 +98,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/applications/knutclient/debian/rules b/ubuntu/maverick/applications/knutclient/debian/rules index ad89a9108..0d07992cf 100755 --- a/ubuntu/maverick/applications/knutclient/debian/rules +++ b/ubuntu/maverick/applications/knutclient/debian/rules @@ -18,6 +18,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) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -127,7 +130,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/applications/koffice-i18n/debian/rules b/ubuntu/maverick/applications/koffice-i18n/debian/rules index 9bb59484f..478c97b9d 100755 --- a/ubuntu/maverick/applications/koffice-i18n/debian/rules +++ b/ubuntu/maverick/applications/koffice-i18n/debian/rules @@ -3,6 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + languages = `ls -1d *i18n*` build-stamp: @@ -81,7 +84,7 @@ binary-indep: build dh_installdeb dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep diff --git a/ubuntu/maverick/applications/koffice/debian/rules b/ubuntu/maverick/applications/koffice/debian/rules index b166e12e4..ed91a11c3 100755 --- a/ubuntu/maverick/applications/koffice/debian/rules +++ b/ubuntu/maverick/applications/koffice/debian/rules @@ -17,6 +17,9 @@ DEB_KDE_APIDOX := no DEB_DH_STRIP_ARGS := --dbg-package=koffice-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := karbon-trinity kchart-trinity kivio-trinity koffice-libs-trinity chalk-trinity kspread-trinity kugar-trinity kthesaurus-trinity DEB_INSTALL_CHANGELOGS_karbon-trinity := karbon/CHANGES diff --git a/ubuntu/maverick/applications/konversation/debian/rules b/ubuntu/maverick/applications/konversation/debian/rules index 359d5f809..0e973a150 100755 --- a/ubuntu/maverick/applications/konversation/debian/rules +++ b/ubuntu/maverick/applications/konversation/debian/rules @@ -15,6 +15,9 @@ DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg DEB_INSTALL_DOCS_ALL = 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/kopete-otr/debian/rules b/ubuntu/maverick/applications/kopete-otr/debian/rules index abfd36cfc..4edf9d96d 100755 --- a/ubuntu/maverick/applications/kopete-otr/debian/rules +++ b/ubuntu/maverick/applications/kopete-otr/debian/rules @@ -12,6 +12,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/kpicosim/debian/rules b/ubuntu/maverick/applications/kpicosim/debian/rules index 4a8c9dcdd..0a03f424b 100755 --- a/ubuntu/maverick/applications/kpicosim/debian/rules +++ b/ubuntu/maverick/applications/kpicosim/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) @@ -123,7 +126,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/applications/kpilot/debian/rules b/ubuntu/maverick/applications/kpilot/debian/rules index abfd36cfc..4edf9d96d 100755 --- a/ubuntu/maverick/applications/kpilot/debian/rules +++ b/ubuntu/maverick/applications/kpilot/debian/rules @@ -12,6 +12,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/rules b/ubuntu/maverick/applications/kpowersave-nohal/debian/rules index a2f0e66bb..262171bc3 100755 --- a/ubuntu/maverick/applications/kpowersave-nohal/debian/rules +++ b/ubuntu/maverick/applications/kpowersave-nohal/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_ALL := AUTHORS NEWS 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/kpowersave/debian/rules b/ubuntu/maverick/applications/kpowersave/debian/rules index 991d42479..961465395 100755 --- a/ubuntu/maverick/applications/kpowersave/debian/rules +++ b/ubuntu/maverick/applications/kpowersave/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_ALL := AUTHORS NEWS 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/kradio/debian/rules b/ubuntu/maverick/applications/kradio/debian/rules index d8c6c0226..41840eb6e 100755 --- a/ubuntu/maverick/applications/kradio/debian/rules +++ b/ubuntu/maverick/applications/kradio/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) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -121,7 +124,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/applications/krename/debian/rules b/ubuntu/maverick/applications/krename/debian/rules index f886eacd0..4983ad699 100755 --- a/ubuntu/maverick/applications/krename/debian/rules +++ b/ubuntu/maverick/applications/krename/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update debian/stamp-autothings-update: diff --git a/ubuntu/maverick/applications/krusader/debian/rules b/ubuntu/maverick/applications/krusader/debian/rules index 139132dbb..b19073807 100755 --- a/ubuntu/maverick/applications/krusader/debian/rules +++ b/ubuntu/maverick/applications/krusader/debian/rules @@ -18,6 +18,9 @@ DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/ 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules index 047b8ca76..c41d87b76 100755 --- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules +++ b/ubuntu/maverick/applications/ksplash-engine-moodin/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) + # 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) @@ -132,7 +135,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/applications/ksquirrel/debian/rules b/ubuntu/maverick/applications/ksquirrel/debian/rules index 744a8d1e5..f59e43351 100755 --- a/ubuntu/maverick/applications/ksquirrel/debian/rules +++ b/ubuntu/maverick/applications/ksquirrel/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) @@ -106,7 +109,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/applications/kstreamripper/debian/rules b/ubuntu/maverick/applications/kstreamripper/debian/rules index 9f641b49a..88540f9bf 100755 --- a/ubuntu/maverick/applications/kstreamripper/debian/rules +++ b/ubuntu/maverick/applications/kstreamripper/debian/rules @@ -2,6 +2,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk #DEB_INSTALL_MANPAGES_kstreamripper-trinity:=debian/kstreamripper.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PATH := /opt/trinity/bin:$(PATH) build/kstreamripper-trinity:: diff --git a/ubuntu/maverick/applications/ksystemlog/debian/rules b/ubuntu/maverick/applications/ksystemlog/debian/rules index 12d493659..5b9d63684 100755 --- a/ubuntu/maverick/applications/ksystemlog/debian/rules +++ b/ubuntu/maverick/applications/ksystemlog/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/ktechlab/debian/rules b/ubuntu/maverick/applications/ktechlab/debian/rules index 15d1878df..227674f7f 100755 --- a/ubuntu/maverick/applications/ktechlab/debian/rules +++ b/ubuntu/maverick/applications/ktechlab/debian/rules @@ -12,6 +12,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) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -108,7 +111,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 unpatch diff --git a/ubuntu/maverick/applications/ktorrent/debian/rules b/ubuntu/maverick/applications/ktorrent/debian/rules index 5590816c2..d0046eb44 100755 --- a/ubuntu/maverick/applications/ktorrent/debian/rules +++ b/ubuntu/maverick/applications/ktorrent/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1 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) + build/ktorrent-trinity:: docbook2x-man debian/ktorrent.1.docbook diff --git a/ubuntu/maverick/applications/kuickshow/debian/rules b/ubuntu/maverick/applications/kuickshow/debian/rules index ee4456494..46fe966da 100755 --- a/ubuntu/maverick/applications/kuickshow/debian/rules +++ b/ubuntu/maverick/applications/kuickshow/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/kvirc/debian/rules b/ubuntu/maverick/applications/kvirc/debian/rules index 665c61d25..fd45d5925 100755 --- a/ubuntu/maverick/applications/kvirc/debian/rules +++ b/ubuntu/maverick/applications/kvirc/debian/rules @@ -49,6 +49,9 @@ endif # DEB_COMPRESS_EXCLUDE := .kvs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # # Run dh_shlibdeps with the correct options # diff --git a/ubuntu/maverick/applications/kvkbd/debian/rules b/ubuntu/maverick/applications/kvkbd/debian/rules index 305c1e4df..0f564108e 100755 --- a/ubuntu/maverick/applications/kvkbd/debian/rules +++ b/ubuntu/maverick/applications/kvkbd/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + makebuilddir/kvkbd-trinity:: make -f Makefile.cvs diff --git a/ubuntu/maverick/applications/kvpnc/debian/rules b/ubuntu/maverick/applications/kvpnc/debian/rules index 354c23311..f93ccb291 100755 --- a/ubuntu/maverick/applications/kvpnc/debian/rules +++ b/ubuntu/maverick/applications/kvpnc/debian/rules @@ -17,6 +17,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + makebuilddir/kvpnc-trinity:: cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh diff --git a/ubuntu/maverick/applications/piklab/debian/rules b/ubuntu/maverick/applications/piklab/debian/rules index cd16137c9..6d0a1d510 100755 --- a/ubuntu/maverick/applications/piklab/debian/rules +++ b/ubuntu/maverick/applications/piklab/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) + # 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) @@ -111,7 +114,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: config build clean binary-indep binary-arch binary install diff --git a/ubuntu/maverick/applications/potracegui/debian/rules b/ubuntu/maverick/applications/potracegui/debian/rules index bc559477f..4b268883c 100755 --- a/ubuntu/maverick/applications/potracegui/debian/rules +++ b/ubuntu/maverick/applications/potracegui/debian/rules @@ -20,6 +20,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -100,7 +103,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/applications/qt4-tqt-theme-engine/debian/rules b/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/rules index bd271d7de..2cde95722 100755 --- a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/rules +++ b/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/rules @@ -9,5 +9,8 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + QMAKE := qmake-qt4 diff --git a/ubuntu/maverick/applications/rosegarden/debian/rules b/ubuntu/maverick/applications/rosegarden/debian/rules index 32d10d6ff..3fc2b777e 100755 --- a/ubuntu/maverick/applications/rosegarden/debian/rules +++ b/ubuntu/maverick/applications/rosegarden/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 @@ -56,7 +59,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 configure diff --git a/ubuntu/maverick/applications/smartcardauth/debian/rules b/ubuntu/maverick/applications/smartcardauth/debian/rules index a9e7e66cb..fe74e584a 100755 --- a/ubuntu/maverick/applications/smartcardauth/debian/rules +++ b/ubuntu/maverick/applications/smartcardauth/debian/rules @@ -9,3 +9,6 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/maverick/applications/smb4k/debian/rules b/ubuntu/maverick/applications/smb4k/debian/rules index db6aa90dd..70b1248dc 100755 --- a/ubuntu/maverick/applications/smb4k/debian/rules +++ b/ubuntu/maverick/applications/smb4k/debian/rules @@ -16,6 +16,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/soundkonverter/debian/rules b/ubuntu/maverick/applications/soundkonverter/debian/rules index 831240224..d3eac8d3b 100755 --- a/ubuntu/maverick/applications/soundkonverter/debian/rules +++ b/ubuntu/maverick/applications/soundkonverter/debian/rules @@ -23,6 +23,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS = --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/soundkonverter-trinity:: install -D -p -m0644 debian/soundkonverter-trinity.lintian-overrides \ debian/soundkonverter-trinity/usr/share/lintian/overrides/soundkonverter-trinity diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules index 996ad6a4d..614fdb4a9 100755 --- a/ubuntu/maverick/applications/tde-guidance/debian/rules +++ b/ubuntu/maverick/applications/tde-guidance/debian/rules @@ -15,6 +15,9 @@ PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS_APPEND := -L/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/tde-guidance-trinity:: # install icons to right place install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png \ diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules b/ubuntu/maverick/applications/tde-style-lipstik/debian/rules index f24b21716..eb9de9610 100755 --- a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules +++ b/ubuntu/maverick/applications/tde-style-lipstik/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) @@ -122,7 +125,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/applications/tde-style-qtcurve/debian/rules b/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules index c61c340ae..685703a85 100755 --- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules @@ -24,6 +24,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/rules b/ubuntu/maverick/applications/tde-systemsettings/debian/rules index 8110845eb..ed2e13a90 100755 --- a/ubuntu/maverick/applications/tde-systemsettings/debian/rules +++ b/ubuntu/maverick/applications/tde-systemsettings/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/tdesudo/debian/rules b/ubuntu/maverick/applications/tdesudo/debian/rules index 5a63a69a9..443a43aed 100755 --- a/ubuntu/maverick/applications/tdesudo/debian/rules +++ b/ubuntu/maverick/applications/tdesudo/debian/rules @@ -15,6 +15,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/tdesudo-trinity:: docbook2x-man debian/tdesudo-trinity.1.docbook mv tdesudo.1 tdesudo-trinity.1 diff --git a/ubuntu/maverick/applications/tdesvn/debian/rules b/ubuntu/maverick/applications/tdesvn/debian/rules index d3e870fba..37d2a944b 100755 --- a/ubuntu/maverick/applications/tdesvn/debian/rules +++ b/ubuntu/maverick/applications/tdesvn/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 diff --git a/ubuntu/maverick/applications/tdmtheme/debian/rules b/ubuntu/maverick/applications/tdmtheme/debian/rules index 8e74fc2cb..0fc4f4aa4 100755 --- a/ubuntu/maverick/applications/tdmtheme/debian/rules +++ b/ubuntu/maverick/applications/tdmtheme/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/tellico/debian/rules b/ubuntu/maverick/applications/tellico/debian/rules index 84b8312a4..9e404eabf 100755 --- a/ubuntu/maverick/applications/tellico/debian/rules +++ b/ubuntu/maverick/applications/tellico/debian/rules @@ -12,6 +12,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) @@ -149,7 +152,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -171,7 +174,7 @@ binary-arch: build install dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a - dh_builddeb -a + dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS) binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary install diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/rules b/ubuntu/maverick/applications/twin-style-crystal/debian/rules index 8cda3384a..4fb0c5bb5 100755 --- a/ubuntu/maverick/applications/twin-style-crystal/debian/rules +++ b/ubuntu/maverick/applications/twin-style-crystal/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/applications/wlassistant/debian/rules b/ubuntu/maverick/applications/wlassistant/debian/rules index abada8378..1a8fdeafb 100755 --- a/ubuntu/maverick/applications/wlassistant/debian/rules +++ b/ubuntu/maverick/applications/wlassistant/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 diff --git a/ubuntu/maverick/applications/yakuake/debian/rules b/ubuntu/maverick/applications/yakuake/debian/rules index f5bd922f5..aa22c8b59 100755 --- a/ubuntu/maverick/applications/yakuake/debian/rules +++ b/ubuntu/maverick/applications/yakuake/debian/rules @@ -15,6 +15,9 @@ INSTALL_DOCS_ALL := 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) + ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update debian/stamp-autothings-update: diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/rules b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/rules index 087848532..f8c89d5db 100755 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/rules +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/rules @@ -6,3 +6,6 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/rules b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/rules index 087848532..f8c89d5db 100755 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/rules +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/rules @@ -6,3 +6,6 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/rules b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/rules index 087848532..f8c89d5db 100755 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/rules +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/rules @@ -6,3 +6,6 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/maverick/dependencies/arts/debian/rules b/ubuntu/maverick/dependencies/arts/debian/rules index b0a724e1a..9c9730bda 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 b7aa427f8..3b86de7db 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/simple-patchsys.mk 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 894533134..a59bed76e 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/libart-lgpl/debian/rules b/ubuntu/maverick/dependencies/libart-lgpl/debian/rules index 4390434f7..2751eb1f2 100755 --- a/ubuntu/maverick/dependencies/libart-lgpl/debian/rules +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/rules @@ -20,3 +20,5 @@ GNOME_MODULE := libart_lgpl DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/rules b/ubuntu/maverick/dependencies/libcaldav/debian/rules index 0dda6ea24..fb72a35e7 100755 --- a/ubuntu/maverick/dependencies/libcaldav/debian/rules +++ b/ubuntu/maverick/dependencies/libcaldav/debian/rules @@ -5,6 +5,9 @@ include /usr/share/quilt/quilt.make # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -86,7 +89,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independent packages using the common target. binary-indep: build install diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/rules b/ubuntu/maverick/dependencies/libcarddav/debian/rules index 124929739..24bdcbc93 100755 --- a/ubuntu/maverick/dependencies/libcarddav/debian/rules +++ b/ubuntu/maverick/dependencies/libcarddav/debian/rules @@ -5,6 +5,9 @@ include /usr/share/quilt/quilt.make # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -86,7 +89,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independent packages using the common target. binary-indep: build install diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/rules b/ubuntu/maverick/dependencies/python-tqt/debian/rules index ebb91c6e4..86eca95c9 100755 --- a/ubuntu/maverick/dependencies/python-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/python-tqt/debian/rules @@ -3,6 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + export DH_OPTIONS -include /usr/share/python/python.mk @@ -158,7 +161,7 @@ endif dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: install-indep diff --git a/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules index b678d312d..7ede42ad9 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) @@ -327,7 +330,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 @@ -469,7 +472,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/sip4-tqt/debian/rules b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules index 0dd14099f..2286739d5 100755 --- a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules @@ -2,6 +2,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + export DH_OPTIONS INSTDIR=$(CURDIR)/debian @@ -134,7 +137,7 @@ endif dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/rules b/ubuntu/maverick/dependencies/tqca-tls/debian/rules index 4ffaf90dc..fc9e58e55 100755 --- a/ubuntu/maverick/dependencies/tqca-tls/debian/rules +++ b/ubuntu/maverick/dependencies/tqca-tls/debian/rules @@ -6,6 +6,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +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) @@ -104,7 +107,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/dependencies/tqscintilla/debian/rules b/ubuntu/maverick/dependencies/tqscintilla/debian/rules index 36df66cc9..8dfaa3377 100755 --- a/ubuntu/maverick/dependencies/tqscintilla/debian/rules +++ b/ubuntu/maverick/dependencies/tqscintilla/debian/rules @@ -5,6 +5,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This is the debhelper compatibility version to use. export QTDIR=/usr/share/tqt3 export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++ @@ -82,7 +85,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -100,7 +103,7 @@ binary-arch: build install dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a - dh_builddeb -a + dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff --git a/ubuntu/maverick/dependencies/tqt3/debian/rules b/ubuntu/maverick/dependencies/tqt3/debian/rules index 3f8e98c3a..d2d66f6a7 100755 --- a/ubuntu/maverick/dependencies/tqt3/debian/rules +++ b/ubuntu/maverick/dependencies/tqt3/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) @@ -331,7 +334,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 @@ -462,7 +465,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 f05e2fadd..5d8f4cb4c 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 diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/rules b/ubuntu/maverick/libraries/kipi-plugins/debian/rules index 5177da213..c9f8bd279 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/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/maverick/libraries/libkdcraw/debian/rules b/ubuntu/maverick/libraries/libkdcraw/debian/rules index 7785e4bcc..f58c12e61 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 28a1c06e8..705840830 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 94eb41df3..ff0f40f12 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 4d113ccd7..f5bc572dc 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) @@ -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/maverick/libraries/libtdeldap/debian/rules b/ubuntu/maverick/libraries/libtdeldap/debian/rules index 242fb2c84..9bed17b05 100755 --- a/ubuntu/maverick/libraries/libtdeldap/debian/rules +++ b/ubuntu/maverick/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/maverick/libraries/libtqt-perl/debian/rules b/ubuntu/maverick/libraries/libtqt-perl/debian/rules index 7bf57d40b..1d77c70fc 100755 --- a/ubuntu/maverick/libraries/libtqt-perl/debian/rules +++ b/ubuntu/maverick/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/maverick/libraries/mlt++/debian/rules b/ubuntu/maverick/libraries/mlt++/debian/rules index 0232c83be..99606e440 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 3889b6a3a..ce607fb77 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/pytdeextensions/debian/rules b/ubuntu/maverick/libraries/pytdeextensions/debian/rules index 4dcfaaae8..b4ae203da 100755 --- a/ubuntu/maverick/libraries/pytdeextensions/debian/rules +++ b/ubuntu/maverick/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/maverick/libraries/python-trinity/debian/rules b/ubuntu/maverick/libraries/python-trinity/debian/rules index ffa56ad63..67af8c2d8 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 diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules b/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules index 3560b7d93..2b69924b8 100755 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules @@ -2,6 +2,9 @@ #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean: dh_testdir dh_clean @@ -35,7 +38,7 @@ binary-arch: install dh_installdeb -a dh_gencontrol -a dh_md5sums -a - dh_builddeb -a + dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS) binary-indep: diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/rules b/ubuntu/maverick/metapackages/sudo-trinity/debian/rules index 087848532..f8c89d5db 100755 --- a/ubuntu/maverick/metapackages/sudo-trinity/debian/rules +++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/rules @@ -6,3 +6,6 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/maverick/tde-i18n/debian/rules b/ubuntu/maverick/tde-i18n/debian/rules index e275e35df..b60af22ee 100755 --- a/ubuntu/maverick/tde-i18n/debian/rules +++ b/ubuntu/maverick/tde-i18n/debian/rules @@ -31,6 +31,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) + debian/debiandirs: scripts/admin/debianrules perl -w scripts/admin/debianrules echodirs > debian/debiandirs @@ -107,7 +110,7 @@ binary-indep: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Below here is fairly generic really diff --git a/ubuntu/maverick/tdeaccessibility/debian/rules b/ubuntu/maverick/tdeaccessibility/debian/rules index f5c6caf43..4fdbdb6c3 100755 --- a/ubuntu/maverick/tdeaccessibility/debian/rules +++ b/ubuntu/maverick/tdeaccessibility/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdeaccessibility-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kttsd-trinity ksayit-trinity #shlibs_ver = 4:3.5.0 diff --git a/ubuntu/maverick/tdeaddons/debian/rules b/ubuntu/maverick/tdeaddons/debian/rules index 5d337bfab..e2158a506 100755 --- a/ubuntu/maverick/tdeaddons/debian/rules +++ b/ubuntu/maverick/tdeaddons/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --without-xmms --prefix=/opt/trinity --with-extra-l DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter binary-install/konq-plugins-trinity:: diff --git a/ubuntu/maverick/tdeadmin/debian/rules b/ubuntu/maverick/tdeadmin/debian/rules index 9c9ccadda..849de5f21 100755 --- a/ubuntu/maverick/tdeadmin/debian/rules +++ b/ubuntu/maverick/tdeadmin/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=tdeadmin-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := \ --without-rpm --with-pam=kde --with-shadow --with-nis \ --with-private-groups --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib diff --git a/ubuntu/maverick/tdeartwork/debian/rules b/ubuntu/maverick/tdeartwork/debian/rules index 28dd50f1b..4e236c044 100755 --- a/ubuntu/maverick/tdeartwork/debian/rules +++ b/ubuntu/maverick/tdeartwork/debian/rules @@ -28,6 +28,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdeartwork-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean:: rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules index 1ddae9c58..a1e9c65f7 100755 --- a/ubuntu/maverick/tdebase/debian/rules +++ b/ubuntu/maverick/tdebase/debian/rules @@ -34,6 +34,9 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach kioslave kxkb kdebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ diff --git a/ubuntu/maverick/tdebindings/debian/rules b/ubuntu/maverick/tdebindings/debian/rules index 6a0e11dc7..b503f7580 100755 --- a/ubuntu/maverick/tdebindings/debian/rules +++ b/ubuntu/maverick/tdebindings/debian/rules @@ -35,6 +35,9 @@ DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) \ DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are not all the packages with libraries, but only those that # need to be in DEB_SHLIBDEPS_INCLUDE... PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmokeqt1-trinity libsmokekde1-trinity libkjsembed1-trinity diff --git a/ubuntu/maverick/tdeedu/debian/rules b/ubuntu/maverick/tdeedu/debian/rules index d1258cdf0..9f81df4c0 100755 --- a/ubuntu/maverick/tdeedu/debian/rules +++ b/ubuntu/maverick/tdeedu/debian/rules @@ -16,6 +16,9 @@ DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Ensure that kig's python scripting built successfully. common-build-arch:: test -e $(DEB_BUILDDIR)/kig/scripting/libscripting.la diff --git a/ubuntu/maverick/tdegames/debian/rules b/ubuntu/maverick/tdegames/debian/rules index a979e0440..085eb8404 100755 --- a/ubuntu/maverick/tdegames/debian/rules +++ b/ubuntu/maverick/tdegames/debian/rules @@ -26,6 +26,9 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if DEB_INSTALL_CHANGELOGS_tdegames := $(DEB_SRCDIR)/ChangeLog +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity' DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V diff --git a/ubuntu/maverick/tdegraphics/debian/rules b/ubuntu/maverick/tdegraphics/debian/rules index 927f3faf8..9aedb5fcf 100755 --- a/ubuntu/maverick/tdegraphics/debian/rules +++ b/ubuntu/maverick/tdegraphics/debian/rules @@ -24,6 +24,9 @@ DEB_BUILD_PARALLEL = true DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kfaxview-trinity kghostview-trinity kmrml-trinity kpovmodeler-trinity ksvg-trinity \ kuickshow-trinity kview-trinity kviewshell-trinity libkscan1-trinity diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules index 717488e0f..1ca5cc3ef 100755 --- a/ubuntu/maverick/tdelibs/debian/rules +++ b/ubuntu/maverick/tdelibs/debian/rules @@ -36,6 +36,9 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdelibs-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/tdelibs-data-trinity:: install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf diff --git a/ubuntu/maverick/tdemultimedia/debian/rules b/ubuntu/maverick/tdemultimedia/debian/rules index 336c7e70d..1e7e0647c 100755 --- a/ubuntu/maverick/tdemultimedia/debian/rules +++ b/ubuntu/maverick/tdemultimedia/debian/rules @@ -23,6 +23,9 @@ DOC_HTML_PRUNE := kcontrol-trinity DEB_DH_STRIP_ARGS := --dbg-package=tdemultimedia-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \ libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \ libkcddb1-trinity mpeglib-trinity noatun-trinity diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules index f27a7cca8..2579d07e3 100755 --- a/ubuntu/maverick/tdenetwork/debian/rules +++ b/ubuntu/maverick/tdenetwork/debian/rules @@ -44,6 +44,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdenetwork-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules index b20b4a7b9..0e1c5356b 100755 --- a/ubuntu/maverick/tdepim/debian/rules +++ b/ubuntu/maverick/tdepim/debian/rules @@ -32,6 +32,9 @@ DEB_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + shlibs_ver=4:3.5.7 DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libkcal2b-trinity := -V'libkcal2b-trinity (>= $(shlibs_ver))' diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/maverick/tdesdk/debian/rules index 6ca7926a1..36d49b7c7 100755 --- a/ubuntu/maverick/tdesdk/debian/rules +++ b/ubuntu/maverick/tdesdk/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=tdesdk-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/maverick/tdetoys/debian/rules b/ubuntu/maverick/tdetoys/debian/rules index b9707dd97..da1268d9f 100755 --- a/ubuntu/maverick/tdetoys/debian/rules +++ b/ubuntu/maverick/tdetoys/debian/rules @@ -27,5 +27,8 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog DEB_INSTALL_CHANGELOGS_kteatime-trinity := kteatime/ChangeLog diff --git a/ubuntu/maverick/tdeutils/debian/rules b/ubuntu/maverick/tdeutils/debian/rules index 57cdb4efd..19848196e 100755 --- a/ubuntu/maverick/tdeutils/debian/rules +++ b/ubuntu/maverick/tdeutils/debian/rules @@ -40,6 +40,9 @@ DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselec DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules index a6af11e93..95a3981ea 100755 --- a/ubuntu/maverick/tdevelop/debian/rules +++ b/ubuntu/maverick/tdevelop/debian/rules @@ -17,6 +17,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) + PACKAGES_WITH_LIBS := tdevelop-trinity DEB_KDE_ENABLE_FINAL := diff --git a/ubuntu/maverick/tdewebdev/debian/rules b/ubuntu/maverick/tdewebdev/debian/rules index 5a5ea2fd9..ad4eb9d85 100755 --- a/ubuntu/maverick/tdewebdev/debian/rules +++ b/ubuntu/maverick/tdewebdev/debian/rules @@ -28,6 +28,9 @@ endif DEB_DH_STRIP_ARGS := --dbg-package=tdewebdev-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kommander-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/ubuntu/precise/applications/abakus/debian/rules b/ubuntu/precise/applications/abakus/debian/rules index d0a475105..c856f7cae 100755 --- a/ubuntu/precise/applications/abakus/debian/rules +++ b/ubuntu/precise/applications/abakus/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 diff --git a/ubuntu/precise/applications/adept/debian/rules b/ubuntu/precise/applications/adept/debian/rules index ee86e8e4f..742307eb6 100755 --- a/ubuntu/precise/applications/adept/debian/rules +++ b/ubuntu/precise/applications/adept/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_MAKE_CHECK_TARGET := check DEB_CONFIGURE_EXTRA_FLAGS += --enable-adept --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) + # Enable us to locate the old libept-trinity library and includes CPPFLAGS += -I/opt/trinity/include LDFLAGS += -L/opt/trinity/lib -lept diff --git a/ubuntu/precise/applications/amarok/debian/rules b/ubuntu/precise/applications/amarok/debian/rules index deb43ebf7..77b0e3159 100755 --- a/ubuntu/precise/applications/amarok/debian/rules +++ b/ubuntu/precise/applications/amarok/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --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) + ### VARIABLES # Exempt amarok engines from being handled as proper public libraries # by dh_makeshlibs diff --git a/ubuntu/precise/applications/basket/debian/rules b/ubuntu/precise/applications/basket/debian/rules index 46b74ab7e..d3cf5255e 100755 --- a/ubuntu/precise/applications/basket/debian/rules +++ b/ubuntu/precise/applications/basket/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) + # 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) @@ -101,7 +104,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/applications/bibletime/debian/rules b/ubuntu/precise/applications/bibletime/debian/rules index ea4b62326..4106bf0f4 100755 --- a/ubuntu/precise/applications/bibletime/debian/rules +++ b/ubuntu/precise/applications/bibletime/debian/rules @@ -19,6 +19,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + binary-install/bibletime-trinity:: chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/rules b/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/rules index c5dd59ccb..85efaa2fa 100755 --- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/rules +++ b/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/desktop-effects-tde/debian/rules b/ubuntu/precise/applications/desktop-effects-tde/debian/rules index 7bf3e3306..d494616db 100755 --- a/ubuntu/precise/applications/desktop-effects-tde/debian/rules +++ b/ubuntu/precise/applications/desktop-effects-tde/debian/rules @@ -9,5 +9,8 @@ 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) + binary-install/desktop-effects-tde-trinity:: dh_pycentral -pdesktop-effects-tde-trinity diff --git a/ubuntu/precise/applications/digikam/debian/rules b/ubuntu/precise/applications/digikam/debian/rules index 4edd6e763..76fa321bc 100755 --- a/ubuntu/precise/applications/digikam/debian/rules +++ b/ubuntu/precise/applications/digikam/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine TARBALL_EXT=tar.bz2 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3 --prefix=/opt/trinity --disable-static DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" diff --git a/ubuntu/precise/applications/dolphin/debian/rules b/ubuntu/precise/applications/dolphin/debian/rules index 1534d2f29..66ea98891 100755 --- a/ubuntu/precise/applications/dolphin/debian/rules +++ b/ubuntu/precise/applications/dolphin/debian/rules @@ -18,6 +18,9 @@ include debian/cdbs/debian-qt-kde.mk DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/dolphin-trinity:: mkdir -p debian/dolphin-trinity/opt/trinity/bin ln -s d3lphin debian/dolphin-trinity/opt/trinity/bin/dolphin diff --git a/ubuntu/precise/applications/filelight-l10n/debian/rules b/ubuntu/precise/applications/filelight-l10n/debian/rules index 9255102ce..84a2f4975 100755 --- a/ubuntu/precise/applications/filelight-l10n/debian/rules +++ b/ubuntu/precise/applications/filelight-l10n/debian/rules @@ -19,6 +19,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/filelight/debian/rules b/ubuntu/precise/applications/filelight/debian/rules index 247e26b9d..efa61f0f7 100755 --- a/ubuntu/precise/applications/filelight/debian/rules +++ b/ubuntu/precise/applications/filelight/debian/rules @@ -20,6 +20,9 @@ DEB_DH_ALWAYS_EXCLUDE=.svn DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --disable-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/applications/fusion-icon/debian/rules b/ubuntu/precise/applications/fusion-icon/debian/rules index 5d3ed1e14..8c79610db 100755 --- a/ubuntu/precise/applications/fusion-icon/debian/rules +++ b/ubuntu/precise/applications/fusion-icon/debian/rules @@ -7,6 +7,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/python-distutils-custom.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/fusion-icon-trinity:: mkdir -p debian/fusion-icon-trinity/usr/local/lib cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/ diff --git a/ubuntu/precise/applications/gtk-qt-engine/debian/rules b/ubuntu/precise/applications/gtk-qt-engine/debian/rules index 20c8468ec..8c78b986c 100755 --- a/ubuntu/precise/applications/gtk-qt-engine/debian/rules +++ b/ubuntu/precise/applications/gtk-qt-engine/debian/rules @@ -27,6 +27,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/gtk-qt-engine-trinity:: mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ diff --git a/ubuntu/precise/applications/gtk3-tqt-engine/debian/rules b/ubuntu/precise/applications/gtk3-tqt-engine/debian/rules index 242fb2c84..9bed17b05 100755 --- a/ubuntu/precise/applications/gtk3-tqt-engine/debian/rules +++ b/ubuntu/precise/applications/gtk3-tqt-engine/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/applications/gwenview-i18n/debian/rules b/ubuntu/precise/applications/gwenview-i18n/debian/rules index ef4e97ec1..3070a9c9d 100755 --- a/ubuntu/precise/applications/gwenview-i18n/debian/rules +++ b/ubuntu/precise/applications/gwenview-i18n/debian/rules @@ -9,6 +9,9 @@ include /usr/share/cdbs/1/rules/utils.mk -include debian/debiandirs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_INSTALL_DOCS_ALL := DOC_LANGS = da de et fr it nl pl pt ru sv pt_BR diff --git a/ubuntu/precise/applications/gwenview/debian/rules b/ubuntu/precise/applications/gwenview/debian/rules index 447938cef..d6423c512 100755 --- a/ubuntu/precise/applications/gwenview/debian/rules +++ b/ubuntu/precise/applications/gwenview/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-kipi --enable-final --prefix=/opt/trinity DEB_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL := NEWS +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_DH_MAKESHLIBS_ARGS_ALL := -V DEB_SHLIBDEPS_INCLUDE = debian/gwenview-trinity/opt/trinity/lib diff --git a/ubuntu/precise/applications/k3b-i18n/debian/rules b/ubuntu/precise/applications/k3b-i18n/debian/rules index 2048362b9..1e6d35926 100755 --- a/ubuntu/precise/applications/k3b-i18n/debian/rules +++ b/ubuntu/precise/applications/k3b-i18n/debian/rules @@ -15,6 +15,9 @@ DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -102,7 +105,7 @@ binary-indep: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb -- -Z bzip2 + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install diff --git a/ubuntu/precise/applications/k3b/debian/rules b/ubuntu/precise/applications/k3b/debian/rules index 3a19a0ec8..cc895cd83 100755 --- a/ubuntu/precise/applications/k3b/debian/rules +++ b/ubuntu/precise/applications/k3b/debian/rules @@ -17,6 +17,9 @@ DEB_INSTALL_MANPAGES_k3b = debian/k3b.1 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/ +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/applications/k9copy/debian/rules b/ubuntu/precise/applications/k9copy/debian/rules index 0887c2d07..5f97b6de2 100755 --- a/ubuntu/precise/applications/k9copy/debian/rules +++ b/ubuntu/precise/applications/k9copy/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +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/applications/kaffeine-mozilla/debian/rules b/ubuntu/precise/applications/kaffeine-mozilla/debian/rules index 80fe9807b..c04c761e2 100755 --- a/ubuntu/precise/applications/kaffeine-mozilla/debian/rules +++ b/ubuntu/precise/applications/kaffeine-mozilla/debian/rules @@ -14,6 +14,9 @@ export DH_OPTIONS DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity @@ -177,7 +180,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/applications/kaffeine/debian/rules b/ubuntu/precise/applications/kaffeine/debian/rules index 7791988e7..9021f8fb0 100755 --- a/ubuntu/precise/applications/kaffeine/debian/rules +++ b/ubuntu/precise/applications/kaffeine/debian/rules @@ -17,6 +17,9 @@ DEB_INSTALL_MANPAGES_kaffeine-trinity := debian/kaffeine.1 DEB_FIXPERMS_EXCLUDE := install-css.sh install-codecs +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/applications/katapult/debian/rules b/ubuntu/precise/applications/katapult/debian/rules index 6340f855d..779671876 100755 --- a/ubuntu/precise/applications/katapult/debian/rules +++ b/ubuntu/precise/applications/katapult/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine export KUBUNTU_DESKTOP_POT=extragear-utils_katapult 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) + cleanbuilddir/katapult-trinity:: rm -f katapult.1 diff --git a/ubuntu/precise/applications/kbarcode/debian/rules b/ubuntu/precise/applications/kbarcode/debian/rules index b8267f39c..cdbae3c90 100755 --- a/ubuntu/precise/applications/kbarcode/debian/rules +++ b/ubuntu/precise/applications/kbarcode/debian/rules @@ -16,6 +16,9 @@ DEB_INSTALL_MANPAGES_kbarcode-trinity := debian/kbarcode.1 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/kbfx/debian/rules b/ubuntu/precise/applications/kbfx/debian/rules index 2bffe9b78..97b64d997 100755 --- a/ubuntu/precise/applications/kbfx/debian/rules +++ b/ubuntu/precise/applications/kbfx/debian/rules @@ -24,6 +24,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + get-orig-source: @@dh_testdir @@[ -d ../tarballs/. ] @@ -74,6 +77,6 @@ binary-arch: build dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch diff --git a/ubuntu/precise/applications/kbookreader/debian/rules b/ubuntu/precise/applications/kbookreader/debian/rules index 6f4a82d1b..53794c4fe 100755 --- a/ubuntu/precise/applications/kbookreader/debian/rules +++ b/ubuntu/precise/applications/kbookreader/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +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/applications/kchmviewer/debian/rules b/ubuntu/precise/applications/kchmviewer/debian/rules index a496effa9..c22afc5a3 100755 --- a/ubuntu/precise/applications/kchmviewer/debian/rules +++ b/ubuntu/precise/applications/kchmviewer/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) @@ -114,7 +117,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/applications/kcmautostart/debian/rules b/ubuntu/precise/applications/kcmautostart/debian/rules index 242fb2c84..9bed17b05 100644..100755 --- a/ubuntu/precise/applications/kcmautostart/debian/rules +++ b/ubuntu/precise/applications/kcmautostart/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/applications/kcmldap/debian/rules b/ubuntu/precise/applications/kcmldap/debian/rules index 242fb2c84..9bed17b05 100644..100755 --- a/ubuntu/precise/applications/kcmldap/debian/rules +++ b/ubuntu/precise/applications/kcmldap/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/applications/kcmldapcontroller/debian/rules b/ubuntu/precise/applications/kcmldapcontroller/debian/rules index 242fb2c84..9bed17b05 100644..100755 --- a/ubuntu/precise/applications/kcmldapcontroller/debian/rules +++ b/ubuntu/precise/applications/kcmldapcontroller/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/applications/kcmldapmanager/debian/rules b/ubuntu/precise/applications/kcmldapmanager/debian/rules index 242fb2c84..9bed17b05 100644..100755 --- a/ubuntu/precise/applications/kcmldapmanager/debian/rules +++ b/ubuntu/precise/applications/kcmldapmanager/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/applications/kcpuload/debian/rules b/ubuntu/precise/applications/kcpuload/debian/rules index e13398f63..20eca167c 100755 --- a/ubuntu/precise/applications/kcpuload/debian/rules +++ b/ubuntu/precise/applications/kcpuload/debian/rules @@ -12,6 +12,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) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -184,7 +187,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/ubuntu/precise/applications/kdbusnotification/debian/rules b/ubuntu/precise/applications/kdbusnotification/debian/rules index 2acd9ab0f..94d0ad5bd 100755 --- a/ubuntu/precise/applications/kdbusnotification/debian/rules +++ b/ubuntu/precise/applications/kdbusnotification/debian/rules @@ -12,6 +12,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) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -173,7 +176,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/ubuntu/precise/applications/kdiff3/debian/rules b/ubuntu/precise/applications/kdiff3/debian/rules index bc64fcc06..19ea44a07 100755 --- a/ubuntu/precise/applications/kdiff3/debian/rules +++ b/ubuntu/precise/applications/kdiff3/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) + # 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) @@ -97,7 +100,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -118,7 +121,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/applications/kdirstat/debian/rules b/ubuntu/precise/applications/kdirstat/debian/rules index b15f5a9a5..8c0a950a3 100755 --- a/ubuntu/precise/applications/kdirstat/debian/rules +++ b/ubuntu/precise/applications/kdirstat/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + LDFLAGS += -Wl,--as-needed post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/precise/applications/kdpkg/debian/rules b/ubuntu/precise/applications/kdpkg/debian/rules index ff163f6a7..455414f69 100755 --- a/ubuntu/precise/applications/kdpkg/debian/rules +++ b/ubuntu/precise/applications/kdpkg/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/applications/keep/debian/rules b/ubuntu/precise/applications/keep/debian/rules index b6eae04ee..1b5054df6 100755 --- a/ubuntu/precise/applications/keep/debian/rules +++ b/ubuntu/precise/applications/keep/debian/rules @@ -16,6 +16,9 @@ DEB_INSTALL_MANPAGES_keep := keep.1 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/kerberostray/debian/rules b/ubuntu/precise/applications/kerberostray/debian/rules index 242fb2c84..9bed17b05 100755 --- a/ubuntu/precise/applications/kerberostray/debian/rules +++ b/ubuntu/precise/applications/kerberostray/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/applications/kerry/debian/rules b/ubuntu/precise/applications/kerry/debian/rules index 7dc0fbe23..dea466c17 100755 --- a/ubuntu/precise/applications/kerry/debian/rules +++ b/ubuntu/precise/applications/kerry/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_INSTALL_MANPAGES_kerry-trinity = kerry.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/kerry-trinity:: docbook2x-man debian/kerry.1.docbook diff --git a/ubuntu/precise/applications/kgtk-qt3/debian/rules b/ubuntu/precise/applications/kgtk-qt3/debian/rules index 15ab99eb2..b4cb7a953 100755 --- a/ubuntu/precise/applications/kgtk-qt3/debian/rules +++ b/ubuntu/precise/applications/kgtk-qt3/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 diff --git a/ubuntu/precise/applications/kile/debian/rules b/ubuntu/precise/applications/kile/debian/rules index 3e19a08ea..d7f547296 100755 --- a/ubuntu/precise/applications/kile/debian/rules +++ b/ubuntu/precise/applications/kile/debian/rules @@ -17,6 +17,9 @@ DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kile := debian/kile.1 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/kima/debian/rules b/ubuntu/precise/applications/kima/debian/rules index 519575104..45e052b96 100755 --- a/ubuntu/precise/applications/kima/debian/rules +++ b/ubuntu/precise/applications/kima/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) + # Add here any variable or target overrides you need. post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/precise/applications/kio-apt/debian/rules b/ubuntu/precise/applications/kio-apt/debian/rules index 9b82c21ad..93f63f8ee 100755 --- a/ubuntu/precise/applications/kio-apt/debian/rules +++ b/ubuntu/precise/applications/kio-apt/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/kio-locate/debian/rules b/ubuntu/precise/applications/kio-locate/debian/rules index 7a837110e..ecf59da08 100755 --- a/ubuntu/precise/applications/kio-locate/debian/rules +++ b/ubuntu/precise/applications/kio-locate/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 diff --git a/ubuntu/precise/applications/kio-umountwrapper/debian/rules b/ubuntu/precise/applications/kio-umountwrapper/debian/rules index ae8903f41..6672eae5b 100755 --- a/ubuntu/precise/applications/kio-umountwrapper/debian/rules +++ b/ubuntu/precise/applications/kio-umountwrapper/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/kiosktool/debian/rules b/ubuntu/precise/applications/kiosktool/debian/rules index 4e38353a1..507e5a458 100755 --- a/ubuntu/precise/applications/kiosktool/debian/rules +++ b/ubuntu/precise/applications/kiosktool/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/applications/kmplayer/debian/rules b/ubuntu/precise/applications/kmplayer/debian/rules index 63bf848d1..166ca76e2 100755 --- a/ubuntu/precise/applications/kmplayer/debian/rules +++ b/ubuntu/precise/applications/kmplayer/debian/rules @@ -22,6 +22,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --wi DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1 +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/applications/kmyfirewall/debian/rules b/ubuntu/precise/applications/kmyfirewall/debian/rules index 8fa664c8a..28035c796 100755 --- a/ubuntu/precise/applications/kmyfirewall/debian/rules +++ b/ubuntu/precise/applications/kmyfirewall/debian/rules @@ -13,6 +13,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) @@ -126,7 +129,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/applications/kmymoney/debian/rules b/ubuntu/precise/applications/kmymoney/debian/rules index 192c6019c..4c3b55cb4 100755 --- a/ubuntu/precise/applications/kmymoney/debian/rules +++ b/ubuntu/precise/applications/kmymoney/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3 --disable-pdf-docs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + LDFLAGS += -Wl,--as-needed post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/precise/applications/knemo/debian/rules b/ubuntu/precise/applications/knemo/debian/rules index fd71fe17f..4fb03f005 100755 --- a/ubuntu/precise/applications/knemo/debian/rules +++ b/ubuntu/precise/applications/knemo/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_DOCS_knemo = -XNEWS 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/knetload/debian/rules b/ubuntu/precise/applications/knetload/debian/rules index f5784f7ae..d955fbe4a 100755 --- a/ubuntu/precise/applications/knetload/debian/rules +++ b/ubuntu/precise/applications/knetload/debian/rules @@ -9,6 +9,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) + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -178,7 +181,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/ubuntu/precise/applications/knetstats/debian/rules b/ubuntu/precise/applications/knetstats/debian/rules index 7b1522933..1a573fb20 100755 --- a/ubuntu/precise/applications/knetstats/debian/rules +++ b/ubuntu/precise/applications/knetstats/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_knetstats-trinity = knetstats.1 +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/applications/knetworkmanager8/debian/rules b/ubuntu/precise/applications/knetworkmanager8/debian/rules index a4ba9688c..9c7e598e1 100755 --- a/ubuntu/precise/applications/knetworkmanager8/debian/rules +++ b/ubuntu/precise/applications/knetworkmanager8/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp +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/applications/knetworkmanager9/debian/rules b/ubuntu/precise/applications/knetworkmanager9/debian/rules index c9fa2b866..00ac9877f 100755 --- a/ubuntu/precise/applications/knetworkmanager9/debian/rules +++ b/ubuntu/precise/applications/knetworkmanager9/debian/rules @@ -20,6 +20,9 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/network-manager-kde-trinity:: # Install autostart file install -D -m 644 tdenetworkmanager-0.8/src/tdenetworkmanager.desktop \ diff --git a/ubuntu/precise/applications/knights/debian/rules b/ubuntu/precise/applications/knights/debian/rules index ab81cb6e3..f4f406c79 100755 --- a/ubuntu/precise/applications/knights/debian/rules +++ b/ubuntu/precise/applications/knights/debian/rules @@ -13,6 +13,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) @@ -107,7 +110,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/applications/knowit/debian/rules b/ubuntu/precise/applications/knowit/debian/rules index 3ed456df4..0a090fdb6 100755 --- a/ubuntu/precise/applications/knowit/debian/rules +++ b/ubuntu/precise/applications/knowit/debian/rules @@ -14,6 +14,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) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -95,7 +98,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/applications/knutclient/debian/rules b/ubuntu/precise/applications/knutclient/debian/rules index ad89a9108..0d07992cf 100755 --- a/ubuntu/precise/applications/knutclient/debian/rules +++ b/ubuntu/precise/applications/knutclient/debian/rules @@ -18,6 +18,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) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -127,7 +130,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/applications/koffice-i18n/debian/rules b/ubuntu/precise/applications/koffice-i18n/debian/rules index 9bb59484f..478c97b9d 100755 --- a/ubuntu/precise/applications/koffice-i18n/debian/rules +++ b/ubuntu/precise/applications/koffice-i18n/debian/rules @@ -3,6 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + languages = `ls -1d *i18n*` build-stamp: @@ -81,7 +84,7 @@ binary-indep: build dh_installdeb dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep diff --git a/ubuntu/precise/applications/koffice/debian/rules b/ubuntu/precise/applications/koffice/debian/rules index b166e12e4..ed91a11c3 100755 --- a/ubuntu/precise/applications/koffice/debian/rules +++ b/ubuntu/precise/applications/koffice/debian/rules @@ -17,6 +17,9 @@ DEB_KDE_APIDOX := no DEB_DH_STRIP_ARGS := --dbg-package=koffice-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := karbon-trinity kchart-trinity kivio-trinity koffice-libs-trinity chalk-trinity kspread-trinity kugar-trinity kthesaurus-trinity DEB_INSTALL_CHANGELOGS_karbon-trinity := karbon/CHANGES diff --git a/ubuntu/precise/applications/konversation/debian/rules b/ubuntu/precise/applications/konversation/debian/rules index 359d5f809..0e973a150 100755 --- a/ubuntu/precise/applications/konversation/debian/rules +++ b/ubuntu/precise/applications/konversation/debian/rules @@ -15,6 +15,9 @@ DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg DEB_INSTALL_DOCS_ALL = 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/kopete-otr/debian/rules b/ubuntu/precise/applications/kopete-otr/debian/rules index abfd36cfc..4edf9d96d 100755 --- a/ubuntu/precise/applications/kopete-otr/debian/rules +++ b/ubuntu/precise/applications/kopete-otr/debian/rules @@ -12,6 +12,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/kpicosim/debian/rules b/ubuntu/precise/applications/kpicosim/debian/rules index 4a8c9dcdd..0a03f424b 100755 --- a/ubuntu/precise/applications/kpicosim/debian/rules +++ b/ubuntu/precise/applications/kpicosim/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) @@ -123,7 +126,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/applications/kpilot/debian/rules b/ubuntu/precise/applications/kpilot/debian/rules index abfd36cfc..4edf9d96d 100755 --- a/ubuntu/precise/applications/kpilot/debian/rules +++ b/ubuntu/precise/applications/kpilot/debian/rules @@ -12,6 +12,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/rules b/ubuntu/precise/applications/kpowersave-nohal/debian/rules index a2f0e66bb..262171bc3 100755 --- a/ubuntu/precise/applications/kpowersave-nohal/debian/rules +++ b/ubuntu/precise/applications/kpowersave-nohal/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_ALL := AUTHORS NEWS 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/kpowersave/debian/rules b/ubuntu/precise/applications/kpowersave/debian/rules index 991d42479..961465395 100755 --- a/ubuntu/precise/applications/kpowersave/debian/rules +++ b/ubuntu/precise/applications/kpowersave/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_ALL := AUTHORS NEWS 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/kradio/debian/rules b/ubuntu/precise/applications/kradio/debian/rules index d8c6c0226..41840eb6e 100755 --- a/ubuntu/precise/applications/kradio/debian/rules +++ b/ubuntu/precise/applications/kradio/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) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -121,7 +124,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/applications/krename/debian/rules b/ubuntu/precise/applications/krename/debian/rules index f886eacd0..4983ad699 100755 --- a/ubuntu/precise/applications/krename/debian/rules +++ b/ubuntu/precise/applications/krename/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update debian/stamp-autothings-update: diff --git a/ubuntu/precise/applications/krusader/debian/rules b/ubuntu/precise/applications/krusader/debian/rules index 139132dbb..b19073807 100755 --- a/ubuntu/precise/applications/krusader/debian/rules +++ b/ubuntu/precise/applications/krusader/debian/rules @@ -18,6 +18,9 @@ DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/ 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/ksplash-engine-moodin/debian/rules b/ubuntu/precise/applications/ksplash-engine-moodin/debian/rules index 047b8ca76..c41d87b76 100755 --- a/ubuntu/precise/applications/ksplash-engine-moodin/debian/rules +++ b/ubuntu/precise/applications/ksplash-engine-moodin/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) + # 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) @@ -132,7 +135,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/applications/ksquirrel/debian/rules b/ubuntu/precise/applications/ksquirrel/debian/rules index 744a8d1e5..f59e43351 100755 --- a/ubuntu/precise/applications/ksquirrel/debian/rules +++ b/ubuntu/precise/applications/ksquirrel/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) @@ -106,7 +109,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/applications/kstreamripper/debian/rules b/ubuntu/precise/applications/kstreamripper/debian/rules index 9f641b49a..88540f9bf 100755 --- a/ubuntu/precise/applications/kstreamripper/debian/rules +++ b/ubuntu/precise/applications/kstreamripper/debian/rules @@ -2,6 +2,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk #DEB_INSTALL_MANPAGES_kstreamripper-trinity:=debian/kstreamripper.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PATH := /opt/trinity/bin:$(PATH) build/kstreamripper-trinity:: diff --git a/ubuntu/precise/applications/ksystemlog/debian/rules b/ubuntu/precise/applications/ksystemlog/debian/rules index 12d493659..5b9d63684 100755 --- a/ubuntu/precise/applications/ksystemlog/debian/rules +++ b/ubuntu/precise/applications/ksystemlog/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/ktechlab/debian/rules b/ubuntu/precise/applications/ktechlab/debian/rules index 15d1878df..227674f7f 100755 --- a/ubuntu/precise/applications/ktechlab/debian/rules +++ b/ubuntu/precise/applications/ktechlab/debian/rules @@ -12,6 +12,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) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -108,7 +111,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 unpatch diff --git a/ubuntu/precise/applications/ktorrent/debian/rules b/ubuntu/precise/applications/ktorrent/debian/rules index 5590816c2..d0046eb44 100755 --- a/ubuntu/precise/applications/ktorrent/debian/rules +++ b/ubuntu/precise/applications/ktorrent/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1 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) + build/ktorrent-trinity:: docbook2x-man debian/ktorrent.1.docbook diff --git a/ubuntu/precise/applications/kuickshow/debian/rules b/ubuntu/precise/applications/kuickshow/debian/rules index ee4456494..46fe966da 100755 --- a/ubuntu/precise/applications/kuickshow/debian/rules +++ b/ubuntu/precise/applications/kuickshow/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/kvirc/debian/rules b/ubuntu/precise/applications/kvirc/debian/rules index 665c61d25..fd45d5925 100755 --- a/ubuntu/precise/applications/kvirc/debian/rules +++ b/ubuntu/precise/applications/kvirc/debian/rules @@ -49,6 +49,9 @@ endif # DEB_COMPRESS_EXCLUDE := .kvs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # # Run dh_shlibdeps with the correct options # diff --git a/ubuntu/precise/applications/kvkbd/debian/rules b/ubuntu/precise/applications/kvkbd/debian/rules index 305c1e4df..0f564108e 100755 --- a/ubuntu/precise/applications/kvkbd/debian/rules +++ b/ubuntu/precise/applications/kvkbd/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + makebuilddir/kvkbd-trinity:: make -f Makefile.cvs diff --git a/ubuntu/precise/applications/kvpnc/debian/rules b/ubuntu/precise/applications/kvpnc/debian/rules index 354c23311..f93ccb291 100755 --- a/ubuntu/precise/applications/kvpnc/debian/rules +++ b/ubuntu/precise/applications/kvpnc/debian/rules @@ -17,6 +17,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + makebuilddir/kvpnc-trinity:: cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh diff --git a/ubuntu/precise/applications/piklab/debian/rules b/ubuntu/precise/applications/piklab/debian/rules index cd16137c9..6d0a1d510 100755 --- a/ubuntu/precise/applications/piklab/debian/rules +++ b/ubuntu/precise/applications/piklab/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) + # 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) @@ -111,7 +114,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: config build clean binary-indep binary-arch binary install diff --git a/ubuntu/precise/applications/potracegui/debian/rules b/ubuntu/precise/applications/potracegui/debian/rules index bc559477f..4b268883c 100755 --- a/ubuntu/precise/applications/potracegui/debian/rules +++ b/ubuntu/precise/applications/potracegui/debian/rules @@ -20,6 +20,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -100,7 +103,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/applications/qt4-tqt-theme-engine/debian/rules b/ubuntu/precise/applications/qt4-tqt-theme-engine/debian/rules index bd271d7de..2cde95722 100755 --- a/ubuntu/precise/applications/qt4-tqt-theme-engine/debian/rules +++ b/ubuntu/precise/applications/qt4-tqt-theme-engine/debian/rules @@ -9,5 +9,8 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + QMAKE := qmake-qt4 diff --git a/ubuntu/precise/applications/rosegarden/debian/rules b/ubuntu/precise/applications/rosegarden/debian/rules index 32d10d6ff..3fc2b777e 100755 --- a/ubuntu/precise/applications/rosegarden/debian/rules +++ b/ubuntu/precise/applications/rosegarden/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 @@ -56,7 +59,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 configure diff --git a/ubuntu/precise/applications/smartcardauth/debian/rules b/ubuntu/precise/applications/smartcardauth/debian/rules index a9e7e66cb..fe74e584a 100755 --- a/ubuntu/precise/applications/smartcardauth/debian/rules +++ b/ubuntu/precise/applications/smartcardauth/debian/rules @@ -9,3 +9,6 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/precise/applications/smb4k/debian/rules b/ubuntu/precise/applications/smb4k/debian/rules index db6aa90dd..70b1248dc 100755 --- a/ubuntu/precise/applications/smb4k/debian/rules +++ b/ubuntu/precise/applications/smb4k/debian/rules @@ -16,6 +16,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/soundkonverter/debian/rules b/ubuntu/precise/applications/soundkonverter/debian/rules index 831240224..d3eac8d3b 100755 --- a/ubuntu/precise/applications/soundkonverter/debian/rules +++ b/ubuntu/precise/applications/soundkonverter/debian/rules @@ -23,6 +23,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS = --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/soundkonverter-trinity:: install -D -p -m0644 debian/soundkonverter-trinity.lintian-overrides \ debian/soundkonverter-trinity/usr/share/lintian/overrides/soundkonverter-trinity diff --git a/ubuntu/precise/applications/tde-guidance/debian/rules b/ubuntu/precise/applications/tde-guidance/debian/rules index 996ad6a4d..614fdb4a9 100755 --- a/ubuntu/precise/applications/tde-guidance/debian/rules +++ b/ubuntu/precise/applications/tde-guidance/debian/rules @@ -15,6 +15,9 @@ PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS_APPEND := -L/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/tde-guidance-trinity:: # install icons to right place install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png \ diff --git a/ubuntu/precise/applications/tde-style-lipstik/debian/rules b/ubuntu/precise/applications/tde-style-lipstik/debian/rules index f24b21716..eb9de9610 100755 --- a/ubuntu/precise/applications/tde-style-lipstik/debian/rules +++ b/ubuntu/precise/applications/tde-style-lipstik/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) @@ -122,7 +125,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/applications/tde-style-qtcurve/debian/rules b/ubuntu/precise/applications/tde-style-qtcurve/debian/rules index c61c340ae..685703a85 100755 --- a/ubuntu/precise/applications/tde-style-qtcurve/debian/rules +++ b/ubuntu/precise/applications/tde-style-qtcurve/debian/rules @@ -24,6 +24,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 diff --git a/ubuntu/precise/applications/tde-systemsettings/debian/rules b/ubuntu/precise/applications/tde-systemsettings/debian/rules index 8110845eb..ed2e13a90 100755 --- a/ubuntu/precise/applications/tde-systemsettings/debian/rules +++ b/ubuntu/precise/applications/tde-systemsettings/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/tdesudo/debian/rules b/ubuntu/precise/applications/tdesudo/debian/rules index 5a63a69a9..443a43aed 100755 --- a/ubuntu/precise/applications/tdesudo/debian/rules +++ b/ubuntu/precise/applications/tdesudo/debian/rules @@ -15,6 +15,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/tdesudo-trinity:: docbook2x-man debian/tdesudo-trinity.1.docbook mv tdesudo.1 tdesudo-trinity.1 diff --git a/ubuntu/precise/applications/tdesvn/debian/rules b/ubuntu/precise/applications/tdesvn/debian/rules index d3e870fba..37d2a944b 100755 --- a/ubuntu/precise/applications/tdesvn/debian/rules +++ b/ubuntu/precise/applications/tdesvn/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 diff --git a/ubuntu/precise/applications/tdmtheme/debian/rules b/ubuntu/precise/applications/tdmtheme/debian/rules index 8e74fc2cb..0fc4f4aa4 100755 --- a/ubuntu/precise/applications/tdmtheme/debian/rules +++ b/ubuntu/precise/applications/tdmtheme/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/tellico/debian/rules b/ubuntu/precise/applications/tellico/debian/rules index 84b8312a4..9e404eabf 100755 --- a/ubuntu/precise/applications/tellico/debian/rules +++ b/ubuntu/precise/applications/tellico/debian/rules @@ -12,6 +12,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) @@ -149,7 +152,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -171,7 +174,7 @@ binary-arch: build install dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a - dh_builddeb -a + dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS) binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary install diff --git a/ubuntu/precise/applications/twin-style-crystal/debian/rules b/ubuntu/precise/applications/twin-style-crystal/debian/rules index 8cda3384a..4fb0c5bb5 100755 --- a/ubuntu/precise/applications/twin-style-crystal/debian/rules +++ b/ubuntu/precise/applications/twin-style-crystal/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/precise/applications/wlassistant/debian/rules b/ubuntu/precise/applications/wlassistant/debian/rules index abada8378..1a8fdeafb 100755 --- a/ubuntu/precise/applications/wlassistant/debian/rules +++ b/ubuntu/precise/applications/wlassistant/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -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 diff --git a/ubuntu/precise/applications/yakuake/debian/rules b/ubuntu/precise/applications/yakuake/debian/rules index f5bd922f5..aa22c8b59 100755 --- a/ubuntu/precise/applications/yakuake/debian/rules +++ b/ubuntu/precise/applications/yakuake/debian/rules @@ -15,6 +15,9 @@ INSTALL_DOCS_ALL := 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) + ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update debian/stamp-autothings-update: diff --git a/ubuntu/precise/dependencies/arts/debian/rules b/ubuntu/precise/dependencies/arts/debian/rules index b0a724e1a..9c9730bda 100755 --- a/ubuntu/precise/dependencies/arts/debian/rules +++ b/ubuntu/precise/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/precise/dependencies/avahi-tqt/debian/rules b/ubuntu/precise/dependencies/avahi-tqt/debian/rules index d4694a4bf..54a22a44f 100755 --- a/ubuntu/precise/dependencies/avahi-tqt/debian/rules +++ b/ubuntu/precise/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/precise/dependencies/dbus-1-tqt/debian/rules b/ubuntu/precise/dependencies/dbus-1-tqt/debian/rules index b7aa427f8..3b86de7db 100755 --- a/ubuntu/precise/dependencies/dbus-1-tqt/debian/rules +++ b/ubuntu/precise/dependencies/dbus-1-tqt/debian/rules @@ -4,3 +4,6 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk 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/precise/dependencies/dbus-tqt/debian/rules b/ubuntu/precise/dependencies/dbus-tqt/debian/rules index 894533134..a59bed76e 100755 --- a/ubuntu/precise/dependencies/dbus-tqt/debian/rules +++ b/ubuntu/precise/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/precise/dependencies/libart-lgpl/debian/rules b/ubuntu/precise/dependencies/libart-lgpl/debian/rules index 4390434f7..2751eb1f2 100755 --- a/ubuntu/precise/dependencies/libart-lgpl/debian/rules +++ b/ubuntu/precise/dependencies/libart-lgpl/debian/rules @@ -20,3 +20,5 @@ GNOME_MODULE := libart_lgpl DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/precise/dependencies/libcaldav/debian/rules b/ubuntu/precise/dependencies/libcaldav/debian/rules index 0dda6ea24..fb72a35e7 100755 --- a/ubuntu/precise/dependencies/libcaldav/debian/rules +++ b/ubuntu/precise/dependencies/libcaldav/debian/rules @@ -5,6 +5,9 @@ include /usr/share/quilt/quilt.make # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -86,7 +89,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independent packages using the common target. binary-indep: build install diff --git a/ubuntu/precise/dependencies/libcarddav/debian/rules b/ubuntu/precise/dependencies/libcarddav/debian/rules index 124929739..24bdcbc93 100755 --- a/ubuntu/precise/dependencies/libcarddav/debian/rules +++ b/ubuntu/precise/dependencies/libcarddav/debian/rules @@ -5,6 +5,9 @@ include /usr/share/quilt/quilt.make # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -86,7 +89,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independent packages using the common target. binary-indep: build install diff --git a/ubuntu/precise/dependencies/python-tqt/debian/rules b/ubuntu/precise/dependencies/python-tqt/debian/rules index ebb91c6e4..86eca95c9 100755 --- a/ubuntu/precise/dependencies/python-tqt/debian/rules +++ b/ubuntu/precise/dependencies/python-tqt/debian/rules @@ -3,6 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + export DH_OPTIONS -include /usr/share/python/python.mk @@ -158,7 +161,7 @@ endif dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: install-indep diff --git a/ubuntu/precise/dependencies/qt3/debian/rules b/ubuntu/precise/dependencies/qt3/debian/rules index b678d312d..7ede42ad9 100755 --- a/ubuntu/precise/dependencies/qt3/debian/rules +++ b/ubuntu/precise/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) @@ -327,7 +330,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 @@ -469,7 +472,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/precise/dependencies/sip4-tqt/debian/rules b/ubuntu/precise/dependencies/sip4-tqt/debian/rules index 0dd14099f..2286739d5 100755 --- a/ubuntu/precise/dependencies/sip4-tqt/debian/rules +++ b/ubuntu/precise/dependencies/sip4-tqt/debian/rules @@ -2,6 +2,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + export DH_OPTIONS INSTDIR=$(CURDIR)/debian @@ -134,7 +137,7 @@ endif dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: diff --git a/ubuntu/precise/dependencies/tqca-tls/debian/rules b/ubuntu/precise/dependencies/tqca-tls/debian/rules index 4ffaf90dc..fc9e58e55 100755 --- a/ubuntu/precise/dependencies/tqca-tls/debian/rules +++ b/ubuntu/precise/dependencies/tqca-tls/debian/rules @@ -6,6 +6,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +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) @@ -104,7 +107,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/dependencies/tqscintilla/debian/rules b/ubuntu/precise/dependencies/tqscintilla/debian/rules index 36df66cc9..8dfaa3377 100755 --- a/ubuntu/precise/dependencies/tqscintilla/debian/rules +++ b/ubuntu/precise/dependencies/tqscintilla/debian/rules @@ -5,6 +5,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This is the debhelper compatibility version to use. export QTDIR=/usr/share/tqt3 export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++ @@ -82,7 +85,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -100,7 +103,7 @@ binary-arch: build install dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a - dh_builddeb -a + dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff --git a/ubuntu/precise/dependencies/tqt3/debian/rules b/ubuntu/precise/dependencies/tqt3/debian/rules index 3f8e98c3a..d2d66f6a7 100755 --- a/ubuntu/precise/dependencies/tqt3/debian/rules +++ b/ubuntu/precise/dependencies/tqt3/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) @@ -331,7 +334,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 @@ -462,7 +465,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/precise/dependencies/tqtinterface/debian/rules b/ubuntu/precise/dependencies/tqtinterface/debian/rules index f05e2fadd..5d8f4cb4c 100755 --- a/ubuntu/precise/dependencies/tqtinterface/debian/rules +++ b/ubuntu/precise/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 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 diff --git a/ubuntu/precise/metapackages/kubuntu-meta/debian/rules b/ubuntu/precise/metapackages/kubuntu-meta/debian/rules index 3560b7d93..2b69924b8 100755 --- a/ubuntu/precise/metapackages/kubuntu-meta/debian/rules +++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/rules @@ -2,6 +2,9 @@ #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean: dh_testdir dh_clean @@ -35,7 +38,7 @@ binary-arch: install dh_installdeb -a dh_gencontrol -a dh_md5sums -a - dh_builddeb -a + dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS) binary-indep: diff --git a/ubuntu/precise/metapackages/sudo-trinity/debian/rules b/ubuntu/precise/metapackages/sudo-trinity/debian/rules index 087848532..f8c89d5db 100755 --- a/ubuntu/precise/metapackages/sudo-trinity/debian/rules +++ b/ubuntu/precise/metapackages/sudo-trinity/debian/rules @@ -6,3 +6,6 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/precise/tde-i18n/debian/rules b/ubuntu/precise/tde-i18n/debian/rules index e275e35df..b60af22ee 100755 --- a/ubuntu/precise/tde-i18n/debian/rules +++ b/ubuntu/precise/tde-i18n/debian/rules @@ -31,6 +31,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) + debian/debiandirs: scripts/admin/debianrules perl -w scripts/admin/debianrules echodirs > debian/debiandirs @@ -107,7 +110,7 @@ binary-indep: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Below here is fairly generic really diff --git a/ubuntu/precise/tdeaccessibility/debian/rules b/ubuntu/precise/tdeaccessibility/debian/rules index f5c6caf43..4fdbdb6c3 100755 --- a/ubuntu/precise/tdeaccessibility/debian/rules +++ b/ubuntu/precise/tdeaccessibility/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdeaccessibility-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kttsd-trinity ksayit-trinity #shlibs_ver = 4:3.5.0 diff --git a/ubuntu/precise/tdeaddons/debian/rules b/ubuntu/precise/tdeaddons/debian/rules index 5d337bfab..e2158a506 100755 --- a/ubuntu/precise/tdeaddons/debian/rules +++ b/ubuntu/precise/tdeaddons/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --without-xmms --prefix=/opt/trinity --with-extra-l DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter binary-install/konq-plugins-trinity:: diff --git a/ubuntu/precise/tdeadmin/debian/rules b/ubuntu/precise/tdeadmin/debian/rules index 9c9ccadda..849de5f21 100755 --- a/ubuntu/precise/tdeadmin/debian/rules +++ b/ubuntu/precise/tdeadmin/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=tdeadmin-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := \ --without-rpm --with-pam=kde --with-shadow --with-nis \ --with-private-groups --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib diff --git a/ubuntu/precise/tdeartwork/debian/rules b/ubuntu/precise/tdeartwork/debian/rules index 28dd50f1b..4e236c044 100755 --- a/ubuntu/precise/tdeartwork/debian/rules +++ b/ubuntu/precise/tdeartwork/debian/rules @@ -28,6 +28,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdeartwork-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean:: rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png diff --git a/ubuntu/precise/tdebase/debian/rules b/ubuntu/precise/tdebase/debian/rules index 1ddae9c58..a1e9c65f7 100755 --- a/ubuntu/precise/tdebase/debian/rules +++ b/ubuntu/precise/tdebase/debian/rules @@ -34,6 +34,9 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach kioslave kxkb kdebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ diff --git a/ubuntu/precise/tdebindings/debian/rules b/ubuntu/precise/tdebindings/debian/rules index 6a0e11dc7..b503f7580 100755 --- a/ubuntu/precise/tdebindings/debian/rules +++ b/ubuntu/precise/tdebindings/debian/rules @@ -35,6 +35,9 @@ DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) \ DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are not all the packages with libraries, but only those that # need to be in DEB_SHLIBDEPS_INCLUDE... PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmokeqt1-trinity libsmokekde1-trinity libkjsembed1-trinity diff --git a/ubuntu/precise/tdeedu/debian/rules b/ubuntu/precise/tdeedu/debian/rules index d1258cdf0..9f81df4c0 100755 --- a/ubuntu/precise/tdeedu/debian/rules +++ b/ubuntu/precise/tdeedu/debian/rules @@ -16,6 +16,9 @@ DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Ensure that kig's python scripting built successfully. common-build-arch:: test -e $(DEB_BUILDDIR)/kig/scripting/libscripting.la diff --git a/ubuntu/precise/tdegames/debian/rules b/ubuntu/precise/tdegames/debian/rules index a979e0440..085eb8404 100755 --- a/ubuntu/precise/tdegames/debian/rules +++ b/ubuntu/precise/tdegames/debian/rules @@ -26,6 +26,9 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if DEB_INSTALL_CHANGELOGS_tdegames := $(DEB_SRCDIR)/ChangeLog +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity' DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V diff --git a/ubuntu/precise/tdegraphics/debian/rules b/ubuntu/precise/tdegraphics/debian/rules index 927f3faf8..9aedb5fcf 100755 --- a/ubuntu/precise/tdegraphics/debian/rules +++ b/ubuntu/precise/tdegraphics/debian/rules @@ -24,6 +24,9 @@ DEB_BUILD_PARALLEL = true DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kfaxview-trinity kghostview-trinity kmrml-trinity kpovmodeler-trinity ksvg-trinity \ kuickshow-trinity kview-trinity kviewshell-trinity libkscan1-trinity diff --git a/ubuntu/precise/tdelibs/debian/rules b/ubuntu/precise/tdelibs/debian/rules index 717488e0f..1ca5cc3ef 100755 --- a/ubuntu/precise/tdelibs/debian/rules +++ b/ubuntu/precise/tdelibs/debian/rules @@ -36,6 +36,9 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdelibs-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/tdelibs-data-trinity:: install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf diff --git a/ubuntu/precise/tdemultimedia/debian/rules b/ubuntu/precise/tdemultimedia/debian/rules index 336c7e70d..1e7e0647c 100755 --- a/ubuntu/precise/tdemultimedia/debian/rules +++ b/ubuntu/precise/tdemultimedia/debian/rules @@ -23,6 +23,9 @@ DOC_HTML_PRUNE := kcontrol-trinity DEB_DH_STRIP_ARGS := --dbg-package=tdemultimedia-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \ libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \ libkcddb1-trinity mpeglib-trinity noatun-trinity diff --git a/ubuntu/precise/tdenetwork/debian/rules b/ubuntu/precise/tdenetwork/debian/rules index f27a7cca8..2579d07e3 100755 --- a/ubuntu/precise/tdenetwork/debian/rules +++ b/ubuntu/precise/tdenetwork/debian/rules @@ -44,6 +44,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdenetwork-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/ubuntu/precise/tdepim/debian/rules b/ubuntu/precise/tdepim/debian/rules index b20b4a7b9..0e1c5356b 100755 --- a/ubuntu/precise/tdepim/debian/rules +++ b/ubuntu/precise/tdepim/debian/rules @@ -32,6 +32,9 @@ DEB_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + shlibs_ver=4:3.5.7 DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libkcal2b-trinity := -V'libkcal2b-trinity (>= $(shlibs_ver))' diff --git a/ubuntu/precise/tdesdk/debian/rules b/ubuntu/precise/tdesdk/debian/rules index 6ca7926a1..36d49b7c7 100755 --- a/ubuntu/precise/tdesdk/debian/rules +++ b/ubuntu/precise/tdesdk/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=tdesdk-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/precise/tdetoys/debian/rules b/ubuntu/precise/tdetoys/debian/rules index b9707dd97..da1268d9f 100755 --- a/ubuntu/precise/tdetoys/debian/rules +++ b/ubuntu/precise/tdetoys/debian/rules @@ -27,5 +27,8 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog DEB_INSTALL_CHANGELOGS_kteatime-trinity := kteatime/ChangeLog diff --git a/ubuntu/precise/tdeutils/debian/rules b/ubuntu/precise/tdeutils/debian/rules index 57cdb4efd..19848196e 100755 --- a/ubuntu/precise/tdeutils/debian/rules +++ b/ubuntu/precise/tdeutils/debian/rules @@ -40,6 +40,9 @@ DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselec DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/ubuntu/precise/tdevelop/debian/rules b/ubuntu/precise/tdevelop/debian/rules index a6af11e93..95a3981ea 100755 --- a/ubuntu/precise/tdevelop/debian/rules +++ b/ubuntu/precise/tdevelop/debian/rules @@ -17,6 +17,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) + PACKAGES_WITH_LIBS := tdevelop-trinity DEB_KDE_ENABLE_FINAL := diff --git a/ubuntu/precise/tdewebdev/debian/rules b/ubuntu/precise/tdewebdev/debian/rules index 5a5ea2fd9..ad4eb9d85 100755 --- a/ubuntu/precise/tdewebdev/debian/rules +++ b/ubuntu/precise/tdewebdev/debian/rules @@ -28,6 +28,9 @@ endif DEB_DH_STRIP_ARGS := --dbg-package=tdewebdev-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kommander-trinity #shlibs_ver = 4:3.5.0-1 |