diff --git a/debian/lenny/applications/abakus/debian/rules b/debian/lenny/applications/abakus/debian/rules index d0a475105..c856f7cae 100755 --- a/debian/lenny/applications/abakus/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/adept/debian/rules b/debian/lenny/applications/adept/debian/rules index 9c80b51c7..de6788eff 100755 --- a/debian/lenny/applications/adept/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/amarok/debian/rules b/debian/lenny/applications/amarok/debian/rules index 1e2caae64..77c35d14f 100755 --- a/debian/lenny/applications/amarok/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/basket/debian/rules b/debian/lenny/applications/basket/debian/rules index 0e433ddc5..5a52ee2fc 100755 --- a/debian/lenny/applications/basket/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/bibletime/debian/rules b/debian/lenny/applications/bibletime/debian/rules index 1ef64a83d..225ac5e18 100755 --- a/debian/lenny/applications/bibletime/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules b/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules index 820ba5a3b..806eaae15 100755 --- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/desktop-effects-kde/debian/rules b/debian/lenny/applications/desktop-effects-kde/debian/rules index 89b037f13..8eee42e6a 100755 --- a/debian/lenny/applications/desktop-effects-kde/debian/rules +++ b/debian/lenny/applications/desktop-effects-kde/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-kde-trinity:: dh_pycentral -pdesktop-effects-kde-trinity diff --git a/debian/lenny/applications/digikam/debian/rules b/debian/lenny/applications/digikam/debian/rules index c358c16af..8a35928b4 100755 --- a/debian/lenny/applications/digikam/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/dolphin/debian/rules b/debian/lenny/applications/dolphin/debian/rules index 1534d2f29..66ea98891 100755 --- a/debian/lenny/applications/dolphin/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/filelight-l10n/debian/rules b/debian/lenny/applications/filelight-l10n/debian/rules index 7eea2f6e2..bc018d11c 100755 --- a/debian/lenny/applications/filelight-l10n/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/filelight/debian/rules b/debian/lenny/applications/filelight/debian/rules index 29d7edcd8..bbbe8f348 100755 --- a/debian/lenny/applications/filelight/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/fusion-icon/debian/rules b/debian/lenny/applications/fusion-icon/debian/rules index 5d3ed1e14..8c79610db 100755 --- a/debian/lenny/applications/fusion-icon/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/gtk-qt-engine/debian/rules b/debian/lenny/applications/gtk-qt-engine/debian/rules index 6d7d79108..ad9d85488 100755 --- a/debian/lenny/applications/gtk-qt-engine/debian/rules +++ b/debian/lenny/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/kde" -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/debian/lenny/applications/gwenview-i18n/debian/rules b/debian/lenny/applications/gwenview-i18n/debian/rules index ef4e97ec1..3070a9c9d 100755 --- a/debian/lenny/applications/gwenview-i18n/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/gwenview/debian/rules b/debian/lenny/applications/gwenview/debian/rules index 444a4c565..3bc3592a0 100755 --- a/debian/lenny/applications/gwenview/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/k3b-i18n/debian/rules b/debian/lenny/applications/k3b-i18n/debian/rules index 2048362b9..1e6d35926 100755 --- a/debian/lenny/applications/k3b-i18n/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/k3b/debian/rules b/debian/lenny/applications/k3b/debian/rules index fa308829e..a441e55e1 100755 --- a/debian/lenny/applications/k3b/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/k9copy/debian/rules b/debian/lenny/applications/k9copy/debian/rules index e0e16f836..7478396eb 100755 --- a/debian/lenny/applications/k9copy/debian/rules +++ b/debian/lenny/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/kde" --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/debian/lenny/applications/kaffeine-mozilla/debian/rules b/debian/lenny/applications/kaffeine-mozilla/debian/rules index 86b977b3f..108264012 100755 --- a/debian/lenny/applications/kaffeine-mozilla/debian/rules +++ b/debian/lenny/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/kde 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/debian/lenny/applications/kaffeine/debian/rules b/debian/lenny/applications/kaffeine/debian/rules index b5cc2a752..5984a3b6f 100755 --- a/debian/lenny/applications/kaffeine/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/katapult/debian/rules b/debian/lenny/applications/katapult/debian/rules index e3cc236a1..70524295d 100755 --- a/debian/lenny/applications/katapult/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kbarcode/debian/rules b/debian/lenny/applications/kbarcode/debian/rules index f7655f9fc..405f74e12 100755 --- a/debian/lenny/applications/kbarcode/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kbfx/debian/rules b/debian/lenny/applications/kbfx/debian/rules index 296fbd05a..658c8aaac 100755 --- a/debian/lenny/applications/kbfx/debian/rules +++ b/debian/lenny/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/kde" -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/debian/lenny/applications/kbookreader/debian/rules b/debian/lenny/applications/kbookreader/debian/rules index 177358959..065dcfd33 100755 --- a/debian/lenny/applications/kbookreader/debian/rules +++ b/debian/lenny/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/kde" --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/debian/lenny/applications/kchmviewer/debian/rules b/debian/lenny/applications/kchmviewer/debian/rules index 50e14fe4d..0fdbf1173 100755 --- a/debian/lenny/applications/kchmviewer/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kcpuload/debian/rules b/debian/lenny/applications/kcpuload/debian/rules index f11850d76..276ee50d0 100755 --- a/debian/lenny/applications/kcpuload/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kdbusnotification/debian/rules b/debian/lenny/applications/kdbusnotification/debian/rules index b2bab174e..eb683b4e3 100755 --- a/debian/lenny/applications/kdbusnotification/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kde-guidance/debian/rules b/debian/lenny/applications/kde-guidance/debian/rules index f6b60f331..ac2d758d5 100755 --- a/debian/lenny/applications/kde-guidance/debian/rules +++ b/debian/lenny/applications/kde-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/kde LDFLAGS_APPEND := -L/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/kde-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/debian/lenny/applications/kde-style-lipstik/debian/rules b/debian/lenny/applications/kde-style-lipstik/debian/rules index e535bbd80..620265e8e 100755 --- a/debian/lenny/applications/kde-style-lipstik/debian/rules +++ b/debian/lenny/applications/kde-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/debian/lenny/applications/kde-style-qtcurve/debian/rules b/debian/lenny/applications/kde-style-qtcurve/debian/rules index c61c340ae..685703a85 100755 --- a/debian/lenny/applications/kde-style-qtcurve/debian/rules +++ b/debian/lenny/applications/kde-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/debian/lenny/applications/kde-systemsettings/debian/rules b/debian/lenny/applications/kde-systemsettings/debian/rules index c96c1db4f..fbfdf7a42 100755 --- a/debian/lenny/applications/kde-systemsettings/debian/rules +++ b/debian/lenny/applications/kde-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/debian/lenny/applications/kdesudo/debian/rules b/debian/lenny/applications/kdesudo/debian/rules index 25290a923..1f131406e 100755 --- a/debian/lenny/applications/kdesudo/debian/rules +++ b/debian/lenny/applications/kdesudo/debian/rules @@ -15,6 +15,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_INSTALL_MANPAGES_kdesudo-trinity = kdesudo-trinity.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/kdesudo-trinity:: docbook2x-man debian/kdesudo-trinity.1.docbook mv kdesudo.1 kdesudo-trinity.1 diff --git a/debian/lenny/applications/kdesvn/debian/rules b/debian/lenny/applications/kdesvn/debian/rules index 54fa85536..b8bfab22c 100755 --- a/debian/lenny/applications/kdesvn/debian/rules +++ b/debian/lenny/applications/kdesvn/debian/rules @@ -17,6 +17,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/kde" -DCMAKE_CXX_FLAGS="-I/opt/trinity/include/kde" -DCMAKE_LDFLAGS="-L/opt/trinity/lib" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_COMPRESS_EXCLUDE := .dcl .docbook -license .tag .sty .el DEB_DH_MAKESHLIBS_ARGS_libsvnqt4 := -V diff --git a/debian/lenny/applications/kdiff3/debian/rules b/debian/lenny/applications/kdiff3/debian/rules index daf6b2bea..9181b1148 100755 --- a/debian/lenny/applications/kdiff3/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kdirstat/debian/rules b/debian/lenny/applications/kdirstat/debian/rules index cf2a8db06..201ba1594 100755 --- a/debian/lenny/applications/kdirstat/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/kdmtheme/debian/rules b/debian/lenny/applications/kdmtheme/debian/rules index 0049d9a98..c32ab9bff 100755 --- a/debian/lenny/applications/kdmtheme/debian/rules +++ b/debian/lenny/applications/kdmtheme/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/kde +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/debian/lenny/applications/kdpkg/debian/rules b/debian/lenny/applications/kdpkg/debian/rules index fa7458ed9..1c07fcb5f 100755 --- a/debian/lenny/applications/kdpkg/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/keep/debian/rules b/debian/lenny/applications/keep/debian/rules index 49dc42fae..a2d1f2879 100755 --- a/debian/lenny/applications/keep/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/kerry/debian/rules b/debian/lenny/applications/kerry/debian/rules index e3861ca8d..4cbb0340e 100755 --- a/debian/lenny/applications/kerry/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kgtk-qt3/debian/rules b/debian/lenny/applications/kgtk-qt3/debian/rules index 15ab99eb2..b4cb7a953 100755 --- a/debian/lenny/applications/kgtk-qt3/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kile/debian/rules b/debian/lenny/applications/kile/debian/rules index 2d31b63e0..ba41b231f 100755 --- a/debian/lenny/applications/kile/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/kima/debian/rules b/debian/lenny/applications/kima/debian/rules index a353777b4..27a3fe333 100755 --- a/debian/lenny/applications/kima/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kio-apt/debian/rules b/debian/lenny/applications/kio-apt/debian/rules index a6d8c580a..d5367a005 100755 --- a/debian/lenny/applications/kio-apt/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/kio-locate/debian/rules b/debian/lenny/applications/kio-locate/debian/rules index 7a837110e..ecf59da08 100755 --- a/debian/lenny/applications/kio-locate/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kio-umountwrapper/debian/rules b/debian/lenny/applications/kio-umountwrapper/debian/rules index ce61aac65..8a83b84a6 100755 --- a/debian/lenny/applications/kio-umountwrapper/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/kiosktool/debian/rules b/debian/lenny/applications/kiosktool/debian/rules index 3102a534a..43179510b 100755 --- a/debian/lenny/applications/kiosktool/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kmplayer/debian/rules b/debian/lenny/applications/kmplayer/debian/rules index b23d91457..6e8bb46df 100755 --- a/debian/lenny/applications/kmplayer/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kmyfirewall/debian/rules b/debian/lenny/applications/kmyfirewall/debian/rules index a600a1db1..d03f14f42 100755 --- a/debian/lenny/applications/kmyfirewall/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kmymoney/debian/rules b/debian/lenny/applications/kmymoney/debian/rules index efb7a96ea..0ed3de40c 100755 --- a/debian/lenny/applications/kmymoney/debian/rules +++ b/debian/lenny/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/kde --disable-sqlite3 +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/debian/lenny/applications/knemo/debian/rules b/debian/lenny/applications/knemo/debian/rules index 143b4cd5e..e5ef22e90 100755 --- a/debian/lenny/applications/knemo/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/knetload/debian/rules b/debian/lenny/applications/knetload/debian/rules index d8280c4c6..26d3608ac 100755 --- a/debian/lenny/applications/knetload/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/knetstats/debian/rules b/debian/lenny/applications/knetstats/debian/rules index 7f241d43e..948def121 100755 --- a/debian/lenny/applications/knetstats/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/knetworkmanager8/debian/rules b/debian/lenny/applications/knetworkmanager8/debian/rules index e468caa92..edcd76cce 100755 --- a/debian/lenny/applications/knetworkmanager8/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/knights/debian/rules b/debian/lenny/applications/knights/debian/rules index 4527456f6..bde510e8b 100755 --- a/debian/lenny/applications/knights/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/knowit/debian/rules b/debian/lenny/applications/knowit/debian/rules index b04e5a6c4..77f1d05a4 100755 --- a/debian/lenny/applications/knowit/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/knutclient/debian/rules b/debian/lenny/applications/knutclient/debian/rules index e96a49579..a009dbf98 100755 --- a/debian/lenny/applications/knutclient/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/koffice-i18n/debian/rules b/debian/lenny/applications/koffice-i18n/debian/rules index 9bb59484f..478c97b9d 100755 --- a/debian/lenny/applications/koffice-i18n/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/koffice/debian/rules b/debian/lenny/applications/koffice/debian/rules index 93b117f1d..597adca91 100755 --- a/debian/lenny/applications/koffice/debian/rules +++ b/debian/lenny/applications/koffice/debian/rules @@ -16,6 +16,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/debian/lenny/applications/konversation/debian/rules b/debian/lenny/applications/konversation/debian/rules index 67bc3bb74..61d6c4eab 100755 --- a/debian/lenny/applications/konversation/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/kopete-otr/debian/rules b/debian/lenny/applications/kopete-otr/debian/rules index 8b49a1a4b..3c342bcfc 100755 --- a/debian/lenny/applications/kopete-otr/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/kpicosim/debian/rules b/debian/lenny/applications/kpicosim/debian/rules index b3c8159f5..98b6ba69e 100755 --- a/debian/lenny/applications/kpicosim/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kpilot/debian/rules b/debian/lenny/applications/kpilot/debian/rules index 8b49a1a4b..3c342bcfc 100755 --- a/debian/lenny/applications/kpilot/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/kpowersave/debian/rules b/debian/lenny/applications/kpowersave/debian/rules index 51e6498b9..120ec29f9 100755 --- a/debian/lenny/applications/kpowersave/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/kradio/debian/rules b/debian/lenny/applications/kradio/debian/rules index 83dd79dc2..f3c1f73d7 100755 --- a/debian/lenny/applications/kradio/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/krename/debian/rules b/debian/lenny/applications/krename/debian/rules index cb2871157..3888eea1b 100755 --- a/debian/lenny/applications/krename/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/krusader/debian/rules b/debian/lenny/applications/krusader/debian/rules index 9ff5fba71..967b15604 100755 --- a/debian/lenny/applications/krusader/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/ksplash-engine-moodin/debian/rules b/debian/lenny/applications/ksplash-engine-moodin/debian/rules index 2b5a4f326..e4050daef 100755 --- a/debian/lenny/applications/ksplash-engine-moodin/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/ksquirrel/debian/rules b/debian/lenny/applications/ksquirrel/debian/rules index 340dc328c..60b270a47 100755 --- a/debian/lenny/applications/ksquirrel/debian/rules +++ b/debian/lenny/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) @@ -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/debian/lenny/applications/kstreamripper/debian/rules b/debian/lenny/applications/kstreamripper/debian/rules index 725896903..cb9dc49ae 100755 --- a/debian/lenny/applications/kstreamripper/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/ksystemlog/debian/rules b/debian/lenny/applications/ksystemlog/debian/rules index d88e064ef..e26e7d22c 100755 --- a/debian/lenny/applications/ksystemlog/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/ktechlab/debian/rules b/debian/lenny/applications/ktechlab/debian/rules index b8023c222..6ee5ee935 100755 --- a/debian/lenny/applications/ktechlab/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/ktorrent/debian/rules b/debian/lenny/applications/ktorrent/debian/rules index 46a8b920a..853b79b3f 100755 --- a/debian/lenny/applications/ktorrent/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/kuickshow/debian/rules b/debian/lenny/applications/kuickshow/debian/rules index 2e1a58a13..b751ebfe5 100755 --- a/debian/lenny/applications/kuickshow/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/kvirc/debian/rules b/debian/lenny/applications/kvirc/debian/rules index e62941e7b..cb7bb0c9a 100755 --- a/debian/lenny/applications/kvirc/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/kvkbd/debian/rules b/debian/lenny/applications/kvkbd/debian/rules index 2aabc75db..e0f747177 100755 --- a/debian/lenny/applications/kvkbd/debian/rules +++ b/debian/lenny/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/kde +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/debian/lenny/applications/kwin-style-crystal/debian/rules b/debian/lenny/applications/kwin-style-crystal/debian/rules index 5e522ca06..967c93592 100755 --- a/debian/lenny/applications/kwin-style-crystal/debian/rules +++ b/debian/lenny/applications/kwin-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/debian/lenny/applications/piklab/debian/rules b/debian/lenny/applications/piklab/debian/rules index 2a22da86c..31c8548d3 100755 --- a/debian/lenny/applications/piklab/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/potracegui/debian/rules b/debian/lenny/applications/potracegui/debian/rules index 8f7f4038a..fdda3113f 100755 --- a/debian/lenny/applications/potracegui/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/rosegarden/debian/rules b/debian/lenny/applications/rosegarden/debian/rules index c2a170b01..01988596d 100755 --- a/debian/lenny/applications/rosegarden/debian/rules +++ b/debian/lenny/applications/rosegarden/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) + DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture) ARCH=$(DEB_BUILD_ARCH) @@ -99,7 +102,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/debian/lenny/applications/smartcardauth/debian/rules b/debian/lenny/applications/smartcardauth/debian/rules index a9e7e66cb..fe74e584a 100755 --- a/debian/lenny/applications/smartcardauth/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/smb4k/debian/rules b/debian/lenny/applications/smb4k/debian/rules index a7f5808ef..c6b04fa37 100755 --- a/debian/lenny/applications/smb4k/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/soundkonverter/debian/rules b/debian/lenny/applications/soundkonverter/debian/rules index 16846b152..04a76beea 100755 --- a/debian/lenny/applications/soundkonverter/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/tellico/debian/rules b/debian/lenny/applications/tellico/debian/rules index eb8dfa1d5..912878ba2 100755 --- a/debian/lenny/applications/tellico/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/wlassistant/debian/rules b/debian/lenny/applications/wlassistant/debian/rules index abada8378..1a8fdeafb 100755 --- a/debian/lenny/applications/wlassistant/debian/rules +++ b/debian/lenny/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/debian/lenny/applications/yakuake/debian/rules b/debian/lenny/applications/yakuake/debian/rules index 176f45bc3..f86dc62d5 100755 --- a/debian/lenny/applications/yakuake/debian/rules +++ b/debian/lenny/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/debian/lenny/dependencies/arts/debian/rules b/debian/lenny/dependencies/arts/debian/rules index dadb5c3c7..afe726f0b 100755 --- a/debian/lenny/dependencies/arts/debian/rules +++ b/debian/lenny/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/debian/lenny/dependencies/avahi-tqt/debian/rules b/debian/lenny/dependencies/avahi-tqt/debian/rules index d4694a4bf..54a22a44f 100755 --- a/debian/lenny/dependencies/avahi-tqt/debian/rules +++ b/debian/lenny/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/debian/lenny/dependencies/dbus-1-tqt/debian/rules b/debian/lenny/dependencies/dbus-1-tqt/debian/rules index b7aa427f8..3b86de7db 100755 --- a/debian/lenny/dependencies/dbus-1-tqt/debian/rules +++ b/debian/lenny/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/debian/lenny/dependencies/dbus-tqt/debian/rules b/debian/lenny/dependencies/dbus-tqt/debian/rules index 894533134..a59bed76e 100755 --- a/debian/lenny/dependencies/dbus-tqt/debian/rules +++ b/debian/lenny/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/debian/lenny/dependencies/qt3/debian/rules b/debian/lenny/dependencies/qt3/debian/rules index 09b237823..5b1a54766 100755 --- a/debian/lenny/dependencies/qt3/debian/rules +++ b/debian/lenny/dependencies/qt3/debian/rules @@ -11,6 +11,9 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -326,7 +329,7 @@ binary-indep: build install dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) binary-arch: build install @@ -468,7 +471,7 @@ binary-arch: build install dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) - dh_builddeb -a $(IBASE) + dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build binary-indep binary-arch binary install clean patch unpatch diff --git a/debian/lenny/dependencies/tqtinterface/debian/rules b/debian/lenny/dependencies/tqtinterface/debian/rules index 257a9b12e..208d4bed4 100755 --- a/debian/lenny/dependencies/tqtinterface/debian/rules +++ b/debian/lenny/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/debian/lenny/kde-i18n/debian/rules b/debian/lenny/kde-i18n/debian/rules index 9362f6b41..91185da9c 100755 --- a/debian/lenny/kde-i18n/debian/rules +++ b/debian/lenny/kde-i18n/debian/rules @@ -32,6 +32,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 @@ -108,7 +111,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/debian/lenny/kdeaccessibility/debian/rules b/debian/lenny/kdeaccessibility/debian/rules index fa8e35bb3..d77421956 100755 --- a/debian/lenny/kdeaccessibility/debian/rules +++ b/debian/lenny/kdeaccessibility/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=kdeaccessibility-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 DEB_DH_MAKESHLIBS_ARGS_kttsd-trinity := -V'kttsd-trinity (>= 4:3.5.8-1)' diff --git a/debian/lenny/kdeaddons/debian/rules b/debian/lenny/kdeaddons/debian/rules index 8e11cd8a6..ef36a4389 100755 --- a/debian/lenny/kdeaddons/debian/rules +++ b/debian/lenny/kdeaddons/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --without-xmms --prefix=/opt/trinity --with-extra-l DEB_DH_STRIP_ARGS := --dbg-package=kdeaddons-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/debian/lenny/kdeadmin/debian/rules b/debian/lenny/kdeadmin/debian/rules index dec35a720..a486a60b6 100755 --- a/debian/lenny/kdeadmin/debian/rules +++ b/debian/lenny/kdeadmin/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=kdeadmin-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/debian/lenny/kdeartwork/debian/rules b/debian/lenny/kdeartwork/debian/rules index 504694114..ee24e8b57 100755 --- a/debian/lenny/kdeartwork/debian/rules +++ b/debian/lenny/kdeartwork/debian/rules @@ -28,6 +28,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=kdeartwork-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/debian/lenny/kdebase/debian/rules b/debian/lenny/kdebase/debian/rules index ff9a4e80b..bf6de4342 100755 --- a/debian/lenny/kdebase/debian/rules +++ b/debian/lenny/kdebase/debian/rules @@ -34,6 +34,9 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=kdebase-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 kdesu knetattach kioslave kxkb kdebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity kdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ diff --git a/debian/lenny/kdebindings/debian/rules b/debian/lenny/kdebindings/debian/rules index d35ac877e..6fac75697 100755 --- a/debian/lenny/kdebindings/debian/rules +++ b/debian/lenny/kdebindings/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/debian/lenny/kdeedu/debian/rules b/debian/lenny/kdeedu/debian/rules index 91a939dcf..a449d17a7 100755 --- a/debian/lenny/kdeedu/debian/rules +++ b/debian/lenny/kdeedu/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/kde" --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/debian/lenny/kdegames/debian/rules b/debian/lenny/kdegames/debian/rules index 080a45bc9..bbfa34c23 100755 --- a/debian/lenny/kdegames/debian/rules +++ b/debian/lenny/kdegames/debian/rules @@ -26,6 +26,9 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if DEB_INSTALL_CHANGELOGS_kdegames := $(DEB_SRCDIR)/ChangeLog +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_DH_MAKESHLIBS_ARGS_libkdegames1-trinity := -V'libkdegames1-trinity (>= 4:3.5.8)' DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V diff --git a/debian/lenny/kdegraphics/debian/rules b/debian/lenny/kdegraphics/debian/rules index 5ce75251d..415843290 100755 --- a/debian/lenny/kdegraphics/debian/rules +++ b/debian/lenny/kdegraphics/debian/rules @@ -24,6 +24,9 @@ DEB_BUILD_PARALLEL = true DEB_DH_STRIP_ARGS := --dbg-package=kdegraphics-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/debian/lenny/kdelibs/debian/rules b/debian/lenny/kdelibs/debian/rules index 6617eed6d..12d2649fc 100755 --- a/debian/lenny/kdelibs/debian/rules +++ b/debian/lenny/kdelibs/debian/rules @@ -38,6 +38,9 @@ DEB_DH_STRIP_ARGS := --dbg-package=kdelibs-trinity-dbg DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2a-trinity := -V'kdelibs4c2a-trinity (>= 4:3.5.8-1)' +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/kdelibs-data-trinity:: install -p -D -m644 kded/applications.menu debian/kdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu install -p -D -m644 debian/trinitylibs.conf debian/kdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf diff --git a/debian/lenny/kdemultimedia/debian/rules b/debian/lenny/kdemultimedia/debian/rules index a7ec5a104..3239a3df0 100755 --- a/debian/lenny/kdemultimedia/debian/rules +++ b/debian/lenny/kdemultimedia/debian/rules @@ -23,6 +23,9 @@ DOC_HTML_PRUNE := kcontrol-trinity DEB_DH_STRIP_ARGS := --dbg-package=kdemultimedia-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := artsbuilder-trinity kdemultimedia-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/debian/lenny/kdenetwork/debian/rules b/debian/lenny/kdenetwork/debian/rules index 9bf97e857..d677a6762 100755 --- a/debian/lenny/kdenetwork/debian/rules +++ b/debian/lenny/kdenetwork/debian/rules @@ -44,6 +44,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=kdenetwork-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 DEB_DH_MAKESHLIBS_ARGS_librss1-trinity := -V'librss1-trinity (>= 4:3.5.8-1)' diff --git a/debian/lenny/kdepim/debian/rules b/debian/lenny/kdepim/debian/rules index 9971b958d..108febe1b 100755 --- a/debian/lenny/kdepim/debian/rules +++ b/debian/lenny/kdepim/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/debian/lenny/kdesdk/debian/rules b/debian/lenny/kdesdk/debian/rules index df7646756..cb41a8b51 100755 --- a/debian/lenny/kdesdk/debian/rules +++ b/debian/lenny/kdesdk/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=kdesdk-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/debian/lenny/kdetoys/debian/rules b/debian/lenny/kdetoys/debian/rules index b6fa5a838..1e3cc9f16 100755 --- a/debian/lenny/kdetoys/debian/rules +++ b/debian/lenny/kdetoys/debian/rules @@ -27,5 +27,8 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=kdetoys-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/debian/lenny/kdeutils/debian/rules b/debian/lenny/kdeutils/debian/rules index 61d723327..59d9b2492 100755 --- a/debian/lenny/kdeutils/debian/rules +++ b/debian/lenny/kdeutils/debian/rules @@ -40,6 +40,9 @@ DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselec DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=kdeutils-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 DEB_DH_MAKESHLIBS_ARGS_khexedit-trinity := -V'khexedit-trinity (>= 4:3.5.8-1)' diff --git a/debian/lenny/kdevelop/debian/rules b/debian/lenny/kdevelop/debian/rules index 3578cb47d..99667d1b3 100755 --- a/debian/lenny/kdevelop/debian/rules +++ b/debian/lenny/kdevelop/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 := kdevelop-trinity DEB_KDE_ENABLE_FINAL := diff --git a/debian/lenny/kdewebdev/debian/rules b/debian/lenny/kdewebdev/debian/rules index cce47390d..9aede760c 100755 --- a/debian/lenny/kdewebdev/debian/rules +++ b/debian/lenny/kdewebdev/debian/rules @@ -28,6 +28,9 @@ endif DEB_DH_STRIP_ARGS := --dbg-package=kdewebdev-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kommander-trinity DEB_DH_MAKESHLIBS_ARGS_kommander-trinity := -V'kommander-trinity (>= 4:3.5.8-1)' diff --git a/debian/lenny/libraries/kipi-plugins/debian/rules b/debian/lenny/libraries/kipi-plugins/debian/rules index f88a2f547..5127ca7c5 100755 --- a/debian/lenny/libraries/kipi-plugins/debian/rules +++ b/debian/lenny/libraries/kipi-plugins/debian/rules @@ -20,6 +20,9 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean :: rm -f po/*/*.gmo diff --git a/debian/lenny/libraries/libkdcraw/debian/rules b/debian/lenny/libraries/libkdcraw/debian/rules index 0606b98a9..816b16d6d 100755 --- a/debian/lenny/libraries/libkdcraw/debian/rules +++ b/debian/lenny/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/debian/lenny/libraries/libkexiv2/debian/rules b/debian/lenny/libraries/libkexiv2/debian/rules index dc80327f0..60174829a 100755 --- a/debian/lenny/libraries/libkexiv2/debian/rules +++ b/debian/lenny/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/debian/lenny/libraries/libkipi/debian/rules b/debian/lenny/libraries/libkipi/debian/rules index 903f7c7b1..bd52415a4 100755 --- a/debian/lenny/libraries/libkipi/debian/rules +++ b/debian/lenny/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/debian/lenny/libraries/libksquirrel/debian/rules b/debian/lenny/libraries/libksquirrel/debian/rules index 02615195b..5fdceafac 100755 --- a/debian/lenny/libraries/libksquirrel/debian/rules +++ b/debian/lenny/libraries/libksquirrel/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -85,7 +88,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/libraries/mlt++/debian/rules b/debian/lenny/libraries/mlt++/debian/rules index cf8cb1984..cd87c6cce 100755 --- a/debian/lenny/libraries/mlt++/debian/rules +++ b/debian/lenny/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/debian/lenny/libraries/mlt/debian/rules b/debian/lenny/libraries/mlt/debian/rules index 771793fff..2613c3225 100755 --- a/debian/lenny/libraries/mlt/debian/rules +++ b/debian/lenny/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/debian/lenny/libraries/pykdeextensions/debian/rules b/debian/lenny/libraries/pykdeextensions/debian/rules index 49c03b6ab..d1dfbba07 100755 --- a/debian/lenny/libraries/pykdeextensions/debian/rules +++ b/debian/lenny/libraries/pykdeextensions/debian/rules @@ -18,6 +18,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/pykdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" diff --git a/debian/lenny/libraries/python-trinity/debian/rules b/debian/lenny/libraries/python-trinity/debian/rules index 85c43a0fe..ea15a4d21 100755 --- a/debian/lenny/libraries/python-trinity/debian/rules +++ b/debian/lenny/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/debian/squeeze/applications/abakus/debian/rules b/debian/squeeze/applications/abakus/debian/rules index f28e270d4..36bb62fb5 100755 --- a/debian/squeeze/applications/abakus/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/adept/debian/rules b/debian/squeeze/applications/adept/debian/rules index a9adceb07..aa5a629a7 100755 --- a/debian/squeeze/applications/adept/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/amarok/debian/rules b/debian/squeeze/applications/amarok/debian/rules index 50593e07f..c2d72d696 100755 --- a/debian/squeeze/applications/amarok/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/basket/debian/rules b/debian/squeeze/applications/basket/debian/rules index 044546c6e..2cfda511e 100755 --- a/debian/squeeze/applications/basket/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/bibletime/debian/rules b/debian/squeeze/applications/bibletime/debian/rules index 1ba4a2ef4..fdd90c2b3 100755 --- a/debian/squeeze/applications/bibletime/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules index 72edde825..943412831 100755 --- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/desktop-effects-kde/debian/rules b/debian/squeeze/applications/desktop-effects-kde/debian/rules index 89b037f13..8eee42e6a 100755 --- a/debian/squeeze/applications/desktop-effects-kde/debian/rules +++ b/debian/squeeze/applications/desktop-effects-kde/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-kde-trinity:: dh_pycentral -pdesktop-effects-kde-trinity diff --git a/debian/squeeze/applications/digikam/debian/rules b/debian/squeeze/applications/digikam/debian/rules index 858876e95..046053e54 100755 --- a/debian/squeeze/applications/digikam/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/dolphin/debian/rules b/debian/squeeze/applications/dolphin/debian/rules index 399d04748..33e949961 100755 --- a/debian/squeeze/applications/dolphin/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/filelight-l10n/debian/rules b/debian/squeeze/applications/filelight-l10n/debian/rules index 7eea2f6e2..bc018d11c 100755 --- a/debian/squeeze/applications/filelight-l10n/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/filelight/debian/rules b/debian/squeeze/applications/filelight/debian/rules index 8683a3480..427786cac 100755 --- a/debian/squeeze/applications/filelight/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/fusion-icon/debian/rules b/debian/squeeze/applications/fusion-icon/debian/rules index 8a3fe3829..572f6e270 100755 --- a/debian/squeeze/applications/fusion-icon/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/gtk-qt-engine/debian/rules b/debian/squeeze/applications/gtk-qt-engine/debian/rules index f931fd34e..bf8de0fc0 100755 --- a/debian/squeeze/applications/gtk-qt-engine/debian/rules +++ b/debian/squeeze/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/kde" -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/debian/squeeze/applications/gwenview-i18n/debian/rules b/debian/squeeze/applications/gwenview-i18n/debian/rules index 05bfef3db..02b4fd146 100755 --- a/debian/squeeze/applications/gwenview-i18n/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/gwenview/debian/rules b/debian/squeeze/applications/gwenview/debian/rules index e4a66e4c7..3332a5d74 100755 --- a/debian/squeeze/applications/gwenview/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/k3b-i18n/debian/rules b/debian/squeeze/applications/k3b-i18n/debian/rules index fca0d3a25..c1a9a4afc 100755 --- a/debian/squeeze/applications/k3b-i18n/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/k3b/debian/rules b/debian/squeeze/applications/k3b/debian/rules index dad8420be..db76176bd 100755 --- a/debian/squeeze/applications/k3b/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/k9copy/debian/rules b/debian/squeeze/applications/k9copy/debian/rules index 5d6a0daa3..820a75a56 100755 --- a/debian/squeeze/applications/k9copy/debian/rules +++ b/debian/squeeze/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/kde" --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/debian/squeeze/applications/kaffeine-mozilla/debian/rules b/debian/squeeze/applications/kaffeine-mozilla/debian/rules index 0fe0eb38e..08c10c248 100755 --- a/debian/squeeze/applications/kaffeine-mozilla/debian/rules +++ b/debian/squeeze/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/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity @@ -139,7 +142,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/debian/squeeze/applications/kaffeine/debian/rules b/debian/squeeze/applications/kaffeine/debian/rules index fc56182e6..cc3f7d5da 100755 --- a/debian/squeeze/applications/kaffeine/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/katapult/debian/rules b/debian/squeeze/applications/katapult/debian/rules index b894e9fa3..642ce1550 100755 --- a/debian/squeeze/applications/katapult/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/kbarcode/debian/rules b/debian/squeeze/applications/kbarcode/debian/rules index c91c06122..5e985280a 100755 --- a/debian/squeeze/applications/kbarcode/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/kbfx/debian/rules b/debian/squeeze/applications/kbfx/debian/rules index b455b21fa..ac0d219bc 100755 --- a/debian/squeeze/applications/kbfx/debian/rules +++ b/debian/squeeze/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/kde" -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/debian/squeeze/applications/kbookreader/debian/rules b/debian/squeeze/applications/kbookreader/debian/rules index 568bf6140..20b42f646 100755 --- a/debian/squeeze/applications/kbookreader/debian/rules +++ b/debian/squeeze/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/kde" --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/debian/squeeze/applications/kchmviewer/debian/rules b/debian/squeeze/applications/kchmviewer/debian/rules index 50e14fe4d..0fdbf1173 100755 --- a/debian/squeeze/applications/kchmviewer/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/kcpuload/debian/rules b/debian/squeeze/applications/kcpuload/debian/rules index 8b922187d..bc0e82531 100755 --- a/debian/squeeze/applications/kcpuload/debian/rules +++ b/debian/squeeze/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 @@ -164,7 +167,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/debian/squeeze/applications/kdbusnotification/debian/rules b/debian/squeeze/applications/kdbusnotification/debian/rules index 18ca7117e..2750f623d 100755 --- a/debian/squeeze/applications/kdbusnotification/debian/rules +++ b/debian/squeeze/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 @@ -153,7 +156,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/debian/squeeze/applications/kde-guidance/debian/rules b/debian/squeeze/applications/kde-guidance/debian/rules index 885063de4..2607516db 100755 --- a/debian/squeeze/applications/kde-guidance/debian/rules +++ b/debian/squeeze/applications/kde-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/kde LDFLAGS_APPEND := -L/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/kde-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/debian/squeeze/applications/kde-style-lipstik/debian/rules b/debian/squeeze/applications/kde-style-lipstik/debian/rules index e535bbd80..620265e8e 100755 --- a/debian/squeeze/applications/kde-style-lipstik/debian/rules +++ b/debian/squeeze/applications/kde-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/debian/squeeze/applications/kde-style-qtcurve/debian/rules b/debian/squeeze/applications/kde-style-qtcurve/debian/rules index 7645ee92d..ad341b5e0 100755 --- a/debian/squeeze/applications/kde-style-qtcurve/debian/rules +++ b/debian/squeeze/applications/kde-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/debian/squeeze/applications/kde-systemsettings/debian/rules b/debian/squeeze/applications/kde-systemsettings/debian/rules index 1652222f7..6ba108e8a 100755 --- a/debian/squeeze/applications/kde-systemsettings/debian/rules +++ b/debian/squeeze/applications/kde-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/debian/squeeze/applications/kdesudo/debian/rules b/debian/squeeze/applications/kdesudo/debian/rules index a75c93de0..df41bc83d 100755 --- a/debian/squeeze/applications/kdesudo/debian/rules +++ b/debian/squeeze/applications/kdesudo/debian/rules @@ -15,6 +15,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_INSTALL_MANPAGES_kdesudo-trinity = kdesudo-trinity.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/kdesudo-trinity:: docbook2x-man debian/kdesudo-trinity.1.docbook mv kdesudo.1 kdesudo-trinity.1 diff --git a/debian/squeeze/applications/kdesvn/debian/rules b/debian/squeeze/applications/kdesvn/debian/rules index 03f12c63c..5dc283b7c 100755 --- a/debian/squeeze/applications/kdesvn/debian/rules +++ b/debian/squeeze/applications/kdesvn/debian/rules @@ -17,6 +17,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/kde" -DCMAKE_CXX_FLAGS="-I/opt/trinity/include/kde" -DCMAKE_LDFLAGS="-L/opt/trinity/lib" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_COMPRESS_EXCLUDE := .dcl .docbook -license .tag .sty .el DEB_DH_MAKESHLIBS_ARGS_libsvnqt4 := -V diff --git a/debian/squeeze/applications/kdiff3/debian/rules b/debian/squeeze/applications/kdiff3/debian/rules index daf6b2bea..9181b1148 100755 --- a/debian/squeeze/applications/kdiff3/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/kdirstat/debian/rules b/debian/squeeze/applications/kdirstat/debian/rules index 694d6cf44..e05262ec0 100755 --- a/debian/squeeze/applications/kdirstat/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/kdmtheme/debian/rules b/debian/squeeze/applications/kdmtheme/debian/rules index 4155e0242..7de1e2855 100755 --- a/debian/squeeze/applications/kdmtheme/debian/rules +++ b/debian/squeeze/applications/kdmtheme/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/kde +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/debian/squeeze/applications/kdpkg/debian/rules b/debian/squeeze/applications/kdpkg/debian/rules index 908941e34..d5ac50b42 100755 --- a/debian/squeeze/applications/kdpkg/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/keep/debian/rules b/debian/squeeze/applications/keep/debian/rules index 9a130bbdf..227129eb0 100755 --- a/debian/squeeze/applications/keep/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/kerry/debian/rules b/debian/squeeze/applications/kerry/debian/rules index 65b0fc115..f254c8044 100755 --- a/debian/squeeze/applications/kerry/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/kgtk-qt3/debian/rules b/debian/squeeze/applications/kgtk-qt3/debian/rules index 7045dbba0..7511e74b3 100755 --- a/debian/squeeze/applications/kgtk-qt3/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/kile/debian/rules b/debian/squeeze/applications/kile/debian/rules index 0ab30dfbe..3a36a29ef 100755 --- a/debian/squeeze/applications/kile/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/kima/debian/rules b/debian/squeeze/applications/kima/debian/rules index a353777b4..27a3fe333 100755 --- a/debian/squeeze/applications/kima/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/kio-apt/debian/rules b/debian/squeeze/applications/kio-apt/debian/rules index 6e9212a44..6a373b5a4 100755 --- a/debian/squeeze/applications/kio-apt/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/kio-locate/debian/rules b/debian/squeeze/applications/kio-locate/debian/rules index 102844b2a..c75119f72 100755 --- a/debian/squeeze/applications/kio-locate/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/kio-umountwrapper/debian/rules b/debian/squeeze/applications/kio-umountwrapper/debian/rules index 755d35fe1..24f8e63c2 100755 --- a/debian/squeeze/applications/kio-umountwrapper/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/kiosktool/debian/rules b/debian/squeeze/applications/kiosktool/debian/rules index 43d66b0b0..bdce983e0 100755 --- a/debian/squeeze/applications/kiosktool/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/kmplayer/debian/rules b/debian/squeeze/applications/kmplayer/debian/rules index 5d81da9a7..27ad5989b 100755 --- a/debian/squeeze/applications/kmplayer/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/kmyfirewall/debian/rules b/debian/squeeze/applications/kmyfirewall/debian/rules index a600a1db1..d03f14f42 100755 --- a/debian/squeeze/applications/kmyfirewall/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/kmymoney/debian/rules b/debian/squeeze/applications/kmymoney/debian/rules index 25720b821..9eb4ec3ad 100755 --- a/debian/squeeze/applications/kmymoney/debian/rules +++ b/debian/squeeze/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/kde --disable-sqlite3 +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/debian/squeeze/applications/knemo/debian/rules b/debian/squeeze/applications/knemo/debian/rules index b397e1895..fff2afa7d 100755 --- a/debian/squeeze/applications/knemo/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/knetload/debian/rules b/debian/squeeze/applications/knetload/debian/rules index c5b4fba04..0a65d48d8 100755 --- a/debian/squeeze/applications/knetload/debian/rules +++ b/debian/squeeze/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 @@ -158,7 +161,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/debian/squeeze/applications/knetstats/debian/rules b/debian/squeeze/applications/knetstats/debian/rules index 4ea7a3538..1505e8e8e 100755 --- a/debian/squeeze/applications/knetstats/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/knetworkmanager8/debian/rules b/debian/squeeze/applications/knetworkmanager8/debian/rules index 4ba8fd6ba..ee316c12f 100755 --- a/debian/squeeze/applications/knetworkmanager8/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/knights/debian/rules b/debian/squeeze/applications/knights/debian/rules index 4527456f6..bde510e8b 100755 --- a/debian/squeeze/applications/knights/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/knowit/debian/rules b/debian/squeeze/applications/knowit/debian/rules index b04e5a6c4..77f1d05a4 100755 --- a/debian/squeeze/applications/knowit/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/knutclient/debian/rules b/debian/squeeze/applications/knutclient/debian/rules index e96a49579..a009dbf98 100755 --- a/debian/squeeze/applications/knutclient/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/koffice-i18n/debian/rules b/debian/squeeze/applications/koffice-i18n/debian/rules index 9bb59484f..478c97b9d 100755 --- a/debian/squeeze/applications/koffice-i18n/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/koffice/debian/rules b/debian/squeeze/applications/koffice/debian/rules index c24e29fbc..a5825d047 100755 --- a/debian/squeeze/applications/koffice/debian/rules +++ b/debian/squeeze/applications/koffice/debian/rules @@ -16,6 +16,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/debian/squeeze/applications/konversation/debian/rules b/debian/squeeze/applications/konversation/debian/rules index bac275a75..61643f3ff 100755 --- a/debian/squeeze/applications/konversation/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/kopete-otr/debian/rules b/debian/squeeze/applications/kopete-otr/debian/rules index 8b49a1a4b..3c342bcfc 100755 --- a/debian/squeeze/applications/kopete-otr/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/kpicosim/debian/rules b/debian/squeeze/applications/kpicosim/debian/rules index b3c8159f5..98b6ba69e 100755 --- a/debian/squeeze/applications/kpicosim/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/kpilot/debian/rules b/debian/squeeze/applications/kpilot/debian/rules index 8b49a1a4b..3c342bcfc 100755 --- a/debian/squeeze/applications/kpilot/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/kpowersave/debian/rules b/debian/squeeze/applications/kpowersave/debian/rules index 913dd64f1..bbe86c8d9 100755 --- a/debian/squeeze/applications/kpowersave/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/kradio/debian/rules b/debian/squeeze/applications/kradio/debian/rules index 83dd79dc2..f3c1f73d7 100755 --- a/debian/squeeze/applications/kradio/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/krename/debian/rules b/debian/squeeze/applications/krename/debian/rules index 582e70ec7..0df91fd2c 100755 --- a/debian/squeeze/applications/krename/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/krusader/debian/rules b/debian/squeeze/applications/krusader/debian/rules index f643f8e97..0b16abed9 100755 --- a/debian/squeeze/applications/krusader/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/ksplash-engine-moodin/debian/rules b/debian/squeeze/applications/ksplash-engine-moodin/debian/rules index 5b4a03a4d..2e7053e8b 100755 --- a/debian/squeeze/applications/ksplash-engine-moodin/debian/rules +++ b/debian/squeeze/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) @@ -109,7 +112,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/debian/squeeze/applications/ksquirrel/debian/rules b/debian/squeeze/applications/ksquirrel/debian/rules index 340dc328c..60b270a47 100755 --- a/debian/squeeze/applications/ksquirrel/debian/rules +++ b/debian/squeeze/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) @@ -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/debian/squeeze/applications/kstreamripper/debian/rules b/debian/squeeze/applications/kstreamripper/debian/rules index 725896903..cb9dc49ae 100755 --- a/debian/squeeze/applications/kstreamripper/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/ksystemlog/debian/rules b/debian/squeeze/applications/ksystemlog/debian/rules index 573d7fed9..6e41ea3f6 100755 --- a/debian/squeeze/applications/ksystemlog/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/ktechlab/debian/rules b/debian/squeeze/applications/ktechlab/debian/rules index b8023c222..6ee5ee935 100755 --- a/debian/squeeze/applications/ktechlab/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/ktorrent/debian/rules b/debian/squeeze/applications/ktorrent/debian/rules index 6ca8e03b2..191e61381 100755 --- a/debian/squeeze/applications/ktorrent/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/kuickshow/debian/rules b/debian/squeeze/applications/kuickshow/debian/rules index 7c18aa099..c8061ea29 100755 --- a/debian/squeeze/applications/kuickshow/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/kvirc/debian/rules b/debian/squeeze/applications/kvirc/debian/rules index 576499353..96984bd79 100755 --- a/debian/squeeze/applications/kvirc/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/kvkbd/debian/rules b/debian/squeeze/applications/kvkbd/debian/rules index 61e74cb62..6abecd47a 100755 --- a/debian/squeeze/applications/kvkbd/debian/rules +++ b/debian/squeeze/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/kde +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/debian/squeeze/applications/kwin-style-crystal/debian/rules b/debian/squeeze/applications/kwin-style-crystal/debian/rules index 7b23d839b..6e735f5dc 100755 --- a/debian/squeeze/applications/kwin-style-crystal/debian/rules +++ b/debian/squeeze/applications/kwin-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/debian/squeeze/applications/piklab/debian/rules b/debian/squeeze/applications/piklab/debian/rules index 70efffef4..5edcb99ef 100755 --- a/debian/squeeze/applications/piklab/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/potracegui/debian/rules b/debian/squeeze/applications/potracegui/debian/rules index 8f7f4038a..fdda3113f 100755 --- a/debian/squeeze/applications/potracegui/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/rosegarden/debian/rules b/debian/squeeze/applications/rosegarden/debian/rules index 7b4c8c0a3..cce54e96b 100755 --- a/debian/squeeze/applications/rosegarden/debian/rules +++ b/debian/squeeze/applications/rosegarden/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) + DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture) ARCH=$(DEB_BUILD_ARCH) @@ -97,7 +100,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/debian/squeeze/applications/smartcardauth/debian/rules b/debian/squeeze/applications/smartcardauth/debian/rules index a9e7e66cb..fe74e584a 100755 --- a/debian/squeeze/applications/smartcardauth/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/smb4k/debian/rules b/debian/squeeze/applications/smb4k/debian/rules index a7f5808ef..c6b04fa37 100755 --- a/debian/squeeze/applications/smb4k/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/soundkonverter/debian/rules b/debian/squeeze/applications/soundkonverter/debian/rules index 10087bc2f..ce5932a76 100755 --- a/debian/squeeze/applications/soundkonverter/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/tellico/debian/rules b/debian/squeeze/applications/tellico/debian/rules index d1248ef1d..4dfb7936d 100755 --- a/debian/squeeze/applications/tellico/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/wlassistant/debian/rules b/debian/squeeze/applications/wlassistant/debian/rules index 83cfc74c5..f9260b34c 100755 --- a/debian/squeeze/applications/wlassistant/debian/rules +++ b/debian/squeeze/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/debian/squeeze/applications/yakuake/debian/rules b/debian/squeeze/applications/yakuake/debian/rules index 176f45bc3..f86dc62d5 100755 --- a/debian/squeeze/applications/yakuake/debian/rules +++ b/debian/squeeze/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/debian/squeeze/dependencies/arts/debian/rules b/debian/squeeze/dependencies/arts/debian/rules index 63cfa2119..e192c8e45 100755 --- a/debian/squeeze/dependencies/arts/debian/rules +++ b/debian/squeeze/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/debian/squeeze/dependencies/avahi-tqt/debian/rules b/debian/squeeze/dependencies/avahi-tqt/debian/rules index d4694a4bf..54a22a44f 100755 --- a/debian/squeeze/dependencies/avahi-tqt/debian/rules +++ b/debian/squeeze/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/debian/squeeze/dependencies/dbus-1-tqt/debian/rules b/debian/squeeze/dependencies/dbus-1-tqt/debian/rules index c6e5c11f5..6a0f5bbed 100755 --- a/debian/squeeze/dependencies/dbus-1-tqt/debian/rules +++ b/debian/squeeze/dependencies/dbus-1-tqt/debian/rules @@ -4,3 +4,6 @@ include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/rules b/debian/squeeze/dependencies/dbus-tqt/debian/rules index d0c9ab9a7..3edd7c59c 100755 --- a/debian/squeeze/dependencies/dbus-tqt/debian/rules +++ b/debian/squeeze/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/debian/squeeze/dependencies/qt3/debian/rules b/debian/squeeze/dependencies/qt3/debian/rules index be4c49e74..fe7b55dc0 100755 --- a/debian/squeeze/dependencies/qt3/debian/rules +++ b/debian/squeeze/dependencies/qt3/debian/rules @@ -11,6 +11,9 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -326,7 +329,7 @@ binary-indep: build install dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) binary-arch: build install @@ -468,7 +471,7 @@ binary-arch: build install dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) - dh_builddeb -a $(IBASE) + dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build binary-indep binary-arch binary install clean patch unpatch diff --git a/debian/squeeze/dependencies/tqtinterface/debian/rules b/debian/squeeze/dependencies/tqtinterface/debian/rules index 928631538..ed3f07a6d 100755 --- a/debian/squeeze/dependencies/tqtinterface/debian/rules +++ b/debian/squeeze/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/debian/squeeze/kde-i18n/debian/rules b/debian/squeeze/kde-i18n/debian/rules index 56af437b8..f821e5339 100755 --- a/debian/squeeze/kde-i18n/debian/rules +++ b/debian/squeeze/kde-i18n/debian/rules @@ -32,6 +32,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 @@ -108,7 +111,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/debian/squeeze/kdeaccessibility/debian/rules b/debian/squeeze/kdeaccessibility/debian/rules index 9b8ba011d..3cdcff750 100755 --- a/debian/squeeze/kdeaccessibility/debian/rules +++ b/debian/squeeze/kdeaccessibility/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=kdeaccessibility-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 DEB_DH_MAKESHLIBS_ARGS_kttsd-trinity := -V'kttsd-trinity (>= 4:3.5.8-1)' diff --git a/debian/squeeze/kdeaddons/debian/rules b/debian/squeeze/kdeaddons/debian/rules index 369d6c5ae..27866a5e6 100755 --- a/debian/squeeze/kdeaddons/debian/rules +++ b/debian/squeeze/kdeaddons/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --without-xmms --prefix=/opt/trinity --with-extra-l DEB_DH_STRIP_ARGS := --dbg-package=kdeaddons-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/debian/squeeze/kdeadmin/debian/rules b/debian/squeeze/kdeadmin/debian/rules index e2b266555..52fa58219 100755 --- a/debian/squeeze/kdeadmin/debian/rules +++ b/debian/squeeze/kdeadmin/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=kdeadmin-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/debian/squeeze/kdeartwork/debian/rules b/debian/squeeze/kdeartwork/debian/rules index d2565f4f6..150859d96 100755 --- a/debian/squeeze/kdeartwork/debian/rules +++ b/debian/squeeze/kdeartwork/debian/rules @@ -28,6 +28,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=kdeartwork-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/debian/squeeze/kdebase/debian/rules b/debian/squeeze/kdebase/debian/rules index 7e16b99b9..7ae4a39ab 100755 --- a/debian/squeeze/kdebase/debian/rules +++ b/debian/squeeze/kdebase/debian/rules @@ -34,6 +34,9 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=kdebase-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 kdesu knetattach kioslave kxkb kdebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity kdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ diff --git a/debian/squeeze/kdebindings/debian/rules b/debian/squeeze/kdebindings/debian/rules index fe191a9c9..37c49ed1d 100755 --- a/debian/squeeze/kdebindings/debian/rules +++ b/debian/squeeze/kdebindings/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/debian/squeeze/kdeedu/debian/rules b/debian/squeeze/kdeedu/debian/rules index e32699309..acf638002 100755 --- a/debian/squeeze/kdeedu/debian/rules +++ b/debian/squeeze/kdeedu/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/kde" --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/debian/squeeze/kdegames/debian/rules b/debian/squeeze/kdegames/debian/rules index 5720e171d..96f768ec9 100755 --- a/debian/squeeze/kdegames/debian/rules +++ b/debian/squeeze/kdegames/debian/rules @@ -26,6 +26,9 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if DEB_INSTALL_CHANGELOGS_kdegames := $(DEB_SRCDIR)/ChangeLog +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_DH_MAKESHLIBS_ARGS_libkdegames1-trinity := -V'libkdegames1-trinity (>= 4:3.5.8)' DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V diff --git a/debian/squeeze/kdegraphics/debian/rules b/debian/squeeze/kdegraphics/debian/rules index 68596069e..ab2877e0c 100755 --- a/debian/squeeze/kdegraphics/debian/rules +++ b/debian/squeeze/kdegraphics/debian/rules @@ -24,6 +24,9 @@ DEB_BUILD_PARALLEL = true DEB_DH_STRIP_ARGS := --dbg-package=kdegraphics-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/debian/squeeze/kdelibs/debian/rules b/debian/squeeze/kdelibs/debian/rules index deccafc8c..9f8de607a 100755 --- a/debian/squeeze/kdelibs/debian/rules +++ b/debian/squeeze/kdelibs/debian/rules @@ -38,6 +38,9 @@ DEB_DH_STRIP_ARGS := --dbg-package=kdelibs-trinity-dbg DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2a-trinity := -V'kdelibs4c2a-trinity (>= 4:3.5.8-1)' +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/kdelibs-data-trinity:: install -p -D -m644 kded/applications.menu debian/kdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu install -p -D -m644 debian/trinitylibs.conf debian/kdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf diff --git a/debian/squeeze/kdemultimedia/debian/rules b/debian/squeeze/kdemultimedia/debian/rules index 8ddecddf8..178e42e96 100755 --- a/debian/squeeze/kdemultimedia/debian/rules +++ b/debian/squeeze/kdemultimedia/debian/rules @@ -23,6 +23,9 @@ DOC_HTML_PRUNE := kcontrol-trinity DEB_DH_STRIP_ARGS := --dbg-package=kdemultimedia-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := artsbuilder-trinity kdemultimedia-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/debian/squeeze/kdenetwork/debian/rules b/debian/squeeze/kdenetwork/debian/rules index 4bbcc5e40..169b64e66 100755 --- a/debian/squeeze/kdenetwork/debian/rules +++ b/debian/squeeze/kdenetwork/debian/rules @@ -44,6 +44,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=kdenetwork-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 DEB_DH_MAKESHLIBS_ARGS_librss1-trinity := -V'librss1-trinity (>= 4:3.5.8-1)' diff --git a/debian/squeeze/kdepim/debian/rules b/debian/squeeze/kdepim/debian/rules index d03604b8b..ea9be7e03 100755 --- a/debian/squeeze/kdepim/debian/rules +++ b/debian/squeeze/kdepim/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/debian/squeeze/kdesdk/debian/rules b/debian/squeeze/kdesdk/debian/rules index e8fcf341b..f85a4bf86 100755 --- a/debian/squeeze/kdesdk/debian/rules +++ b/debian/squeeze/kdesdk/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=kdesdk-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/debian/squeeze/kdetoys/debian/rules b/debian/squeeze/kdetoys/debian/rules index 39bfeb832..dc7b40efd 100755 --- a/debian/squeeze/kdetoys/debian/rules +++ b/debian/squeeze/kdetoys/debian/rules @@ -27,5 +27,8 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=kdetoys-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/debian/squeeze/kdeutils/debian/rules b/debian/squeeze/kdeutils/debian/rules index 73ca481ed..9cae10e9b 100755 --- a/debian/squeeze/kdeutils/debian/rules +++ b/debian/squeeze/kdeutils/debian/rules @@ -40,6 +40,9 @@ DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselec DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=kdeutils-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 DEB_DH_MAKESHLIBS_ARGS_khexedit-trinity := -V'khexedit-trinity (>= 4:3.5.8-1)' diff --git a/debian/squeeze/kdevelop/debian/rules b/debian/squeeze/kdevelop/debian/rules index 0f3894b4f..6c70c4b46 100755 --- a/debian/squeeze/kdevelop/debian/rules +++ b/debian/squeeze/kdevelop/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 := kdevelop-trinity DEB_KDE_ENABLE_FINAL := diff --git a/debian/squeeze/kdewebdev/debian/rules b/debian/squeeze/kdewebdev/debian/rules index 119f28b3c..7c1c6306f 100755 --- a/debian/squeeze/kdewebdev/debian/rules +++ b/debian/squeeze/kdewebdev/debian/rules @@ -28,6 +28,9 @@ endif DEB_DH_STRIP_ARGS := --dbg-package=kdewebdev-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kommander-trinity DEB_DH_MAKESHLIBS_ARGS_kommander-trinity := -V'kommander-trinity (>= 4:3.5.8-1)' diff --git a/debian/squeeze/libraries/kipi-plugins/debian/rules b/debian/squeeze/libraries/kipi-plugins/debian/rules index 1caedd446..31dcdd4e7 100755 --- a/debian/squeeze/libraries/kipi-plugins/debian/rules +++ b/debian/squeeze/libraries/kipi-plugins/debian/rules @@ -20,6 +20,9 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean :: rm -f po/*/*.gmo diff --git a/debian/squeeze/libraries/libkdcraw/debian/rules b/debian/squeeze/libraries/libkdcraw/debian/rules index f4b4cef98..bbc6f0d96 100755 --- a/debian/squeeze/libraries/libkdcraw/debian/rules +++ b/debian/squeeze/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/debian/squeeze/libraries/libkexiv2/debian/rules b/debian/squeeze/libraries/libkexiv2/debian/rules index dc80327f0..60174829a 100755 --- a/debian/squeeze/libraries/libkexiv2/debian/rules +++ b/debian/squeeze/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/debian/squeeze/libraries/libkipi/debian/rules b/debian/squeeze/libraries/libkipi/debian/rules index ac4091f53..3dd1a10a6 100755 --- a/debian/squeeze/libraries/libkipi/debian/rules +++ b/debian/squeeze/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/debian/squeeze/libraries/libksquirrel/debian/rules b/debian/squeeze/libraries/libksquirrel/debian/rules index 02615195b..5fdceafac 100755 --- a/debian/squeeze/libraries/libksquirrel/debian/rules +++ b/debian/squeeze/libraries/libksquirrel/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -85,7 +88,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/libraries/mlt++/debian/rules b/debian/squeeze/libraries/mlt++/debian/rules index cf8cb1984..cd87c6cce 100755 --- a/debian/squeeze/libraries/mlt++/debian/rules +++ b/debian/squeeze/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/debian/squeeze/libraries/mlt/debian/rules b/debian/squeeze/libraries/mlt/debian/rules index b4b16188a..d45bb4be3 100755 --- a/debian/squeeze/libraries/mlt/debian/rules +++ b/debian/squeeze/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/debian/squeeze/libraries/pykdeextensions/debian/rules b/debian/squeeze/libraries/pykdeextensions/debian/rules index fb93a8396..046d525d3 100755 --- a/debian/squeeze/libraries/pykdeextensions/debian/rules +++ b/debian/squeeze/libraries/pykdeextensions/debian/rules @@ -18,6 +18,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/pykdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" diff --git a/debian/squeeze/libraries/python-trinity/debian/rules b/debian/squeeze/libraries/python-trinity/debian/rules index 98178d114..6051507bb 100755 --- a/debian/squeeze/libraries/python-trinity/debian/rules +++ b/debian/squeeze/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/applications/abakus/debian/rules b/ubuntu/maverick/applications/abakus/debian/rules index f28e270d4..36bb62fb5 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 a9adceb07..aa5a629a7 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 50593e07f..c2d72d696 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 044546c6e..2cfda511e 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 1ba4a2ef4..fdd90c2b3 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 72edde825..943412831 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/kde +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-kde/debian/rules b/ubuntu/maverick/applications/desktop-effects-kde/debian/rules index 89b037f13..8eee42e6a 100755 --- a/ubuntu/maverick/applications/desktop-effects-kde/debian/rules +++ b/ubuntu/maverick/applications/desktop-effects-kde/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-kde-trinity:: dh_pycentral -pdesktop-effects-kde-trinity diff --git a/ubuntu/maverick/applications/digikam/debian/rules b/ubuntu/maverick/applications/digikam/debian/rules index 858876e95..046053e54 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 399d04748..33e949961 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 7eea2f6e2..bc018d11c 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/kde +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 8683a3480..427786cac 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 8a3fe3829..572f6e270 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 f931fd34e..bf8de0fc0 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/kde" -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/gwenview-i18n/debian/rules b/ubuntu/maverick/applications/gwenview-i18n/debian/rules index 05bfef3db..02b4fd146 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 e4a66e4c7..3332a5d74 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 fca0d3a25..c1a9a4afc 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 dad8420be..db76176bd 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 5d6a0daa3..820a75a56 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/kde" --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 0fe0eb38e..08c10c248 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/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity @@ -139,7 +142,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 fc56182e6..cc3f7d5da 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 b894e9fa3..642ce1550 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 c91c06122..5e985280a 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 b455b21fa..ac0d219bc 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/kde" -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 568bf6140..20b42f646 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/kde" --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 50e14fe4d..0fdbf1173 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/kcpuload/debian/rules b/ubuntu/maverick/applications/kcpuload/debian/rules index 8b922187d..bc0e82531 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 @@ -164,7 +167,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 18ca7117e..2750f623d 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 @@ -153,7 +156,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/kde-guidance/debian/rules b/ubuntu/maverick/applications/kde-guidance/debian/rules index 885063de4..2607516db 100755 --- a/ubuntu/maverick/applications/kde-guidance/debian/rules +++ b/ubuntu/maverick/applications/kde-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/kde LDFLAGS_APPEND := -L/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/kde-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/kde-style-lipstik/debian/rules b/ubuntu/maverick/applications/kde-style-lipstik/debian/rules index e535bbd80..620265e8e 100755 --- a/ubuntu/maverick/applications/kde-style-lipstik/debian/rules +++ b/ubuntu/maverick/applications/kde-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/kde-style-qtcurve/debian/rules b/ubuntu/maverick/applications/kde-style-qtcurve/debian/rules index 7645ee92d..ad341b5e0 100755 --- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/rules +++ b/ubuntu/maverick/applications/kde-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/kde-systemsettings/debian/rules b/ubuntu/maverick/applications/kde-systemsettings/debian/rules index 1652222f7..6ba108e8a 100755 --- a/ubuntu/maverick/applications/kde-systemsettings/debian/rules +++ b/ubuntu/maverick/applications/kde-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/kdesudo/debian/rules b/ubuntu/maverick/applications/kdesudo/debian/rules index a75c93de0..df41bc83d 100755 --- a/ubuntu/maverick/applications/kdesudo/debian/rules +++ b/ubuntu/maverick/applications/kdesudo/debian/rules @@ -15,6 +15,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_INSTALL_MANPAGES_kdesudo-trinity = kdesudo-trinity.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/kdesudo-trinity:: docbook2x-man debian/kdesudo-trinity.1.docbook mv kdesudo.1 kdesudo-trinity.1 diff --git a/ubuntu/maverick/applications/kdesvn/debian/rules b/ubuntu/maverick/applications/kdesvn/debian/rules index 03f12c63c..5dc283b7c 100755 --- a/ubuntu/maverick/applications/kdesvn/debian/rules +++ b/ubuntu/maverick/applications/kdesvn/debian/rules @@ -17,6 +17,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/kde" -DCMAKE_CXX_FLAGS="-I/opt/trinity/include/kde" -DCMAKE_LDFLAGS="-L/opt/trinity/lib" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_COMPRESS_EXCLUDE := .dcl .docbook -license .tag .sty .el DEB_DH_MAKESHLIBS_ARGS_libsvnqt4 := -V diff --git a/ubuntu/maverick/applications/kdiff3/debian/rules b/ubuntu/maverick/applications/kdiff3/debian/rules index daf6b2bea..9181b1148 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 694d6cf44..e05262ec0 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/kde +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/kdmtheme/debian/rules b/ubuntu/maverick/applications/kdmtheme/debian/rules index 4155e0242..7de1e2855 100755 --- a/ubuntu/maverick/applications/kdmtheme/debian/rules +++ b/ubuntu/maverick/applications/kdmtheme/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/kde +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/kdpkg/debian/rules b/ubuntu/maverick/applications/kdpkg/debian/rules index 908941e34..d5ac50b42 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 9a130bbdf..227129eb0 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/kde +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 65b0fc115..f254c8044 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 7045dbba0..7511e74b3 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 0ab30dfbe..3a36a29ef 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/kde +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 a353777b4..27a3fe333 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 6e9212a44..6a373b5a4 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/kde +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 102844b2a..c75119f72 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 755d35fe1..24f8e63c2 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/kde +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 43d66b0b0..bdce983e0 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 5d81da9a7..27ad5989b 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 a600a1db1..d03f14f42 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 25720b821..9eb4ec3ad 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/kde --disable-sqlite3 +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 b397e1895..fff2afa7d 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/kde +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 c5b4fba04..0a65d48d8 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 @@ -158,7 +161,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 4ea7a3538..1505e8e8e 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 4ba8fd6ba..ee316c12f 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/knights/debian/rules b/ubuntu/maverick/applications/knights/debian/rules index 4527456f6..bde510e8b 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 b04e5a6c4..77f1d05a4 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 e96a49579..a009dbf98 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 c24e29fbc..a5825d047 100755 --- a/ubuntu/maverick/applications/koffice/debian/rules +++ b/ubuntu/maverick/applications/koffice/debian/rules @@ -16,6 +16,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 bac275a75..61643f3ff 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/kde +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 8b49a1a4b..3c342bcfc 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/kde +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 b3c8159f5..98b6ba69e 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 8b49a1a4b..3c342bcfc 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/kde +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 913dd64f1..bbe86c8d9 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/kde +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 83dd79dc2..f3c1f73d7 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 582e70ec7..0df91fd2c 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/kde +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 f643f8e97..0b16abed9 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/kde +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 5b4a03a4d..2e7053e8b 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) @@ -109,7 +112,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 340dc328c..60b270a47 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) @@ -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/kstreamripper/debian/rules b/ubuntu/maverick/applications/kstreamripper/debian/rules index 725896903..cb9dc49ae 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 573d7fed9..6e41ea3f6 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/kde +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 b8023c222..6ee5ee935 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 6ca8e03b2..191e61381 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/kde +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 7c18aa099..c8061ea29 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/kde +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 576499353..96984bd79 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 61e74cb62..6abecd47a 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/kde +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/kwin-style-crystal/debian/rules b/ubuntu/maverick/applications/kwin-style-crystal/debian/rules index 7b23d839b..6e735f5dc 100755 --- a/ubuntu/maverick/applications/kwin-style-crystal/debian/rules +++ b/ubuntu/maverick/applications/kwin-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/piklab/debian/rules b/ubuntu/maverick/applications/piklab/debian/rules index 70efffef4..5edcb99ef 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 8f7f4038a..fdda3113f 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/rosegarden/debian/rules b/ubuntu/maverick/applications/rosegarden/debian/rules index 7b4c8c0a3..cce54e96b 100755 --- a/ubuntu/maverick/applications/rosegarden/debian/rules +++ b/ubuntu/maverick/applications/rosegarden/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) + DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture) ARCH=$(DEB_BUILD_ARCH) @@ -97,7 +100,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 a7f5808ef..c6b04fa37 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 10087bc2f..ce5932a76 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/tellico/debian/rules b/ubuntu/maverick/applications/tellico/debian/rules index d1248ef1d..4dfb7936d 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/wlassistant/debian/rules b/ubuntu/maverick/applications/wlassistant/debian/rules index 83cfc74c5..f9260b34c 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 176f45bc3..f86dc62d5 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/dependencies/arts/debian/rules b/ubuntu/maverick/dependencies/arts/debian/rules index 63cfa2119..e192c8e45 100755 --- a/ubuntu/maverick/dependencies/arts/debian/rules +++ b/ubuntu/maverick/dependencies/arts/debian/rules @@ -23,6 +23,9 @@ DEB_BUILD_PARALLEL = true DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity DEB_DH_MAKESHLIBS_ARGS_ALL := -V diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/rules b/ubuntu/maverick/dependencies/avahi-tqt/debian/rules index d4694a4bf..54a22a44f 100755 --- a/ubuntu/maverick/dependencies/avahi-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/rules @@ -13,6 +13,9 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --disable-gtk3 \ --with-systemdsystemunitdir=/lib/systemd/system +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules index c6e5c11f5..6a0f5bbed 100755 --- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules @@ -4,3 +4,6 @@ include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules b/ubuntu/maverick/dependencies/dbus-tqt/debian/rules index d0c9ab9a7..3edd7c59c 100755 --- a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/dbus-tqt/debian/rules @@ -10,3 +10,6 @@ include /usr/share/cdbs/1/class/cmake.mk # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules index be4c49e74..fe7b55dc0 100755 --- a/ubuntu/maverick/dependencies/qt3/debian/rules +++ b/ubuntu/maverick/dependencies/qt3/debian/rules @@ -11,6 +11,9 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -326,7 +329,7 @@ binary-indep: build install dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) binary-arch: build install @@ -468,7 +471,7 @@ binary-arch: build install dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) - dh_builddeb -a $(IBASE) + dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build binary-indep binary-arch binary install clean patch unpatch diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/rules b/ubuntu/maverick/dependencies/tqtinterface/debian/rules index 928631538..ed3f07a6d 100755 --- a/ubuntu/maverick/dependencies/tqtinterface/debian/rules +++ b/ubuntu/maverick/dependencies/tqtinterface/debian/rules @@ -14,6 +14,9 @@ DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_LIBRARY_PATH="/usr/lib" -DCMAKE_INCLUDE_PATH="/usr/include" -DCMAKE_VERBOSE_MAKEFILE="ON" -DWITH_QT3="ON" -DQTDIR="/usr/share/qt3" -DQT_LIBRARY_DIRS="/usr/share/qt3/lib" -DBUILD_ALL="ON" -DUSE_QT3="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/ubuntu/maverick/kde-i18n/debian/rules b/ubuntu/maverick/kde-i18n/debian/rules index 56af437b8..f821e5339 100755 --- a/ubuntu/maverick/kde-i18n/debian/rules +++ b/ubuntu/maverick/kde-i18n/debian/rules @@ -32,6 +32,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 @@ -108,7 +111,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/kdeaccessibility/debian/rules b/ubuntu/maverick/kdeaccessibility/debian/rules index 9b8ba011d..3cdcff750 100755 --- a/ubuntu/maverick/kdeaccessibility/debian/rules +++ b/ubuntu/maverick/kdeaccessibility/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=kdeaccessibility-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 DEB_DH_MAKESHLIBS_ARGS_kttsd-trinity := -V'kttsd-trinity (>= 4:3.5.8-1)' diff --git a/ubuntu/maverick/kdeaddons/debian/rules b/ubuntu/maverick/kdeaddons/debian/rules index 369d6c5ae..27866a5e6 100755 --- a/ubuntu/maverick/kdeaddons/debian/rules +++ b/ubuntu/maverick/kdeaddons/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --without-xmms --prefix=/opt/trinity --with-extra-l DEB_DH_STRIP_ARGS := --dbg-package=kdeaddons-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/kdeadmin/debian/rules b/ubuntu/maverick/kdeadmin/debian/rules index e2b266555..52fa58219 100755 --- a/ubuntu/maverick/kdeadmin/debian/rules +++ b/ubuntu/maverick/kdeadmin/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=kdeadmin-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/kdeartwork/debian/rules b/ubuntu/maverick/kdeartwork/debian/rules index d2565f4f6..150859d96 100755 --- a/ubuntu/maverick/kdeartwork/debian/rules +++ b/ubuntu/maverick/kdeartwork/debian/rules @@ -28,6 +28,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=kdeartwork-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/kdebase/debian/rules b/ubuntu/maverick/kdebase/debian/rules index b3d4a3696..995374c70 100755 --- a/ubuntu/maverick/kdebase/debian/rules +++ b/ubuntu/maverick/kdebase/debian/rules @@ -34,6 +34,9 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=kdebase-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 kdesu knetattach kioslave kxkb kdebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity kdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ diff --git a/ubuntu/maverick/kdebindings/debian/rules b/ubuntu/maverick/kdebindings/debian/rules index fe191a9c9..37c49ed1d 100755 --- a/ubuntu/maverick/kdebindings/debian/rules +++ b/ubuntu/maverick/kdebindings/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/kdeedu/debian/rules b/ubuntu/maverick/kdeedu/debian/rules index e32699309..acf638002 100755 --- a/ubuntu/maverick/kdeedu/debian/rules +++ b/ubuntu/maverick/kdeedu/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/kde" --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/kdegames/debian/rules b/ubuntu/maverick/kdegames/debian/rules index 5720e171d..96f768ec9 100755 --- a/ubuntu/maverick/kdegames/debian/rules +++ b/ubuntu/maverick/kdegames/debian/rules @@ -26,6 +26,9 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if DEB_INSTALL_CHANGELOGS_kdegames := $(DEB_SRCDIR)/ChangeLog +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_DH_MAKESHLIBS_ARGS_libkdegames1-trinity := -V'libkdegames1-trinity (>= 4:3.5.8)' DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V diff --git a/ubuntu/maverick/kdegraphics/debian/rules b/ubuntu/maverick/kdegraphics/debian/rules index 68596069e..ab2877e0c 100755 --- a/ubuntu/maverick/kdegraphics/debian/rules +++ b/ubuntu/maverick/kdegraphics/debian/rules @@ -24,6 +24,9 @@ DEB_BUILD_PARALLEL = true DEB_DH_STRIP_ARGS := --dbg-package=kdegraphics-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/kdelibs/debian/rules b/ubuntu/maverick/kdelibs/debian/rules index 96d814388..86a1f922b 100755 --- a/ubuntu/maverick/kdelibs/debian/rules +++ b/ubuntu/maverick/kdelibs/debian/rules @@ -38,6 +38,9 @@ DEB_DH_STRIP_ARGS := --dbg-package=kdelibs-trinity-dbg DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2a-trinity := -V'kdelibs4c2a-trinity (>= 4:3.5.8-1)' +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/kdelibs-data-trinity:: install -p -D -m644 kded/applications.menu debian/kdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu install -p -D -m644 debian/trinitylibs.conf debian/kdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf diff --git a/ubuntu/maverick/kdemultimedia/debian/rules b/ubuntu/maverick/kdemultimedia/debian/rules index 8ddecddf8..178e42e96 100755 --- a/ubuntu/maverick/kdemultimedia/debian/rules +++ b/ubuntu/maverick/kdemultimedia/debian/rules @@ -23,6 +23,9 @@ DOC_HTML_PRUNE := kcontrol-trinity DEB_DH_STRIP_ARGS := --dbg-package=kdemultimedia-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := artsbuilder-trinity kdemultimedia-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/kdenetwork/debian/rules b/ubuntu/maverick/kdenetwork/debian/rules index 4bbcc5e40..169b64e66 100755 --- a/ubuntu/maverick/kdenetwork/debian/rules +++ b/ubuntu/maverick/kdenetwork/debian/rules @@ -44,6 +44,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=kdenetwork-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 DEB_DH_MAKESHLIBS_ARGS_librss1-trinity := -V'librss1-trinity (>= 4:3.5.8-1)' diff --git a/ubuntu/maverick/kdepim/debian/rules b/ubuntu/maverick/kdepim/debian/rules index d03604b8b..ea9be7e03 100755 --- a/ubuntu/maverick/kdepim/debian/rules +++ b/ubuntu/maverick/kdepim/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/kdesdk/debian/rules b/ubuntu/maverick/kdesdk/debian/rules index e8fcf341b..f85a4bf86 100755 --- a/ubuntu/maverick/kdesdk/debian/rules +++ b/ubuntu/maverick/kdesdk/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=kdesdk-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/kdetoys/debian/rules b/ubuntu/maverick/kdetoys/debian/rules index 39bfeb832..dc7b40efd 100755 --- a/ubuntu/maverick/kdetoys/debian/rules +++ b/ubuntu/maverick/kdetoys/debian/rules @@ -27,5 +27,8 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=kdetoys-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/kdeutils/debian/rules b/ubuntu/maverick/kdeutils/debian/rules index 73ca481ed..9cae10e9b 100755 --- a/ubuntu/maverick/kdeutils/debian/rules +++ b/ubuntu/maverick/kdeutils/debian/rules @@ -40,6 +40,9 @@ DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselec DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=kdeutils-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 DEB_DH_MAKESHLIBS_ARGS_khexedit-trinity := -V'khexedit-trinity (>= 4:3.5.8-1)' diff --git a/ubuntu/maverick/kdevelop/debian/rules b/ubuntu/maverick/kdevelop/debian/rules index 0f3894b4f..6c70c4b46 100755 --- a/ubuntu/maverick/kdevelop/debian/rules +++ b/ubuntu/maverick/kdevelop/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 := kdevelop-trinity DEB_KDE_ENABLE_FINAL := diff --git a/ubuntu/maverick/kdewebdev/debian/rules b/ubuntu/maverick/kdewebdev/debian/rules index 119f28b3c..7c1c6306f 100755 --- a/ubuntu/maverick/kdewebdev/debian/rules +++ b/ubuntu/maverick/kdewebdev/debian/rules @@ -28,6 +28,9 @@ endif DEB_DH_STRIP_ARGS := --dbg-package=kdewebdev-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kommander-trinity DEB_DH_MAKESHLIBS_ARGS_kommander-trinity := -V'kommander-trinity (>= 4:3.5.8-1)' diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/rules b/ubuntu/maverick/libraries/kipi-plugins/debian/rules index 1caedd446..31dcdd4e7 100755 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/rules +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/rules @@ -20,6 +20,9 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean :: rm -f po/*/*.gmo diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/rules b/ubuntu/maverick/libraries/libkdcraw/debian/rules index f4b4cef98..bbc6f0d96 100755 --- a/ubuntu/maverick/libraries/libkdcraw/debian/rules +++ b/ubuntu/maverick/libraries/libkdcraw/debian/rules @@ -16,3 +16,6 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed" DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/rules b/ubuntu/maverick/libraries/libkexiv2/debian/rules index dc80327f0..60174829a 100755 --- a/ubuntu/maverick/libraries/libkexiv2/debian/rules +++ b/ubuntu/maverick/libraries/libkexiv2/debian/rules @@ -19,6 +19,9 @@ DEB_KDE_ENABLE_FINAL = yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + get-orig-source: @@dh_testdir @@[ -d ../tarballs/. ]||mkdir -p ../tarballs diff --git a/ubuntu/maverick/libraries/libkipi/debian/rules b/ubuntu/maverick/libraries/libkipi/debian/rules index ac4091f53..3dd1a10a6 100755 --- a/ubuntu/maverick/libraries/libkipi/debian/rules +++ b/ubuntu/maverick/libraries/libkipi/debian/rules @@ -18,6 +18,9 @@ DEB_KDE_ENABLE_FINAL = yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean :: rm -f po/*/*.gmo diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/rules b/ubuntu/maverick/libraries/libksquirrel/debian/rules index 02615195b..5fdceafac 100755 --- a/ubuntu/maverick/libraries/libksquirrel/debian/rules +++ b/ubuntu/maverick/libraries/libksquirrel/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -85,7 +88,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/ubuntu/maverick/libraries/mlt++/debian/rules b/ubuntu/maverick/libraries/mlt++/debian/rules index cf8cb1984..cd87c6cce 100755 --- a/ubuntu/maverick/libraries/mlt++/debian/rules +++ b/ubuntu/maverick/libraries/mlt++/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -88,7 +91,7 @@ binary-arch: build install dh_shlibdeps -l/opt/trinity/lib dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/ubuntu/maverick/libraries/mlt/debian/rules b/ubuntu/maverick/libraries/mlt/debian/rules index b4b16188a..d45bb4be3 100755 --- a/ubuntu/maverick/libraries/mlt/debian/rules +++ b/ubuntu/maverick/libraries/mlt/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1) NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) @@ -114,7 +117,7 @@ binary-arch: build install dh_shlibdeps --exclude=libmlt --exclude=libmiracle --exclude=libvalerie dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/rules b/ubuntu/maverick/libraries/pykdeextensions/debian/rules index fb93a8396..046d525d3 100755 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/rules +++ b/ubuntu/maverick/libraries/pykdeextensions/debian/rules @@ -18,6 +18,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/pykdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" diff --git a/ubuntu/maverick/libraries/python-trinity/debian/rules b/ubuntu/maverick/libraries/python-trinity/debian/rules index 98178d114..6051507bb 100755 --- a/ubuntu/maverick/libraries/python-trinity/debian/rules +++ b/ubuntu/maverick/libraries/python-trinity/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + #include /usr/share/dpatch/dpatch.make # This has to be exported to make some magic below work. export DH_OPTIONS @@ -151,7 +154,7 @@ endif dh_shlibdeps -l /opt/trinity/lib dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: install-indep