diff options
Diffstat (limited to 'debian/_base/applications')
233 files changed, 1200 insertions, 433 deletions
diff --git a/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk b/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/abakus/debian/rules b/debian/_base/applications/abakus/debian/rules index d5221b39b..a9d88368b 100755 --- a/debian/_base/applications/abakus/debian/rules +++ b/debian/_base/applications/abakus/debian/rules @@ -32,9 +32,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - debian/abakus.xpm: icons/hi64-app-abakus.png convert -resize 32 $< $@ diff --git a/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk b/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/amarok/debian/rules b/debian/_base/applications/amarok/debian/rules index 75146ddca..fce2f7d4a 100755 --- a/debian/_base/applications/amarok/debian/rules +++ b/debian/_base/applications/amarok/debian/rules @@ -16,6 +16,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DBUILD_ALL="ON" \ -DWITH_ALL_OPTIONS="ON" \ -DWITH_IFP="OFF" - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) diff --git a/debian/_base/applications/basket/debian/cdbs/debian-tde.mk b/debian/_base/applications/basket/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/basket/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/basket/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/basket/debian/rules b/debian/_base/applications/basket/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/basket/debian/rules +++ b/debian/_base/applications/basket/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk b/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/bibletime/debian/rules b/debian/_base/applications/bibletime/debian/rules index e15345749..430b47715 100755 --- a/debian/_base/applications/bibletime/debian/rules +++ b/debian/_base/applications/bibletime/debian/rules @@ -17,9 +17,6 @@ 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/_base/applications/codeine/debian/cdbs/debian-tde.mk b/debian/_base/applications/codeine/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/codeine/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/codeine/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/codeine/debian/rules b/debian/_base/applications/codeine/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/codeine/debian/rules +++ b/debian/_base/applications/codeine/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk b/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/rules b/debian/_base/applications/compizconfig-backend-tdeconfig/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/rules +++ b/debian/_base/applications/compizconfig-backend-tdeconfig/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/desktop-effects-tde/debian/rules b/debian/_base/applications/desktop-effects-tde/debian/rules index 41ad63be2..eef8add16 100755 --- a/debian/_base/applications/desktop-effects-tde/debian/rules +++ b/debian/_base/applications/desktop-effects-tde/debian/rules @@ -12,8 +12,15 @@ 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) +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +endif binary-install/desktop-effects-tde-trinity:: ${DH_PYTHON2} -pdesktop-effects-tde-trinity diff --git a/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk b/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/digikam/debian/rules b/debian/_base/applications/digikam/debian/rules index 32d9653f6..99e80d2fc 100755 --- a/debian/_base/applications/digikam/debian/rules +++ b/debian/_base/applications/digikam/debian/rules @@ -12,9 +12,6 @@ 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/_base/applications/dolphin/debian/cdbs/debian-tde.mk b/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/dolphin/debian/rules b/debian/_base/applications/dolphin/debian/rules index 8d28bb5ba..ec74e914d 100755 --- a/debian/_base/applications/dolphin/debian/rules +++ b/debian/_base/applications/dolphin/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk b/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/filelight/debian/rules b/debian/_base/applications/filelight/debian/rules index d9ef0cae3..fc3e056c1 100755 --- a/debian/_base/applications/filelight/debian/rules +++ b/debian/_base/applications/filelight/debian/rules @@ -26,6 +26,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) diff --git a/debian/_base/applications/fusion-icon/debian/rules b/debian/_base/applications/fusion-icon/debian/rules index 46359aca2..a0c6906dd 100755 --- a/debian/_base/applications/fusion-icon/debian/rules +++ b/debian/_base/applications/fusion-icon/debian/rules @@ -12,8 +12,15 @@ else endif #include /usr/share/cdbs/1/rules/patchsys-quilt.mk +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +endif post-patches:: # make sure that python binary exists diff --git a/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk b/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/gtk-qt-engine/debian/rules b/debian/_base/applications/gtk-qt-engine/debian/rules index 23c51fe19..4cc7515a2 100755 --- a/debian/_base/applications/gtk-qt-engine/debian/rules +++ b/debian/_base/applications/gtk-qt-engine/debian/rules @@ -36,9 +36,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -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/_base/applications/gtk3-tqt-engine/debian/rules b/debian/_base/applications/gtk3-tqt-engine/debian/rules index 272168641..1a185d594 100755 --- a/debian/_base/applications/gtk3-tqt-engine/debian/rules +++ b/debian/_base/applications/gtk3-tqt-engine/debian/rules @@ -11,8 +11,15 @@ 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) +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +endif post-patches:: debian/stamp-bootstrap diff --git a/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk b/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/gwenview-i18n/debian/rules b/debian/_base/applications/gwenview-i18n/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/gwenview-i18n/debian/rules +++ b/debian/_base/applications/gwenview-i18n/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk b/debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/gwenview/debian/rules b/debian/_base/applications/gwenview/debian/rules index 82a7598cb..4f8a32879 100755 --- a/debian/_base/applications/gwenview/debian/rules +++ b/debian/_base/applications/gwenview/debian/rules @@ -16,9 +16,6 @@ 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/_base/applications/k3b-i18n/debian/rules b/debian/_base/applications/k3b-i18n/debian/rules index 3187f4385..440fce6c1 100755 --- a/debian/_base/applications/k3b-i18n/debian/rules +++ b/debian/_base/applications/k3b-i18n/debian/rules @@ -3,6 +3,16 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -12,7 +22,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - diff --git a/debian/_base/applications/k3b/debian/cdbs/debian-tde.mk b/debian/_base/applications/k3b/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/k3b/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/k3b/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/k3b/debian/rules b/debian/_base/applications/k3b/debian/rules index 12173a7e4..72db8e489 100755 --- a/debian/_base/applications/k3b/debian/rules +++ b/debian/_base/applications/k3b/debian/rules @@ -4,15 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -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_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -23,29 +14,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DWITH_ALL_OPTIONS="ON" - -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: -ifndef _cdbs_class_cmake -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs -endif - touch debian/stamp-bootstrap diff --git a/debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk b/debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/k9copy/debian/rules b/debian/_base/applications/k9copy/debian/rules index d68281794..aca7b475b 100755 --- a/debian/_base/applications/k9copy/debian/rules +++ b/debian/_base/applications/k9copy/debian/rules @@ -14,9 +14,6 @@ DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --enable-k3bdevices -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/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/debian/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kaffeine-mozilla/debian/rules b/debian/_base/applications/kaffeine-mozilla/debian/rules index 806642cbf..edb9f2f68 100755 --- a/debian/_base/applications/kaffeine-mozilla/debian/rules +++ b/debian/_base/applications/kaffeine-mozilla/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/usr" \ diff --git a/debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk b/debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kaffeine/debian/rules b/debian/_base/applications/kaffeine/debian/rules index 76edc3a0d..a6797f19a 100755 --- a/debian/_base/applications/kaffeine/debian/rules +++ b/debian/_base/applications/kaffeine/debian/rules @@ -15,6 +15,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ -DWITH_ALL_OPTIONS="ON" - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) diff --git a/debian/_base/applications/kasablanca/debian/cdbs/debian-tde.mk b/debian/_base/applications/kasablanca/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kasablanca/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kasablanca/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kasablanca/debian/rules b/debian/_base/applications/kasablanca/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/kasablanca/debian/rules +++ b/debian/_base/applications/kasablanca/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/katapult/debian/cdbs/debian-tde.mk b/debian/_base/applications/katapult/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/katapult/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/katapult/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/katapult/debian/rules b/debian/_base/applications/katapult/debian/rules index ebb9ea16b..74e4fb499 100755 --- a/debian/_base/applications/katapult/debian/rules +++ b/debian/_base/applications/katapult/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk b/debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kbarcode/debian/rules b/debian/_base/applications/kbarcode/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/kbarcode/debian/rules +++ b/debian/_base/applications/kbarcode/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kbfx/debian/cdbs/debian-tde.mk b/debian/_base/applications/kbfx/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kbfx/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kbfx/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kbfx/debian/rules b/debian/_base/applications/kbfx/debian/rules index aa3fc3652..bb4d9b898 100755 --- a/debian/_base/applications/kbfx/debian/rules +++ b/debian/_base/applications/kbfx/debian/rules @@ -4,11 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - DEB_CMAKE_EXTRA_FLAGS =\ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DLIB_SUFFIX="" \ @@ -17,6 +12,3 @@ DEB_CMAKE_EXTRA_FLAGS =\ -DCMAKE_INSTALL_PREFIX="/opt/trinity/" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DBUILD_ALL="ON" - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) diff --git a/debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk b/debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kbibtex/debian/rules b/debian/_base/applications/kbibtex/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/kbibtex/debian/rules +++ b/debian/_base/applications/kbibtex/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk b/debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kbiff/debian/rules b/debian/_base/applications/kbiff/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kbiff/debian/rules +++ b/debian/_base/applications/kbiff/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk b/debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kbookreader/debian/rules b/debian/_base/applications/kbookreader/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kbookreader/debian/rules +++ b/debian/_base/applications/kbookreader/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk b/debian/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kchmviewer/debian/rules b/debian/_base/applications/kchmviewer/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/kchmviewer/debian/rules +++ b/debian/_base/applications/kchmviewer/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk b/debian/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kcmautostart/debian/rules b/debian/_base/applications/kcmautostart/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kcmautostart/debian/rules +++ b/debian/_base/applications/kcmautostart/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kcmldap/debian/cdbs/debian-tde.mk b/debian/_base/applications/kcmldap/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kcmldap/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kcmldap/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kcmldap/debian/rules b/debian/_base/applications/kcmldap/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kcmldap/debian/rules +++ b/debian/_base/applications/kcmldap/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk b/debian/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kcmldapcontroller/debian/rules b/debian/_base/applications/kcmldapcontroller/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/kcmldapcontroller/debian/rules +++ b/debian/_base/applications/kcmldapcontroller/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk b/debian/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kcmldapmanager/debian/rules b/debian/_base/applications/kcmldapmanager/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/kcmldapmanager/debian/rules +++ b/debian/_base/applications/kcmldapmanager/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk b/debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kcpuload/debian/rules b/debian/_base/applications/kcpuload/debian/rules index 894ebb8b3..f39393c74 100755 --- a/debian/_base/applications/kcpuload/debian/rules +++ b/debian/_base/applications/kcpuload/debian/rules @@ -17,6 +17,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ -DWITH_ALL_OPTIONS="ON" - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) diff --git a/debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk b/debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kdbg/debian/rules b/debian/_base/applications/kdbg/debian/rules index 91bb7058b..4bac98821 100755 --- a/debian/_base/applications/kdbg/debian/rules +++ b/debian/_base/applications/kdbg/debian/rules @@ -16,6 +16,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ -DWITH_ALL_OPTIONS="ON" - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) diff --git a/debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk b/debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kdbusnotification/debian/rules b/debian/_base/applications/kdbusnotification/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/kdbusnotification/debian/rules +++ b/debian/_base/applications/kdbusnotification/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk b/debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kdiff3/debian/rules b/debian/_base/applications/kdiff3/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kdiff3/debian/rules +++ b/debian/_base/applications/kdiff3/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk b/debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kdirstat/debian/rules b/debian/_base/applications/kdirstat/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kdirstat/debian/rules +++ b/debian/_base/applications/kdirstat/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kdpkg/debian/cdbs/debian-tde.mk b/debian/_base/applications/kdpkg/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kdpkg/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kdpkg/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kdpkg/debian/rules b/debian/_base/applications/kdpkg/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/kdpkg/debian/rules +++ b/debian/_base/applications/kdpkg/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/keep/debian/cdbs/debian-tde.mk b/debian/_base/applications/keep/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/keep/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/keep/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/keep/debian/rules b/debian/_base/applications/keep/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/keep/debian/rules +++ b/debian/_base/applications/keep/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kerberostray/debian/cdbs/debian-tde.mk b/debian/_base/applications/kerberostray/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kerberostray/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kerberostray/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kerberostray/debian/rules b/debian/_base/applications/kerberostray/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/kerberostray/debian/rules +++ b/debian/_base/applications/kerberostray/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/keximdb/debian/cdbs/debian-tde.mk b/debian/_base/applications/keximdb/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/keximdb/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/keximdb/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/keximdb/debian/rules b/debian/_base/applications/keximdb/debian/rules index 79eb6aada..72db8e489 100755 --- a/debian/_base/applications/keximdb/debian/rules +++ b/debian/_base/applications/keximdb/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk b/debian/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kftpgrabber/debian/rules b/debian/_base/applications/kftpgrabber/debian/rules index c4ea6503a..8292bc38c 100755 --- a/debian/_base/applications/kftpgrabber/debian/rules +++ b/debian/_base/applications/kftpgrabber/debian/rules @@ -11,9 +11,6 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - build/kftpgrabber-trinity:: /usr/bin/docbook2x-man debian/kftpgrabber.xml diff --git a/debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk b/debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kgtk-qt3/debian/rules b/debian/_base/applications/kgtk-qt3/debian/rules index 6c50cfb9e..f1aa52d1c 100755 --- a/debian/_base/applications/kgtk-qt3/debian/rules +++ b/debian/_base/applications/kgtk-qt3/debian/rules @@ -32,10 +32,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -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/kgtk-qt3-trinity:: mkdir -p $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ - diff --git a/debian/_base/applications/kile/debian/cdbs/debian-tde.mk b/debian/_base/applications/kile/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kile/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kile/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kile/debian/rules b/debian/_base/applications/kile/debian/rules index 30a48733b..bd5478578 100755 --- a/debian/_base/applications/kile/debian/rules +++ b/debian/_base/applications/kile/debian/rules @@ -15,9 +15,6 @@ DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kile := debian/kile.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/_base/applications/kima/debian/cdbs/debian-tde.mk b/debian/_base/applications/kima/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kima/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kima/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kima/debian/rules b/debian/_base/applications/kima/debian/rules index 28412bc9d..7ae24f493 100755 --- a/debian/_base/applications/kima/debian/rules +++ b/debian/_base/applications/kima/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - WITH_NVCONTROL = $(if $(filter $(DEB_HOST_ARCH_CPU),amd64 i386),ON,OFF) DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk b/debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kiosktool/debian/rules b/debian/_base/applications/kiosktool/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kiosktool/debian/rules +++ b/debian/_base/applications/kiosktool/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk b/debian/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kkbswitch/debian/rules b/debian/_base/applications/kkbswitch/debian/rules index cce9eac4c..0f666b3ca 100755 --- a/debian/_base/applications/kkbswitch/debian/rules +++ b/debian/_base/applications/kkbswitch/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/klamav/debian/cdbs/debian-tde.mk b/debian/_base/applications/klamav/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/klamav/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/klamav/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/klamav/debian/rules b/debian/_base/applications/klamav/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/klamav/debian/rules +++ b/debian/_base/applications/klamav/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk b/debian/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/klcddimmer/debian/rules b/debian/_base/applications/klcddimmer/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/klcddimmer/debian/rules +++ b/debian/_base/applications/klcddimmer/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk b/debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kmplayer/debian/rules b/debian/_base/applications/kmplayer/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kmplayer/debian/rules +++ b/debian/_base/applications/kmplayer/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk b/debian/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kmyfirewall/debian/rules b/debian/_base/applications/kmyfirewall/debian/rules index a12bd0357..8b7e87e26 100755 --- a/debian/_base/applications/kmyfirewall/debian/rules +++ b/debian/_base/applications/kmyfirewall/debian/rules @@ -10,9 +10,6 @@ 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/kmyfirewall-trinity:: rm -f debian/$(cdbs_curpkg)/opt/trinity/lib/*.so mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ diff --git a/debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk b/debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kmymoney/debian/rules b/debian/_base/applications/kmymoney/debian/rules index 10490c3e4..0f794b445 100755 --- a/debian/_base/applications/kmymoney/debian/rules +++ b/debian/_base/applications/kmymoney/debian/rules @@ -12,9 +12,6 @@ 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 --disable-pdf-docs -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - LDFLAGS += -Wl,--as-needed post-patches:: debian/stamp-bootstrap diff --git a/debian/_base/applications/knemo/debian/cdbs/debian-tde.mk b/debian/_base/applications/knemo/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/knemo/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knemo/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/knetload/debian/cdbs/debian-tde.mk b/debian/_base/applications/knetload/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/knetload/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knetload/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/knetload/debian/rules b/debian/_base/applications/knetload/debian/rules index 65318dd0d..5a0da42af 100755 --- a/debian/_base/applications/knetload/debian/rules +++ b/debian/_base/applications/knetload/debian/rules @@ -4,14 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk b/debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/knetstats/debian/rules b/debian/_base/applications/knetstats/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/knetstats/debian/rules +++ b/debian/_base/applications/knetstats/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk b/debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/knetworkmanager8/debian/rules b/debian/_base/applications/knetworkmanager8/debian/rules index 1b87e9c65..d38592f45 100755 --- a/debian/_base/applications/knetworkmanager8/debian/rules +++ b/debian/_base/applications/knetworkmanager8/debian/rules @@ -17,9 +17,6 @@ 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) - binary-install/network-manager-kde-trinity:: # Install autostart file install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \ diff --git a/debian/_base/applications/knights/debian/cdbs/debian-tde.mk b/debian/_base/applications/knights/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/knights/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knights/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/knights/debian/rules b/debian/_base/applications/knights/debian/rules index 2b56aa5de..01a4fb689 100755 --- a/debian/_base/applications/knights/debian/rules +++ b/debian/_base/applications/knights/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/knmap/debian/cdbs/debian-tde.mk b/debian/_base/applications/knmap/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/knmap/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knmap/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/knmap/debian/rules b/debian/_base/applications/knmap/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/knmap/debian/rules +++ b/debian/_base/applications/knmap/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/knowit/debian/cdbs/debian-tde.mk b/debian/_base/applications/knowit/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/knowit/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knowit/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/knowit/debian/rules b/debian/_base/applications/knowit/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/knowit/debian/rules +++ b/debian/_base/applications/knowit/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/knutclient/debian/cdbs/debian-tde.mk b/debian/_base/applications/knutclient/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/knutclient/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knutclient/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/knutclient/debian/rules b/debian/_base/applications/knutclient/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/knutclient/debian/rules +++ b/debian/_base/applications/knutclient/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/koffice-i18n/debian/rules b/debian/_base/applications/koffice-i18n/debian/rules index 00a275f9e..8fb58ece9 100755 --- a/debian/_base/applications/koffice-i18n/debian/rules +++ b/debian/_base/applications/koffice-i18n/debian/rules @@ -8,8 +8,15 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +endif languages = `ls -1d *i18n*` diff --git a/debian/_base/applications/koffice/debian/cdbs/debian-tde.mk b/debian/_base/applications/koffice/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/koffice/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/koffice/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/koffice/debian/rules b/debian/_base/applications/koffice/debian/rules index b6505406b..397783a27 100755 --- a/debian/_base/applications/koffice/debian/rules +++ b/debian/_base/applications/koffice/debian/rules @@ -15,9 +15,6 @@ 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/_base/applications/konversation/debian/cdbs/debian-tde.mk b/debian/_base/applications/konversation/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/konversation/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/konversation/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/konversation/debian/rules b/debian/_base/applications/konversation/debian/rules index 13de3bade..61fe9b5c9 100755 --- a/debian/_base/applications/konversation/debian/rules +++ b/debian/_base/applications/konversation/debian/rules @@ -4,16 +4,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -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_STRIP_ARGS := --dbg-package=konversation-trinity-dbg DEB_INSTALL_DOCS_ALL = -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ @@ -26,28 +18,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifndef _cdbs_class_cmake -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs -endif - touch debian/stamp-bootstrap - ### Manpages XP = xsltproc --nonet --output debian/man/ DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl @@ -58,7 +28,6 @@ DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl GENERATED_MANPAGES := $(patsubst %.docbook,%,$(wildcard debian/man/*.docbook)) build/konversation-trinity:: $(GENERATED_MANPAGES) clean:: - rm -f debian/stamp-bootstrap -rm -f $(GENERATED_MANPAGES) -rm -f po/*/konversation.gmo diff --git a/debian/_base/applications/kooldock/debian/cdbs/debian-tde.mk b/debian/_base/applications/kooldock/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kooldock/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kooldock/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kooldock/debian/rules b/debian/_base/applications/kooldock/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/kooldock/debian/rules +++ b/debian/_base/applications/kooldock/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk b/debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kopete-otr/debian/rules b/debian/_base/applications/kopete-otr/debian/rules index ef86fcc91..205e98266 100755 --- a/debian/_base/applications/kopete-otr/debian/rules +++ b/debian/_base/applications/kopete-otr/debian/rules @@ -12,9 +12,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/_base/applications/kpicosim/debian/cdbs/debian-tde.mk b/debian/_base/applications/kpicosim/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kpicosim/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kpicosim/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kpicosim/debian/rules b/debian/_base/applications/kpicosim/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kpicosim/debian/rules +++ b/debian/_base/applications/kpicosim/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk b/debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kpilot/debian/rules b/debian/_base/applications/kpilot/debian/rules index db3fcbede..f8596e545 100755 --- a/debian/_base/applications/kpilot/debian/rules +++ b/debian/_base/applications/kpilot/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kplayer/debian/cdbs/debian-tde.mk b/debian/_base/applications/kplayer/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kplayer/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kplayer/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kplayer/debian/rules b/debian/_base/applications/kplayer/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kplayer/debian/rules +++ b/debian/_base/applications/kplayer/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk b/debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kpowersave/debian/rules b/debian/_base/applications/kpowersave/debian/rules index 59e0f7751..9bd279c93 100755 --- a/debian/_base/applications/kpowersave/debian/rules +++ b/debian/_base/applications/kpowersave/debian/rules @@ -4,18 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -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_INSTALL_DOCS_ALL := AUTHORS NEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/debian/_base/applications/krecipes/debian/cdbs/debian-tde.mk b/debian/_base/applications/krecipes/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/krecipes/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/krecipes/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/krecipes/debian/rules b/debian/_base/applications/krecipes/debian/rules index e4a26f2aa..e3708987f 100755 --- a/debian/_base/applications/krecipes/debian/rules +++ b/debian/_base/applications/krecipes/debian/rules @@ -8,9 +8,6 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/_base/applications/krename/debian/cdbs/debian-tde.mk b/debian/_base/applications/krename/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/krename/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/krename/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/krename/debian/rules b/debian/_base/applications/krename/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/krename/debian/rules +++ b/debian/_base/applications/krename/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/krusader/debian/cdbs/debian-tde.mk b/debian/_base/applications/krusader/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/krusader/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/krusader/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/krusader/debian/rules b/debian/_base/applications/krusader/debian/rules index 978b9c75a..cdbcf9176 100755 --- a/debian/_base/applications/krusader/debian/rules +++ b/debian/_base/applications/krusader/debian/rules @@ -15,9 +15,6 @@ DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - install/krusader-trinity:: # install xpm files used by menu install -D -p -m0644 pics/cr16-app-krusader_root.xpm \ diff --git a/debian/_base/applications/kscope/debian/cdbs/debian-tde.mk b/debian/_base/applications/kscope/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kscope/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kscope/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kscope/debian/rules b/debian/_base/applications/kscope/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kscope/debian/rules +++ b/debian/_base/applications/kscope/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/ksensors/debian/cdbs/debian-tde.mk b/debian/_base/applications/ksensors/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/ksensors/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/ksensors/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/ksensors/debian/rules b/debian/_base/applications/ksensors/debian/rules index 59588e933..4437933c3 100755 --- a/debian/_base/applications/ksensors/debian/rules +++ b/debian/_base/applications/ksensors/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kshowmail/debian/cdbs/debian-tde.mk b/debian/_base/applications/kshowmail/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kshowmail/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kshowmail/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kshutdown/debian/cdbs/debian-tde.mk b/debian/_base/applications/kshutdown/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kshutdown/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kshutdown/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kshutdown/debian/rules b/debian/_base/applications/kshutdown/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kshutdown/debian/rules +++ b/debian/_base/applications/kshutdown/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk b/debian/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/rules b/debian/_base/applications/ksplash-engine-moodin/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/ksplash-engine-moodin/debian/rules +++ b/debian/_base/applications/ksplash-engine-moodin/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/ksquirrel/debian/rules b/debian/_base/applications/ksquirrel/debian/rules index 328283c93..813fff66f 100755 --- a/debian/_base/applications/ksquirrel/debian/rules +++ b/debian/_base/applications/ksquirrel/debian/rules @@ -16,8 +16,15 @@ 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) +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +endif # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) diff --git a/debian/_base/applications/kstreamripper/debian/cdbs/debian-tde.mk b/debian/_base/applications/kstreamripper/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kstreamripper/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kstreamripper/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kstreamripper/debian/rules b/debian/_base/applications/kstreamripper/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kstreamripper/debian/rules +++ b/debian/_base/applications/kstreamripper/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk b/debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/ksystemlog/debian/rules b/debian/_base/applications/ksystemlog/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/ksystemlog/debian/rules +++ b/debian/_base/applications/ksystemlog/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/ktechlab/debian/cdbs/debian-tde.mk b/debian/_base/applications/ktechlab/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/ktechlab/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/ktechlab/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/ktechlab/debian/rules b/debian/_base/applications/ktechlab/debian/rules index b4b3fc8cb..4b05dbd51 100755 --- a/debian/_base/applications/ktechlab/debian/rules +++ b/debian/_base/applications/ktechlab/debian/rules @@ -16,9 +16,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DBUILD_ALL="ON" \ -DWITH_ALL_OPTIONS="ON" -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - debian/ktechlab.xpm: icons/hi32-app-ktechlab.png convert $< $@ diff --git a/debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk b/debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/ktorrent/debian/rules b/debian/_base/applications/ktorrent/debian/rules index 1be7001b0..a90794996 100755 --- a/debian/_base/applications/ktorrent/debian/rules +++ b/debian/_base/applications/ktorrent/debian/rules @@ -14,9 +14,6 @@ DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - build/ktorrent-trinity:: docbook2x-man debian/ktorrent.1.docbook diff --git a/debian/_base/applications/kvirc/debian/rules b/debian/_base/applications/kvirc/debian/rules index 66b12bfe8..6fc9dffe2 100755 --- a/debian/_base/applications/kvirc/debian/rules +++ b/debian/_base/applications/kvirc/debian/rules @@ -49,8 +49,15 @@ endif # DEB_COMPRESS_EXCLUDE := .kvs +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +endif # # Run dh_shlibdeps with the correct options diff --git a/debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk b/debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kvkbd/debian/rules b/debian/_base/applications/kvkbd/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kvkbd/debian/rules +++ b/debian/_base/applications/kvkbd/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kvpnc/debian/cdbs/debian-tde.mk b/debian/_base/applications/kvpnc/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kvpnc/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kvpnc/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kvpnc/debian/rules b/debian/_base/applications/kvpnc/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/kvpnc/debian/rules +++ b/debian/_base/applications/kvpnc/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk b/debian/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/kxmleditor/debian/rules b/debian/_base/applications/kxmleditor/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/kxmleditor/debian/rules +++ b/debian/_base/applications/kxmleditor/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/mathemagics/debian/cdbs/debian-tde.mk b/debian/_base/applications/mathemagics/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/mathemagics/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/mathemagics/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/mathemagics/debian/rules b/debian/_base/applications/mathemagics/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/mathemagics/debian/rules +++ b/debian/_base/applications/mathemagics/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk b/debian/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/mplayerthumbs/debian/rules b/debian/_base/applications/mplayerthumbs/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/mplayerthumbs/debian/rules +++ b/debian/_base/applications/mplayerthumbs/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/piklab/debian/cdbs/debian-tde.mk b/debian/_base/applications/piklab/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/piklab/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/piklab/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/piklab/debian/rules b/debian/_base/applications/piklab/debian/rules index af84aa3fd..f21c51790 100755 --- a/debian/_base/applications/piklab/debian/rules +++ b/debian/_base/applications/piklab/debian/rules @@ -13,8 +13,5 @@ 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/piklab-trinity:: mv debian/$(cdbs_curpkg)/opt/trinity/share/man/man1/piklab.1x debian/$(cdbs_curpkg)/opt/trinity/share/man/man1/piklab.1 diff --git a/debian/_base/applications/potracegui/debian/cdbs/debian-tde.mk b/debian/_base/applications/potracegui/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/potracegui/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/potracegui/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/potracegui/debian/rules b/debian/_base/applications/potracegui/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/potracegui/debian/rules +++ b/debian/_base/applications/potracegui/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk b/debian/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/qalculate-tde/debian/rules b/debian/_base/applications/qalculate-tde/debian/rules index fb9daa940..d03dd383d 100755 --- a/debian/_base/applications/qalculate-tde/debian/rules +++ b/debian/_base/applications/qalculate-tde/debian/rules @@ -8,9 +8,6 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - install/qalculate-trinity:: rm debian/qalculate-trinity/opt/trinity/bin/qalculate diff --git a/debian/_base/applications/qt4-tqt-theme-engine/debian/rules b/debian/_base/applications/qt4-tqt-theme-engine/debian/rules index 7db927c4b..b54506e67 100755 --- a/debian/_base/applications/qt4-tqt-theme-engine/debian/rules +++ b/debian/_base/applications/qt4-tqt-theme-engine/debian/rules @@ -9,8 +9,15 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +endif QMAKE := qmake-qt4 diff --git a/debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk b/debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/rosegarden/debian/rules b/debian/_base/applications/rosegarden/debian/rules index be431c033..94fe8c0a8 100755 --- a/debian/_base/applications/rosegarden/debian/rules +++ b/debian/_base/applications/rosegarden/debian/rules @@ -8,11 +8,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DLIB_SUFFIX="" \ @@ -28,9 +23,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_COMPRESS_EXCLUDE += .rg .wav .docbook -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - binary-install/rosegarden-trinity:: dh_testdir find debian/rosegarden-trinity/usr/share/doc/rosegarden-trinity/examples -type f -exec chmod 664 {} \; diff --git a/debian/_base/applications/smartcardauth/debian/rules b/debian/_base/applications/smartcardauth/debian/rules index b5f130de7..14ccf6018 100755 --- a/debian/_base/applications/smartcardauth/debian/rules +++ b/debian/_base/applications/smartcardauth/debian/rules @@ -11,8 +11,15 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +endif DEB_DH_SHLIBDEPS_ARGS_ALL=--dpkg-shlibdeps-params=--ignore-missing-info diff --git a/debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk b/debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/smb4k/debian/rules b/debian/_base/applications/smb4k/debian/rules index 726056ecb..95e8cd9f1 100755 --- a/debian/_base/applications/smb4k/debian/rules +++ b/debian/_base/applications/smb4k/debian/rules @@ -15,9 +15,6 @@ 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/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk b/debian/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/soundkonverter/debian/rules b/debian/_base/applications/soundkonverter/debian/rules index 107bb6246..fa0a1f580 100755 --- a/debian/_base/applications/soundkonverter/debian/rules +++ b/debian/_base/applications/soundkonverter/debian/rules @@ -12,7 +12,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath $(cdbs_kde_ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp 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 \ diff --git a/debian/_base/applications/tastymenu/debian/cdbs/debian-tde.mk b/debian/_base/applications/tastymenu/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tastymenu/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tastymenu/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tastymenu/debian/rules b/debian/_base/applications/tastymenu/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/tastymenu/debian/rules +++ b/debian/_base/applications/tastymenu/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tde-guidance/debian/rules b/debian/_base/applications/tde-guidance/debian/rules index 0cbf1123b..54328b46d 100755 --- a/debian/_base/applications/tde-guidance/debian/rules +++ b/debian/_base/applications/tde-guidance/debian/rules @@ -22,8 +22,15 @@ PYSUPPORT_PATH = $(DEB_DESTDIR)$(PYSUPPORT_INST_PATH) DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS_APPEND := -L/opt/trinity/lib +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +endif post-patches:: # make sure that python binary exists diff --git a/debian/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk b/debian/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tde-style-baghira/debian/rules b/debian/_base/applications/tde-style-baghira/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/tde-style-baghira/debian/rules +++ b/debian/_base/applications/tde-style-baghira/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk b/debian/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tde-style-domino/debian/rules b/debian/_base/applications/tde-style-domino/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/tde-style-domino/debian/rules +++ b/debian/_base/applications/tde-style-domino/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk b/debian/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tde-style-ia-ora/debian/rules b/debian/_base/applications/tde-style-ia-ora/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/tde-style-ia-ora/debian/rules +++ b/debian/_base/applications/tde-style-ia-ora/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk b/debian/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tde-style-lipstik/debian/rules b/debian/_base/applications/tde-style-lipstik/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/tde-style-lipstik/debian/rules +++ b/debian/_base/applications/tde-style-lipstik/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk b/debian/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tde-style-qtcurve/debian/rules b/debian/_base/applications/tde-style-qtcurve/debian/rules index 32b311c4e..02999a177 100755 --- a/debian/_base/applications/tde-style-qtcurve/debian/rules +++ b/debian/_base/applications/tde-style-qtcurve/debian/rules @@ -35,6 +35,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -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) diff --git a/debian/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk b/debian/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tde-systemsettings/debian/rules b/debian/_base/applications/tde-systemsettings/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/tde-systemsettings/debian/rules +++ b/debian/_base/applications/tde-systemsettings/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tdedocker/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdedocker/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tdedocker/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdedocker/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tdedocker/debian/rules b/debian/_base/applications/tdedocker/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/tdedocker/debian/rules +++ b/debian/_base/applications/tdedocker/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tdeio-apt/debian/rules b/debian/_base/applications/tdeio-apt/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/tdeio-apt/debian/rules +++ b/debian/_base/applications/tdeio-apt/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tdeio-ftps/debian/rules b/debian/_base/applications/tdeio-ftps/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/tdeio-ftps/debian/rules +++ b/debian/_base/applications/tdeio-ftps/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tdeio-gopher/debian/rules b/debian/_base/applications/tdeio-gopher/debian/rules index 7c5507748..5a24d4563 100755 --- a/debian/_base/applications/tdeio-gopher/debian/rules +++ b/debian/_base/applications/tdeio-gopher/debian/rules @@ -32,7 +32,4 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_INSTALL_DOCS_tdeio-gopher-trinity := -XREADME -XNEWS -XTODO -XAUTHORS diff --git a/debian/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tdeio-locate/debian/rules b/debian/_base/applications/tdeio-locate/debian/rules index 2e0315d2a..c9e6b78b0 100755 --- a/debian/_base/applications/tdeio-locate/debian/rules +++ b/debian/_base/applications/tdeio-locate/debian/rules @@ -32,7 +32,4 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_INSTALL_DOCS_tdeio-locate-trinity := -XREADME -XNEWS -XTODO -XAUTHORS diff --git a/debian/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tdeio-sword/debian/rules b/debian/_base/applications/tdeio-sword/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/tdeio-sword/debian/rules +++ b/debian/_base/applications/tdeio-sword/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/rules b/debian/_base/applications/tdeio-umountwrapper/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/tdeio-umountwrapper/debian/rules +++ b/debian/_base/applications/tdeio-umountwrapper/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tdenetworkmanager/debian/rules b/debian/_base/applications/tdenetworkmanager/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/tdenetworkmanager/debian/rules +++ b/debian/_base/applications/tdenetworkmanager/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tdepacman/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdepacman/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tdepacman/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdepacman/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tdepacman/debian/rules b/debian/_base/applications/tdepacman/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/applications/tdepacman/debian/rules +++ b/debian/_base/applications/tdepacman/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tdepowersave/debian/rules b/debian/_base/applications/tdepowersave/debian/rules index d87f7f586..01e5357b6 100755 --- a/debian/_base/applications/tdepowersave/debian/rules +++ b/debian/_base/applications/tdepowersave/debian/rules @@ -4,18 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -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_INSTALL_DOCS_ALL := AUTHORS NEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/debian/_base/applications/tderadio/debian/rules b/debian/_base/applications/tderadio/debian/rules index 0dca2b923..4bef8d0a0 100755 --- a/debian/_base/applications/tderadio/debian/rules +++ b/debian/_base/applications/tderadio/debian/rules @@ -16,8 +16,15 @@ 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) +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +endif CFLAGS = -Wall -g diff --git a/debian/_base/applications/tdesudo/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdesudo/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tdesudo/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdesudo/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tdesudo/debian/rules b/debian/_base/applications/tdesudo/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/tdesudo/debian/rules +++ b/debian/_base/applications/tdesudo/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tdesvn/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdesvn/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tdesvn/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdesvn/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tdesvn/debian/rules b/debian/_base/applications/tdesvn/debian/rules index 7c91ce434..e56464216 100755 --- a/debian/_base/applications/tdesvn/debian/rules +++ b/debian/_base/applications/tdesvn/debian/rules @@ -32,9 +32,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -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/tdesvn-trinity:: # remove libsvnqt.so* from tdesvn-trinity - are included in libsvnqt4-trinity rm debian/$(cdbs_curpkg)/opt/trinity/lib*/libsvnqt.so* diff --git a/debian/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tdmtheme/debian/rules b/debian/_base/applications/tdmtheme/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/tdmtheme/debian/rules +++ b/debian/_base/applications/tdmtheme/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/tellico/debian/cdbs/debian-tde.mk b/debian/_base/applications/tellico/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tellico/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tellico/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tellico/debian/rules b/debian/_base/applications/tellico/debian/rules index 7b40ec99e..326e3e1c8 100755 --- a/debian/_base/applications/tellico/debian/rules +++ b/debian/_base/applications/tellico/debian/rules @@ -4,15 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -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) \ - --enable-new-ldflags \ - --enable-webcam - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -26,9 +17,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_MAKE_CHECK_TARGET = check -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - binary-install/tellico-data-trinity:: # Add svg icons to xdg directories admin/mkinstalldirs debian/$(cdbs_curpkg)/opt/trinity/share/icons/hicolor/scalable/apps diff --git a/debian/_base/applications/tork/debian/cdbs/debian-tde.mk b/debian/_base/applications/tork/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/tork/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tork/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/tork/debian/rules b/debian/_base/applications/tork/debian/rules index 4d427949d..e144721b9 100755 --- a/debian/_base/applications/tork/debian/rules +++ b/debian/_base/applications/tork/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk b/debian/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/twin-style-crystal/debian/rules b/debian/_base/applications/twin-style-crystal/debian/rules index e6f9d63ae..a204efb1b 100755 --- a/debian/_base/applications/twin-style-crystal/debian/rules +++ b/debian/_base/applications/twin-style-crystal/debian/rules @@ -12,9 +12,6 @@ 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/_base/applications/wlassistant/debian/cdbs/debian-tde.mk b/debian/_base/applications/wlassistant/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/wlassistant/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/wlassistant/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/wlassistant/debian/rules b/debian/_base/applications/wlassistant/debian/rules index 0abf76ac2..b9e54f6a9 100755 --- a/debian/_base/applications/wlassistant/debian/rules +++ b/debian/_base/applications/wlassistant/debian/rules @@ -31,6 +31,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -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) diff --git a/debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk b/debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/debian/_base/applications/yakuake/debian/rules b/debian/_base/applications/yakuake/debian/rules index 905d63101..a6797f19a 100755 --- a/debian/_base/applications/yakuake/debian/rules +++ b/debian/_base/applications/yakuake/debian/rules @@ -4,9 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ |