diff options
696 files changed, 4216 insertions, 1587 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" \ diff --git a/debian/_base/core/tde-i18n/debian/rules b/debian/_base/core/tde-i18n/debian/rules index ec0e5be5f..3ab71190d 100755 --- a/debian/_base/core/tde-i18n/debian/rules +++ b/debian/_base/core/tde-i18n/debian/rules @@ -25,6 +25,16 @@ 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 + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -34,9 +44,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DBUILD_ALL="ON" -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - build:: dh_testdir diff --git a/debian/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdeaccessibility/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/core/tdeaccessibility/debian/rules b/debian/_base/core/tdeaccessibility/debian/rules index 1b0ed7032..2748fa452 100755 --- a/debian/_base/core/tdeaccessibility/debian/rules +++ b/debian/_base/core/tdeaccessibility/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_MAKE_CHECK_TARGET = check DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/core/tdeaddons/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeaddons/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdeaddons/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdeaddons/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/core/tdeaddons/debian/rules b/debian/_base/core/tdeaddons/debian/rules index 6ddd2c0b1..51a0105bb 100755 --- a/debian/_base/core/tdeaddons/debian/rules +++ b/debian/_base/core/tdeaddons/debian/rules @@ -27,9 +27,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter binary-install/konq-plugins-trinity:: diff --git a/debian/_base/core/tdeadmin/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeadmin/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdeadmin/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdeadmin/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/core/tdeadmin/debian/rules b/debian/_base/core/tdeadmin/debian/rules index 692ea7674..21bc8b8ec 100755 --- a/debian/_base/core/tdeadmin/debian/rules +++ b/debian/_base/core/tdeadmin/debian/rules @@ -4,22 +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=tdeadmin-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - -DEB_CONFIGURE_EXTRA_FLAGS := \ - --without-rpm --with-pam=tde --with-shadow --with-nis \ - --with-private-groups --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/core/tdeartwork/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeartwork/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdeartwork/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdeartwork/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/core/tdeartwork/debian/rules b/debian/_base/core/tdeartwork/debian/rules index 753e97397..184b8d284 100755 --- a/debian/_base/core/tdeartwork/debian/rules +++ b/debian/_base/core/tdeartwork/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 := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -29,9 +20,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdeartwork-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - clean:: rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png diff --git a/debian/_base/core/tdebase/debian/cdbs/debian-tde.mk b/debian/_base/core/tdebase/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdebase/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdebase/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/core/tdebase/debian/rules b/debian/_base/core/tdebase/debian/rules index d64c87bc0..b91fc20f1 100755 --- a/debian/_base/core/tdebase/debian/rules +++ b/debian/_base/core/tdebase/debian/rules @@ -75,9 +75,6 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ diff --git a/debian/_base/core/tdebindings/debian/cdbs/debian-tde.mk b/debian/_base/core/tdebindings/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdebindings/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdebindings/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/core/tdebindings/debian/rules b/debian/_base/core/tdebindings/debian/rules index 5137ef2b8..fce67d163 100755 --- a/debian/_base/core/tdebindings/debian/rules +++ b/debian/_base/core/tdebindings/debian/rules @@ -35,9 +35,6 @@ DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/opt/trinity \ DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - # These are not all the packages with libraries, but only those that # need to be in DEB_SHLIBDEPS_INCLUDE... PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinity libkjsembed1-trinity diff --git a/debian/_base/core/tdeedu/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeedu/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdeedu/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdeedu/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/core/tdeedu/debian/rules b/debian/_base/core/tdeedu/debian/rules index fa6957b40..dc2f755ee 100755 --- a/debian/_base/core/tdeedu/debian/rules +++ b/debian/_base/core/tdeedu/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_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done) diff --git a/debian/_base/core/tdegames/debian/cdbs/debian-tde.mk b/debian/_base/core/tdegames/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdegames/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdegames/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/core/tdegames/debian/rules b/debian/_base/core/tdegames/debian/rules index 871437151..4d50a84a3 100755 --- a/debian/_base/core/tdegames/debian/rules +++ b/debian/_base/core/tdegames/debian/rules @@ -6,17 +6,8 @@ include debian/cdbs/debian-tde.mk export kde_bindir = /opt/trinity/games -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_KDE_APIDOX := yes -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -38,9 +29,6 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if DEB_INSTALL_CHANGELOGS_tdegames := $(DEB_SRCDIR)/ChangeLog -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity' DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V diff --git a/debian/_base/core/tdegraphics/debian/cdbs/debian-tde.mk b/debian/_base/core/tdegraphics/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdegraphics/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdegraphics/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/core/tdegraphics/debian/rules b/debian/_base/core/tdegraphics/debian/rules index 2ff13720d..d29cd5566 100755 --- a/debian/_base/core/tdegraphics/debian/rules +++ b/debian/_base/core/tdegraphics/debian/rules @@ -32,9 +32,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := kfaxview-trinity kghostview-trinity kpovmodeler-trinity ksvg-trinity \ kuickshow-trinity kview-trinity kviewshell-trinity libkscan1-trinity diff --git a/debian/_base/core/tdelibs/debian/cdbs/debian-tde.mk b/debian/_base/core/tdelibs/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdelibs/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdelibs/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/core/tdelibs/debian/rules b/debian/_base/core/tdelibs/debian/rules index 472231957..8292b5f73 100755 --- a/debian/_base/core/tdelibs/debian/rules +++ b/debian/_base/core/tdelibs/debian/rules @@ -70,9 +70,6 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdelibs-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - binary-install/tdelibs-data-trinity:: install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/tde-applications.menu install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf diff --git a/debian/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk b/debian/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdemultimedia/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/core/tdemultimedia/debian/rules b/debian/_base/core/tdemultimedia/debian/rules index 7234ee70e..ea08bafa0 100755 --- a/debian/_base/core/tdemultimedia/debian/rules +++ b/debian/_base/core/tdemultimedia/debian/rules @@ -4,20 +4,6 @@ include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/debhelper.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-alsa --with-arts-alsa \ - --with-extra-includes=/usr/include/speex:/opt/trinity/include/tde/arts \ - --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - # The include/tde/arts one should be temporary. See - # "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk. - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -38,9 +24,6 @@ DOC_HTML_PRUNE := kcontrol-trinity DEB_DH_STRIP_ARGS := --dbg-package=tdemultimedia-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-tdeio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \ libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \ libkcddb1-trinity mpeglib-trinity noatun-trinity diff --git a/debian/_base/core/tdenetwork/debian/cdbs/debian-tde.mk b/debian/_base/core/tdenetwork/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdenetwork/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdenetwork/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/core/tdenetwork/debian/rules b/debian/_base/core/tdenetwork/debian/rules index 0ab404480..98f81f81c 100755 --- a/debian/_base/core/tdenetwork/debian/rules +++ b/debian/_base/core/tdenetwork/debian/rules @@ -15,15 +15,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 := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -45,9 +36,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdenetwork-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/_base/core/tdepim/debian/cdbs/debian-tde.mk b/debian/_base/core/tdepim/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdepim/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdepim/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/core/tdepim/debian/rules b/debian/_base/core/tdepim/debian/rules index fef4fe2b9..f2de846ca 100755 --- a/debian/_base/core/tdepim/debian/rules +++ b/debian/_base/core/tdepim/debian/rules @@ -53,9 +53,6 @@ DEB_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - shlibs_ver=4:3.5.7 DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libtdenetwork2-trinity := -V'libtdenetwork2-trinity (>= $(shlibs_ver))' diff --git a/debian/_base/core/tdesdk/debian/cdbs/debian-tde.mk b/debian/_base/core/tdesdk/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdesdk/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdesdk/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/core/tdesdk/debian/rules b/debian/_base/core/tdesdk/debian/rules index b3ca7de94..d7be7d400 100755 --- a/debian/_base/core/tdesdk/debian/rules +++ b/debian/_base/core/tdesdk/debian/rules @@ -4,20 +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=tdesdk-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk b/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdetoys/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/core/tdetoys/debian/rules b/debian/_base/core/tdetoys/debian/rules index 50e0cee99..b8b2b309b 100755 --- a/debian/_base/core/tdetoys/debian/rules +++ b/debian/_base/core/tdetoys/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 := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -26,8 +17,5 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog DEB_INSTALL_CHANGELOGS_kteatime-trinity := kteatime/ChangeLog diff --git a/debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdeutils/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/core/tdeutils/debian/rules b/debian/_base/core/tdeutils/debian/rules index 413d87ff6..6014293b3 100755 --- a/debian/_base/core/tdeutils/debian/rules +++ b/debian/_base/core/tdeutils/debian/rules @@ -4,19 +4,10 @@ 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_KDE_APIDOX := yes DEB_INSTALL_CHANGELOGS_tdefilereplace-trinity := tdefilereplace/ChangeLog -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -41,9 +32,6 @@ DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trini DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/_base/core/tdevelop/debian/cdbs/debian-tde.mk b/debian/_base/core/tdevelop/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdevelop/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdevelop/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/core/tdevelop/debian/rules b/debian/_base/core/tdevelop/debian/rules index 5f91d36a7..833ff7ecc 100755 --- a/debian/_base/core/tdevelop/debian/rules +++ b/debian/_base/core/tdevelop/debian/rules @@ -13,55 +13,11 @@ 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=tdevelop-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := tdevelop-trinity DEB_KDE_APIDOX := yes -DEB_KDE_ENABLE_FINAL := -DEB_INSTALL_DOCS_tdevelop = AUTHORS -DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp -DEB_CONFIGURE_EXTRA_FLAGS := \ - --disable-debug \ - --enable-docbase \ - --enable-scripting \ - --enable-ada \ - --enable-bash \ - --enable-cpp \ - --enable-fortran \ - --enable-haskell \ - --enable-java \ - --enable-pascal \ - --enable-perl \ - --enable-php \ - --enable-python \ - --enable-ruby \ - --enable-sql \ - --enable-antproject \ - --enable-autoproject \ - --enable-customproject \ - --enable-genericproject \ - --enable-scriptproject \ - --enable-trollproject \ - --enable-cvs \ - --enable-vba \ - --enable-subversion \ - --with-pic \ - --with-tdelibsdoxy-dir=/opt/trinity/share/doc/tde/HTML/en/tdelibs-apidocs \ - --with-pythondir=/usr \ -# --with-qtdoc-dir=/usr/share/tqt3/doc/html \ - --prefix=/opt/trinity \ - --with-extra-libs=/opt/trinity/lib DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/debian/_base/core/tdewebdev/debian/cdbs/debian-tde.mk b/debian/_base/core/tdewebdev/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/core/tdewebdev/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdewebdev/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/core/tdewebdev/debian/rules b/debian/_base/core/tdewebdev/debian/rules index 192bba925..b839eb381 100755 --- a/debian/_base/core/tdewebdev/debian/rules +++ b/debian/_base/core/tdewebdev/debian/rules @@ -11,9 +11,6 @@ DEB_INSTALL_CHANGELOGS_quanta-trinity := quanta/ChangeLog DEB_DH_STRIP_ARGS := --dbg-package=tdewebdev-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := kommander-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/_base/dependencies/akode/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/akode/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/dependencies/akode/debian/cdbs/debian-tde.mk +++ b/debian/_base/dependencies/akode/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/dependencies/akode/debian/rules b/debian/_base/dependencies/akode/debian/rules index c912fbebf..d93e5d960 100755 --- a/debian/_base/dependencies/akode/debian/rules +++ b/debian/_base/dependencies/akode/debian/rules @@ -9,17 +9,12 @@ ifeq (linux,$(DEB_HOST_ARCH_OS)) DEB_DH_GENCONTROL_ARGS=-- -Valsa-dev=libasound2-dev endif -DEB_CONFIGURE_EXTRA_FLAGS := --without-libltdl --with-extra-includes=/usr/include/speex/ - DEB_DH_STRIP_ARGS := --dbg-package=akode-dbg PACKAGES_WITH_LIBS := libakode2 DEB_DH_MAKESHLIBS_ARGS_libakode2 := -V'libakode2 (>= 2-rc1-1)' -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/debian/_base/dependencies/arts/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/arts/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/dependencies/arts/debian/cdbs/debian-tde.mk +++ b/debian/_base/dependencies/arts/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/dependencies/arts/debian/rules b/debian/_base/dependencies/arts/debian/rules index 708852525..cc4893ca9 100755 --- a/debian/_base/dependencies/arts/debian/rules +++ b/debian/_base/dependencies/arts/debian/rules @@ -30,9 +30,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity DEB_DH_MAKESHLIBS_ARGS_ALL := -V @@ -50,4 +47,3 @@ binary-predeb/libarts1-trinity-dev:: ifeq (linux,$(DEB_HOST_ARCH_OS)) echo "libasound2-dev=libasound2-dev" >> debian/libarts1-trinity-dev.substvars endif - diff --git a/debian/_base/dependencies/avahi-tqt/debian/rules b/debian/_base/dependencies/avahi-tqt/debian/rules index 89f073b9f..42b7e8ec6 100755 --- a/debian/_base/dependencies/avahi-tqt/debian/rules +++ b/debian/_base/dependencies/avahi-tqt/debian/rules @@ -7,6 +7,16 @@ include /usr/share/cdbs/1/class/cmake.mk # symbols, and speed up loading. export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 +# 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 + # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ @@ -14,6 +24,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -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/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk +++ b/debian/_base/dependencies/dbus-1-tqt/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/dependencies/dbus-1-tqt/debian/rules b/debian/_base/dependencies/dbus-1-tqt/debian/rules index 00935ed3a..42417e634 100755 --- a/debian/_base/dependencies/dbus-1-tqt/debian/rules +++ b/debian/_base/dependencies/dbus-1-tqt/debian/rules @@ -6,9 +6,6 @@ include debian/cdbs/debian-tde.mk DEB_KDE_APIDOX := yes -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/debian/_base/dependencies/dbus-tqt/debian/rules b/debian/_base/dependencies/dbus-tqt/debian/rules index 71f625c30..ee5d0916d 100755 --- a/debian/_base/dependencies/dbus-tqt/debian/rules +++ b/debian/_base/dependencies/dbus-tqt/debian/rules @@ -11,5 +11,12 @@ include /usr/share/cdbs/1/class/cmake.mk # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V +# 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 diff --git a/debian/_base/dependencies/libart-lgpl/debian/rules b/debian/_base/dependencies/libart-lgpl/debian/rules index 86885792c..ab3beba75 100755 --- a/debian/_base/dependencies/libart-lgpl/debian/rules +++ b/debian/_base/dependencies/libart-lgpl/debian/rules @@ -7,8 +7,15 @@ libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:s DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' +# 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 # Build options DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk +++ b/debian/_base/dependencies/libcaldav/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/dependencies/libcaldav/debian/rules b/debian/_base/dependencies/libcaldav/debian/rules index bdcb3033c..e898aa6d2 100755 --- a/debian/_base/dependencies/libcaldav/debian/rules +++ b/debian/_base/dependencies/libcaldav/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) - ifdef DEB_HOST_MULTIARCH CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) else diff --git a/debian/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk +++ b/debian/_base/dependencies/libcarddav/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/dependencies/libcarddav/debian/rules b/debian/_base/dependencies/libcarddav/debian/rules index bdcb3033c..e898aa6d2 100755 --- a/debian/_base/dependencies/libcarddav/debian/rules +++ b/debian/_base/dependencies/libcarddav/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) - ifdef DEB_HOST_MULTIARCH CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) else diff --git a/debian/_base/dependencies/libr/debian/rules b/debian/_base/dependencies/libr/debian/rules index 808640608..2d7dda386 100755 --- a/debian/_base/dependencies/libr/debian/rules +++ b/debian/_base/dependencies/libr/debian/rules @@ -6,8 +6,15 @@ include /usr/share/cdbs/1/rules/utils.mk DEB_BUILD_PARALLEL ?= true +# 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 # Build options DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/dependencies/python-tqt/debian/rules b/debian/_base/dependencies/python-tqt/debian/rules index ba02eb70a..72a8d8dc0 100755 --- a/debian/_base/dependencies/python-tqt/debian/rules +++ b/debian/_base/dependencies/python-tqt/debian/rules @@ -3,8 +3,15 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# 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 export DH_OPTIONS diff --git a/debian/_base/dependencies/sip4-tqt/debian/rules b/debian/_base/dependencies/sip4-tqt/debian/rules index 71965fa31..1feb9c154 100755 --- a/debian/_base/dependencies/sip4-tqt/debian/rules +++ b/debian/_base/dependencies/sip4-tqt/debian/rules @@ -2,8 +2,15 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# 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 export DH_OPTIONS diff --git a/debian/_base/dependencies/tqca-tls/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/tqca-tls/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/dependencies/tqca-tls/debian/cdbs/debian-tde.mk +++ b/debian/_base/dependencies/tqca-tls/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/dependencies/tqca-tls/debian/rules b/debian/_base/dependencies/tqca-tls/debian/rules index 8c2dd70cc..d3e967902 100755 --- a/debian/_base/dependencies/tqca-tls/debian/rules +++ b/debian/_base/dependencies/tqca-tls/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/dependencies/tqca/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/tqca/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/dependencies/tqca/debian/cdbs/debian-tde.mk +++ b/debian/_base/dependencies/tqca/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/dependencies/tqca/debian/rules b/debian/_base/dependencies/tqca/debian/rules index ec48d0a8d..21df58b4f 100755 --- a/debian/_base/dependencies/tqca/debian/rules +++ b/debian/_base/dependencies/tqca/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) - ifdef DEB_HOST_MULTIARCH CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) else diff --git a/debian/_base/dependencies/tqscintilla/debian/rules b/debian/_base/dependencies/tqscintilla/debian/rules index 750a1294a..e87355584 100755 --- a/debian/_base/dependencies/tqscintilla/debian/rules +++ b/debian/_base/dependencies/tqscintilla/debian/rules @@ -5,8 +5,15 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# 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 # This is the debhelper compatibility version to use. export TQTDIR=/usr/share/tqt3 diff --git a/debian/_base/dependencies/tqt3/debian/rules b/debian/_base/dependencies/tqt3/debian/rules index dafa13359..ddc008924 100755 --- a/debian/_base/dependencies/tqt3/debian/rules +++ b/debian/_base/dependencies/tqt3/debian/rules @@ -11,8 +11,15 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +# 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_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) diff --git a/debian/_base/dependencies/tqtinterface/debian/rules b/debian/_base/dependencies/tqtinterface/debian/rules index 0700e9a39..fe114f5e8 100755 --- a/debian/_base/dependencies/tqtinterface/debian/rules +++ b/debian/_base/dependencies/tqtinterface/debian/rules @@ -12,17 +12,24 @@ version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -DEB_CMAKE_EXTRA_FLAGS := \ - -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo - +# 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 # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL ?= true DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/debian/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk b/debian/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk +++ b/debian/_base/libraries/kipi-plugins/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/libraries/kipi-plugins/debian/rules b/debian/_base/libraries/kipi-plugins/debian/rules index 0574b7052..33f9bcbd5 100755 --- a/debian/_base/libraries/kipi-plugins/debian/rules +++ b/debian/_base/libraries/kipi-plugins/debian/rules @@ -14,9 +14,6 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - clean :: rm -f po/*/*.gmo diff --git a/debian/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk +++ b/debian/_base/libraries/libkdcraw/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/libraries/libkdcraw/debian/rules b/debian/_base/libraries/libkdcraw/debian/rules index a6a45ead6..a5de48a38 100755 --- a/debian/_base/libraries/libkdcraw/debian/rules +++ b/debian/_base/libraries/libkdcraw/debian/rules @@ -15,9 +15,6 @@ DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - # add installed liblcms*-dev to libkdcraw3-trinity-dev depends common-binary-arch:: (dpkg --get-selections "liblcms*-dev" | awk '{split($$1, p, ":"); lcms=lcms p[1] ","} END { print "lcms-dev=" lcms}' >>debian/libkdcraw3-trinity-dev.substvars) diff --git a/debian/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk +++ b/debian/_base/libraries/libkexiv2/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/libraries/libkexiv2/debian/rules b/debian/_base/libraries/libkexiv2/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/libraries/libkexiv2/debian/rules +++ b/debian/_base/libraries/libkexiv2/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/libraries/libkipi/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libkipi/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/libraries/libkipi/debian/cdbs/debian-tde.mk +++ b/debian/_base/libraries/libkipi/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/libraries/libkipi/debian/rules b/debian/_base/libraries/libkipi/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/debian/_base/libraries/libkipi/debian/rules +++ b/debian/_base/libraries/libkipi/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/libraries/libksquirrel/debian/rules b/debian/_base/libraries/libksquirrel/debian/rules index 15f00b785..d761aa0a1 100755 --- a/debian/_base/libraries/libksquirrel/debian/rules +++ b/debian/_base/libraries/libksquirrel/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/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk +++ b/debian/_base/libraries/libtdeldap/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/libraries/libtdeldap/debian/rules b/debian/_base/libraries/libtdeldap/debian/rules index 65318dd0d..5a0da42af 100755 --- a/debian/_base/libraries/libtdeldap/debian/rules +++ b/debian/_base/libraries/libtdeldap/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/libraries/libtqt-perl/debian/rules b/debian/_base/libraries/libtqt-perl/debian/rules index 28a9c7817..c498ce8ca 100755 --- a/debian/_base/libraries/libtqt-perl/debian/rules +++ b/debian/_base/libraries/libtqt-perl/debian/rules @@ -31,8 +31,15 @@ DEB_MAKE_INSTALL_TARGET := install \ prefix=/usr \ DESTDIR=$(CURDIR)/debian/libtqt-perl +# 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 pre-build:: pre-build-stamp @@ -60,4 +67,3 @@ clean:: repair: for f in $(SAVERESTORE) ; do rm -f $$f ; cp -p ../orig/*/$$f $$f ; done - diff --git a/debian/_base/libraries/pytdeextensions/debian/rules b/debian/_base/libraries/pytdeextensions/debian/rules index 28a7627ba..a9c996c88 100755 --- a/debian/_base/libraries/pytdeextensions/debian/rules +++ b/debian/_base/libraries/pytdeextensions/debian/rules @@ -26,8 +26,15 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include +# 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/libraries/python-trinity/debian/rules b/debian/_base/libraries/python-trinity/debian/rules index a8bd862cd..ddbb6b15f 100755 --- a/debian/_base/libraries/python-trinity/debian/rules +++ b/debian/_base/libraries/python-trinity/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 # This has to be exported to make some magic below work. export DH_OPTIONS diff --git a/debian/_base/metapackages/meta-tde/debian/rules b/debian/_base/metapackages/meta-tde/debian/rules index a3fbf99a7..0b78bfadf 100755 --- a/debian/_base/metapackages/meta-tde/debian/rules +++ b/debian/_base/metapackages/meta-tde/debian/rules @@ -2,8 +2,15 @@ #export DH_VERBOSE=1 +# 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 configure: configure-stamp configure-stamp: diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/rules b/debian/_base/metapackages/redmond-default-settings-ii/debian/rules index b6386b0d8..2588d3623 100755 --- a/debian/_base/metapackages/redmond-default-settings-ii/debian/rules +++ b/debian/_base/metapackages/redmond-default-settings-ii/debian/rules @@ -23,5 +23,12 @@ 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 diff --git a/debian/_base/metapackages/redmond-default-settings/debian/rules b/debian/_base/metapackages/redmond-default-settings/debian/rules index b6386b0d8..2588d3623 100755 --- a/debian/_base/metapackages/redmond-default-settings/debian/rules +++ b/debian/_base/metapackages/redmond-default-settings/debian/rules @@ -23,5 +23,12 @@ 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 diff --git a/debian/_base/metapackages/sudo-trinity/debian/rules b/debian/_base/metapackages/sudo-trinity/debian/rules index e5e2870b7..a653797dd 100755 --- a/debian/_base/metapackages/sudo-trinity/debian/rules +++ b/debian/_base/metapackages/sudo-trinity/debian/rules @@ -7,8 +7,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 pre-build:: debian/stamp-distrospecific diff --git a/debian/_base/metapackages/synaptic-trinity/debian/rules b/debian/_base/metapackages/synaptic-trinity/debian/rules index 187d68f00..cdbceb7bb 100755 --- a/debian/_base/metapackages/synaptic-trinity/debian/rules +++ b/debian/_base/metapackages/synaptic-trinity/debian/rules @@ -5,8 +5,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) DISTRIBUTION := $(shell dpkg-parsechangelog | grep ^Distribution: | cut -d' ' -f2) +# 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 pre-build:: debian/stamp-distrospecific diff --git a/debian/_base/metapackages/trinity-apt-archive/debian/rules b/debian/_base/metapackages/trinity-apt-archive/debian/rules index fd65c8cd8..ccd4e20a8 100755 --- a/debian/_base/metapackages/trinity-apt-archive/debian/rules +++ b/debian/_base/metapackages/trinity-apt-archive/debian/rules @@ -5,8 +5,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) DISTRIBUTION := $(shell dpkg-parsechangelog | grep ^Distribution: | cut -d' ' -f2) +# 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 pre-build:: debian/stamp-distrospecific diff --git a/debian/_base/metapackages/trinity-keyring/debian/rules b/debian/_base/metapackages/trinity-keyring/debian/rules index 45de64142..467371dbf 100755 --- a/debian/_base/metapackages/trinity-keyring/debian/rules +++ b/debian/_base/metapackages/trinity-keyring/debian/rules @@ -5,8 +5,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) DISTRIBUTION := $(shell dpkg-parsechangelog | grep ^Distribution: | cut -d' ' -f2) +# 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 pre-build:: debian/stamp-distrospecific diff --git a/debian/_base/metapackages/trinity-slax/debian/rules b/debian/_base/metapackages/trinity-slax/debian/rules index 3591ab5e4..90b7eb173 100755 --- a/debian/_base/metapackages/trinity-slax/debian/rules +++ b/debian/_base/metapackages/trinity-slax/debian/rules @@ -2,5 +2,12 @@ include /usr/share/cdbs/1/rules/debhelper.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 diff --git a/dilos/core/tde-i18n/debian/rules b/dilos/core/tde-i18n/debian/rules index 0dcd42d26..0c61a9499 100755 --- a/dilos/core/tde-i18n/debian/rules +++ b/dilos/core/tde-i18n/debian/rules @@ -25,6 +25,16 @@ 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 + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ @@ -33,9 +43,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DBUILD_ALL="ON" -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - build:: dh_testdir diff --git a/dilos/core/tdeaccessibility/debian/cdbs/debian-tde.mk b/dilos/core/tdeaccessibility/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdeaccessibility/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeaccessibility/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/dilos/core/tdeaccessibility/debian/rules b/dilos/core/tdeaccessibility/debian/rules index bc84894ea..fd328cd5c 100755 --- a/dilos/core/tdeaccessibility/debian/rules +++ b/dilos/core/tdeaccessibility/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_DH_SHLIBDEPS_ARGS += --dpkg-shlibdeps-params=--ignore-missing-info #DEB_MAKE_CHECK_TARGET = check diff --git a/dilos/core/tdeaddons/debian/cdbs/debian-tde.mk b/dilos/core/tdeaddons/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdeaddons/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeaddons/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/dilos/core/tdeaddons/debian/rules b/dilos/core/tdeaddons/debian/rules index 5dcd64890..26b293475 100755 --- a/dilos/core/tdeaddons/debian/rules +++ b/dilos/core/tdeaddons/debian/rules @@ -29,9 +29,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg \ -Xnoatuntippecanoe.bin -Xnoatuntyler.bin -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter binary-install/konq-plugins-trinity:: diff --git a/dilos/core/tdeadmin/debian/cdbs/debian-tde.mk b/dilos/core/tdeadmin/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdeadmin/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeadmin/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/dilos/core/tdeadmin/debian/rules b/dilos/core/tdeadmin/debian/rules index a4ed03e16..f5bb91a19 100755 --- a/dilos/core/tdeadmin/debian/rules +++ b/dilos/core/tdeadmin/debian/rules @@ -13,9 +13,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=tdeadmin-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CONFIGURE_EXTRA_FLAGS := \ --without-rpm --with-pam=tde --with-shadow --with-nis \ --with-private-groups --prefix=/usr --with-extra-libs=/usr/lib diff --git a/dilos/core/tdeartwork/debian/cdbs/debian-tde.mk b/dilos/core/tdeartwork/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdeartwork/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeartwork/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/dilos/core/tdeartwork/debian/rules b/dilos/core/tdeartwork/debian/rules index 9ab3bb10e..91e06c45d 100755 --- a/dilos/core/tdeartwork/debian/rules +++ b/dilos/core/tdeartwork/debian/rules @@ -30,9 +30,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdeartwork-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - clean:: rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png diff --git a/dilos/core/tdebase/debian/cdbs/debian-tde.mk b/dilos/core/tdebase/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdebase/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdebase/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/dilos/core/tdebase/debian/rules b/dilos/core/tdebase/debian/rules index cefd28514..872a0adb4 100755 --- a/dilos/core/tdebase/debian/rules +++ b/dilos/core/tdebase/debian/rules @@ -92,9 +92,6 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg \ -Xtdm -Xtdm_config -Xtdm_greet -Xtdmctl -Xtwin -Xtwin_killer_helper \ -Xtwin_resumer_helper -Xtwin_rules_dialog -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ diff --git a/dilos/core/tdebindings/debian/cdbs/debian-tde.mk b/dilos/core/tdebindings/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdebindings/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdebindings/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/dilos/core/tdebindings/debian/rules b/dilos/core/tdebindings/debian/rules index 17017df93..a43bbff91 100755 --- a/dilos/core/tdebindings/debian/rules +++ b/dilos/core/tdebindings/debian/rules @@ -41,9 +41,6 @@ DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/usr \ DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - # These are not all the packages with libraries, but only those that # need to be in DEB_SHLIBDEPS_INCLUDE... PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinity libkjsembed1-trinity diff --git a/dilos/core/tdeedu/debian/cdbs/debian-tde.mk b/dilos/core/tdeedu/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdeedu/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeedu/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/dilos/core/tdeedu/debian/rules b/dilos/core/tdeedu/debian/rules index 879189e68..81cc9531c 100755 --- a/dilos/core/tdeedu/debian/rules +++ b/dilos/core/tdeedu/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_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done) diff --git a/dilos/core/tdegames/debian/cdbs/debian-tde.mk b/dilos/core/tdegames/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdegames/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdegames/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/dilos/core/tdegames/debian/rules b/dilos/core/tdegames/debian/rules index 89de5184e..3a310cdd3 100755 --- a/dilos/core/tdegames/debian/rules +++ b/dilos/core/tdegames/debian/rules @@ -39,9 +39,6 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if DEB_INSTALL_CHANGELOGS_tdegames := $(DEB_SRCDIR)/ChangeLog -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity' DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V diff --git a/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk b/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdegraphics/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/dilos/core/tdegraphics/debian/rules b/dilos/core/tdegraphics/debian/rules index 2f0c68797..316afdc09 100755 --- a/dilos/core/tdegraphics/debian/rules +++ b/dilos/core/tdegraphics/debian/rules @@ -35,9 +35,6 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg \ -Xkcm_kgamma.so -Xxf86gammacfg -Xlibtext2path.so.0.0.0 \ -Xlibksvgrendererlibart.so -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := kfaxview-trinity kghostview-trinity kpovmodeler-trinity ksvg-trinity \ kuickshow-trinity kview-trinity kviewshell-trinity libkscan1-trinity diff --git a/dilos/core/tdelibs/debian/cdbs/debian-tde.mk b/dilos/core/tdelibs/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdelibs/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdelibs/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/dilos/core/tdelibs/debian/rules b/dilos/core/tdelibs/debian/rules index f90cbfccb..a463caa48 100755 --- a/dilos/core/tdelibs/debian/rules +++ b/dilos/core/tdelibs/debian/rules @@ -143,9 +143,6 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdelibs-trinity-dbg \ -Xtdeconfig_compiler -Xmaketdewidgets -Xksvgtopng -Xdcopidl2cpp \ -Xtdeunittestmodrunner -Xdcopidl -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - binary-install/tdelibs-data-trinity:: install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/usr/etc/xdg/menus/tde-applications.menu # install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf diff --git a/dilos/core/tdemultimedia/debian/cdbs/debian-tde.mk b/dilos/core/tdemultimedia/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdemultimedia/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdemultimedia/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/dilos/core/tdemultimedia/debian/rules b/dilos/core/tdemultimedia/debian/rules index 9bad258cc..8268b72fe 100755 --- a/dilos/core/tdemultimedia/debian/rules +++ b/dilos/core/tdemultimedia/debian/rules @@ -54,9 +54,6 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdemultimedia-trinity-dbg \ -Xlibnoatun.so.1.2.0 -Xlibartseffects.so -Xlibnoatuntags.so.1.2.0 \ -Xlibwinskinvis.so -Xlibnoatunarts.so -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-tdeio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \ libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \ libkcddb1-trinity mpeglib-trinity noatun-trinity diff --git a/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk b/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdenetwork/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/dilos/core/tdenetwork/debian/rules b/dilos/core/tdenetwork/debian/rules index d3c37e3e5..e9f4726f1 100755 --- a/dilos/core/tdenetwork/debian/rules +++ b/dilos/core/tdenetwork/debian/rules @@ -51,9 +51,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdenetwork-trinity-dbg \ -Xkrfb -Xktalkd -Xlisa -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/dilos/core/tdepim/debian/cdbs/debian-tde.mk b/dilos/core/tdepim/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdepim/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdepim/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/dilos/core/tdepim/debian/rules b/dilos/core/tdepim/debian/rules index 8a0aa8bbf..06c6e701d 100755 --- a/dilos/core/tdepim/debian/rules +++ b/dilos/core/tdepim/debian/rules @@ -56,9 +56,6 @@ DEB_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - shlibs_ver=4:3.5.7 DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libtdenetwork2-trinity := -V'libtdenetwork2-trinity (>= $(shlibs_ver))' diff --git a/dilos/core/tdesdk/debian/cdbs/debian-tde.mk b/dilos/core/tdesdk/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdesdk/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdesdk/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/dilos/core/tdesdk/debian/rules b/dilos/core/tdesdk/debian/rules index 200e82ca1..5aafe0e4e 100755 --- a/dilos/core/tdesdk/debian/rules +++ b/dilos/core/tdesdk/debian/rules @@ -13,9 +13,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=tdesdk-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr --with-extra-libs=/usr/lib DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/dilos/core/tdetoys/debian/cdbs/debian-tde.mk b/dilos/core/tdetoys/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdetoys/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdetoys/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/dilos/core/tdetoys/debian/rules b/dilos/core/tdetoys/debian/rules index 38387f6fc..9218ed39b 100755 --- a/dilos/core/tdetoys/debian/rules +++ b/dilos/core/tdetoys/debian/rules @@ -27,8 +27,5 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog DEB_INSTALL_CHANGELOGS_kteatime-trinity := kteatime/ChangeLog diff --git a/dilos/core/tdeutils/debian/cdbs/debian-tde.mk b/dilos/core/tdeutils/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdeutils/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeutils/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/dilos/core/tdeutils/debian/rules b/dilos/core/tdeutils/debian/rules index 6ba4eecaf..1743d5d67 100755 --- a/dilos/core/tdeutils/debian/rules +++ b/dilos/core/tdeutils/debian/rules @@ -44,9 +44,6 @@ DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trini DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/dilos/core/tdevelop/debian/cdbs/debian-tde.mk b/dilos/core/tdevelop/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdevelop/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdevelop/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/dilos/core/tdevelop/debian/rules b/dilos/core/tdevelop/debian/rules index 585d69ab9..962168f89 100755 --- a/dilos/core/tdevelop/debian/rules +++ b/dilos/core/tdevelop/debian/rules @@ -13,56 +13,12 @@ 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 := /usr/include -DEB_CONFIGURE_MANDIR := /usr/share/man -DEB_CONFIGURE_PREFIX := /usr -DEB_CONFIGURE_INFODIR := /usr/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=tdevelop-trinity-dbg \ -Xlibkdevcppparser.so.0.0.0 -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := tdevelop-trinity DEB_KDE_APIDOX := yes -DEB_KDE_ENABLE_FINAL := -DEB_INSTALL_DOCS_tdevelop = AUTHORS -DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp -DEB_CONFIGURE_EXTRA_FLAGS := \ - --disable-debug \ - --enable-docbase \ - --enable-scripting \ - --enable-ada \ - --enable-bash \ - --enable-cpp \ - --enable-fortran \ - --enable-haskell \ - --enable-java \ - --enable-pascal \ - --enable-perl \ - --enable-php \ - --enable-python \ - --enable-ruby \ - --enable-sql \ - --enable-antproject \ - --enable-autoproject \ - --enable-customproject \ - --enable-genericproject \ - --enable-scriptproject \ - --enable-trollproject \ - --enable-cvs \ - --enable-vba \ - --enable-subversion \ - --with-pic \ - --with-tdelibsdoxy-dir=/usr/share/doc/tde/HTML/en/tdelibs-apidocs \ - --with-pythondir=/usr \ -# --with-qtdoc-dir=/usr/share/tqt3/doc/html \ - --prefix=/usr \ - --with-extra-libs=/usr/lib/$(DEB_HOST_MULTIARCH) DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_INSTALL_PREFIX="/usr" \ diff --git a/dilos/dependencies/arts/debian/cdbs/debian-tde.mk b/dilos/dependencies/arts/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/dependencies/arts/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/arts/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/dilos/dependencies/arts/debian/rules b/dilos/dependencies/arts/debian/rules index f7707d9dc..a81635c90 100755 --- a/dilos/dependencies/arts/debian/rules +++ b/dilos/dependencies/arts/debian/rules @@ -37,9 +37,6 @@ DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg \ -Xlibmcop.so.1.0.0 -Xlibqtmcop.so.1.0.0 -Xartsplay -Xartsd -Xartscat \ -Xartsshell -Xartsrec -Xmcopidl -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity DEB_DH_MAKESHLIBS_ARGS_ALL := -V @@ -57,4 +54,3 @@ binary-predeb/libarts1-trinity-dev:: ifeq (linux,$(DEB_HOST_ARCH_OS)) echo "libasound2-dev=libasound2-dev" >> debian/libarts1-trinity-dev.substvars endif - diff --git a/dilos/dependencies/avahi-tqt/debian/rules b/dilos/dependencies/avahi-tqt/debian/rules index 5607222dc..0ecbf4f4d 100755 --- a/dilos/dependencies/avahi-tqt/debian/rules +++ b/dilos/dependencies/avahi-tqt/debian/rules @@ -8,6 +8,16 @@ include /usr/share/cdbs/1/class/cmake.mk export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs # -Wl,-O1 +# 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 + # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ @@ -17,6 +27,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_C_COMPILER=gcc \ -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \ -DWITH_GCC_VISIBILITY="OFF" - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) diff --git a/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk b/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/dbus-1-tqt/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/dilos/dependencies/dbus-1-tqt/debian/rules b/dilos/dependencies/dbus-1-tqt/debian/rules index 1c6828deb..b3168b872 100755 --- a/dilos/dependencies/dbus-1-tqt/debian/rules +++ b/dilos/dependencies/dbus-1-tqt/debian/rules @@ -6,9 +6,6 @@ include debian/cdbs/debian-tde.mk DEB_KDE_APIDOX := yes -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ diff --git a/dilos/dependencies/dbus-tqt/debian/rules b/dilos/dependencies/dbus-tqt/debian/rules index 72d93bde7..97cc52a52 100755 --- a/dilos/dependencies/dbus-tqt/debian/rules +++ b/dilos/dependencies/dbus-tqt/debian/rules @@ -11,8 +11,16 @@ include /usr/share/cdbs/1/class/cmake.mk # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V +# 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_C_COMPILER=gcc \ +DEB_CMAKE_EXTRA_FLAGS += \ + -DCMAKE_C_COMPILER=gcc \ -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" diff --git a/dilos/dependencies/libart-lgpl/debian/rules b/dilos/dependencies/libart-lgpl/debian/rules index 5dc31486b..27c129c80 100755 --- a/dilos/dependencies/libart-lgpl/debian/rules +++ b/dilos/dependencies/libart-lgpl/debian/rules @@ -7,8 +7,15 @@ libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:s DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' +# 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 # Build options DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/dilos/dependencies/python-tqt/debian/rules b/dilos/dependencies/python-tqt/debian/rules index 80583cdeb..0056ca307 100755 --- a/dilos/dependencies/python-tqt/debian/rules +++ b/dilos/dependencies/python-tqt/debian/rules @@ -5,8 +5,15 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +# 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 export DH_OPTIONS diff --git a/dilos/dependencies/sip4-tqt/debian/rules b/dilos/dependencies/sip4-tqt/debian/rules index 35d23b4cb..9fd544a5a 100755 --- a/dilos/dependencies/sip4-tqt/debian/rules +++ b/dilos/dependencies/sip4-tqt/debian/rules @@ -2,8 +2,15 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# 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 export DH_OPTIONS diff --git a/dilos/dependencies/tqca-tls/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqca-tls/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..4dd4698a4 --- /dev/null +++ b/dilos/dependencies/tqca-tls/debian/cdbs/debian-tde.mk @@ -0,0 +1,237 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$(DEB_HOST_MULTIARCH)) + +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))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/usr/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \ + /usr/bin/meinproc $(DEB_DESTDIR)/usr/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/dilos/dependencies/tqca-tls/debian/cdbs/versions.pl b/dilos/dependencies/tqca-tls/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/dilos/dependencies/tqca-tls/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/dilos/dependencies/tqca-tls/debian/control b/dilos/dependencies/tqca-tls/debian/control index 894c11225..121896f37 100644 --- a/dilos/dependencies/tqca-tls/debian/control +++ b/dilos/dependencies/tqca-tls/debian/control @@ -2,7 +2,7 @@ Source: tqca-tls Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), libtqtinterface-dev, libssl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libtqca-dev, libssl-dev Standards-Version: 3.8.4 Package: tqca-tls diff --git a/dilos/dependencies/tqca-tls/debian/rules b/dilos/dependencies/tqca-tls/debian/rules index 2f09fdf35..fe21ca438 100755 --- a/dilos/dependencies/tqca-tls/debian/rules +++ b/dilos/dependencies/tqca-tls/debian/rules @@ -1,120 +1,23 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +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) - - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - - -#CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) else - CFLAGS += -O2 + CMAKE_INSTALL_LIBDIR = lib endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" ./configure - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - rm -rf .ui .moc .obj Makefile conf.log conf.pri extra.pri - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # update multi-arch path in install files - for a in debian/*install; do \ - [ -d $$a ] || [ -f $$a.arch ] || \ - sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ - done - - # Add here commands to install the package into debian/tmp - $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp/ - [ -e $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/crypto/libtqca-tls.so ] || ( echo "libtqca-tls.so not in usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/crypto/libtqca-tls.so" && exit 1 ) - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_install --sourcedir=debian/tmp --list-missing -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb - dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info - dh_gencontrol - dh_md5sums - dh_builddeb $(DEB_DH_BUILDDEB_ARGS) -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/dilos/dependencies/tqca-tls/debian/tqca-tls.install b/dilos/dependencies/tqca-tls/debian/tqca-tls.install deleted file mode 100644 index 82bd1ecad..000000000 --- a/dilos/dependencies/tqca-tls/debian/tqca-tls.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/amd64/tqt3/plugins/crypto/* diff --git a/dilos/dependencies/tqca-tls/debian/tqca-tls.install.arch b/dilos/dependencies/tqca-tls/debian/tqca-tls.install.arch deleted file mode 100644 index bf57d3931..000000000 --- a/dilos/dependencies/tqca-tls/debian/tqca-tls.install.arch +++ /dev/null @@ -1 +0,0 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/crypto/* diff --git a/dilos/dependencies/tqca/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqca/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..4dd4698a4 --- /dev/null +++ b/dilos/dependencies/tqca/debian/cdbs/debian-tde.mk @@ -0,0 +1,237 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$(DEB_HOST_MULTIARCH)) + +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))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/usr/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \ + /usr/bin/meinproc $(DEB_DESTDIR)/usr/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/dilos/dependencies/tqca/debian/cdbs/versions.pl b/dilos/dependencies/tqca/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/dilos/dependencies/tqca/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/dilos/dependencies/tqca/debian/changelog b/dilos/dependencies/tqca/debian/changelog new file mode 100644 index 000000000..728ba7754 --- /dev/null +++ b/dilos/dependencies/tqca/debian/changelog @@ -0,0 +1,5 @@ +libtqca (4:14.1.0~s3-0debian10.0.0+0) buster; urgency=low + + * Initial git build + + -- Slávek Banko <slavek.banko@axis.cz> Fri, 03 Jan 2020 14:50:41 +0100 diff --git a/dilos/dependencies/tqca/debian/compat b/dilos/dependencies/tqca/debian/compat new file mode 100644 index 000000000..ec635144f --- /dev/null +++ b/dilos/dependencies/tqca/debian/compat @@ -0,0 +1 @@ +9 diff --git a/dilos/dependencies/tqca/debian/control b/dilos/dependencies/tqca/debian/control new file mode 100644 index 000000000..4b5fdb7cb --- /dev/null +++ b/dilos/dependencies/tqca/debian/control @@ -0,0 +1,25 @@ +Source: libtqca +Section: libs +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libtqtinterface-dev +Standards-Version: 3.8.3 + +Package: libtqca +Architecture: any +Multi-Arch: same +Section: libs +Depends: ${shlibs:Depends} +Description: + libtqca provides TQt interface for security plugins + +Package: libtqca-dev +Architecture: any +Multi-Arch: foreign +Section: libdevel +Depends: libtqca (= ${binary:Version}), libtqtinterface-dev +Description: + libtqca provides TQt interface for security plugins + . + This is the development package containing header files and link + libraries for libtqca. diff --git a/dilos/dependencies/tqca/debian/copyright b/dilos/dependencies/tqca/debian/copyright new file mode 100644 index 000000000..4cc18ef1e --- /dev/null +++ b/dilos/dependencies/tqca/debian/copyright @@ -0,0 +1,12 @@ +This package was debianized by Slávek Banko <slavek.banko@axis.cz> + +Copyright: + +Copyright 2003 Justin Karneges <justin@affinix.com> +Copyright 2010-2020 TDE Team + +License: + +All libraries in this package are released under the GPL +(/usr/share/common-licenses/GPL-3). The programs and examples are +under the GPL (/usr/share/common-licenses/GPL). diff --git a/dilos/dependencies/tqca/debian/libtqca-dev.install b/dilos/dependencies/tqca/debian/libtqca-dev.install new file mode 100644 index 000000000..c8926e8cd --- /dev/null +++ b/dilos/dependencies/tqca/debian/libtqca-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/tqt3/* +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libtqca.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libtqca.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/* diff --git a/dilos/dependencies/tqca/debian/libtqca.install b/dilos/dependencies/tqca/debian/libtqca.install new file mode 100644 index 000000000..f9fa13568 --- /dev/null +++ b/dilos/dependencies/tqca/debian/libtqca.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libtqca.so.* diff --git a/dilos/dependencies/tqca/debian/rules b/dilos/dependencies/tqca/debian/rules new file mode 100755 index 000000000..21df58b4f --- /dev/null +++ b/dilos/dependencies/tqca/debian/rules @@ -0,0 +1,19 @@ +#! /usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk + +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) +else + CMAKE_INSTALL_LIBDIR = lib +endif + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ + -DWITH_ALL_OPTIONS="ON" diff --git a/dilos/dependencies/tqca/debian/source/format b/dilos/dependencies/tqca/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/dilos/dependencies/tqca/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/dilos/dependencies/tqca/debian/source/options b/dilos/dependencies/tqca/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/dilos/dependencies/tqca/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/dilos/dependencies/tqscintilla/debian/rules b/dilos/dependencies/tqscintilla/debian/rules index 57c2c87b3..14545306f 100755 --- a/dilos/dependencies/tqscintilla/debian/rules +++ b/dilos/dependencies/tqscintilla/debian/rules @@ -5,8 +5,15 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# 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_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) diff --git a/dilos/dependencies/tqt3/debian/rules b/dilos/dependencies/tqt3/debian/rules index 9d5ad6548..9b6c34f78 100755 --- a/dilos/dependencies/tqt3/debian/rules +++ b/dilos/dependencies/tqt3/debian/rules @@ -11,8 +11,15 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +# 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_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) diff --git a/dilos/dependencies/tqtinterface/debian/rules b/dilos/dependencies/tqtinterface/debian/rules index 029a66871..1fab67240 100755 --- a/dilos/dependencies/tqtinterface/debian/rules +++ b/dilos/dependencies/tqtinterface/debian/rules @@ -12,20 +12,27 @@ version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -DEB_CMAKE_EXTRA_FLAGS := \ - -DPKGCONFIG_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_LIBRARY_PATH="/usr/lib/$(DEB_HOST_MULTIARCH)" \ - -DLIB_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)" \ - -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_C_COMPILER=gcc - +# 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 # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL ?= true DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) + +DEB_CMAKE_EXTRA_FLAGS := \ + -DPKGCONFIG_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig" \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_LIBRARY_PATH="/usr/lib/$(DEB_HOST_MULTIARCH)" \ + -DLIB_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_C_COMPILER=gcc diff --git a/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk +++ b/dilos/libraries/libtdeldap/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/dilos/libraries/libtdeldap/debian/rules b/dilos/libraries/libtdeldap/debian/rules index c6352b9b1..967f58705 100755 --- a/dilos/libraries/libtdeldap/debian/rules +++ b/dilos/libraries/libtdeldap/debian/rules @@ -9,9 +9,6 @@ DEB_CONFIGURE_MANDIR := /usr/share/man DEB_CONFIGURE_PREFIX := /usr DEB_CONFIGURE_INFODIR := /usr/share/info -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - CPPFLAGS+= -D__dilos__ DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/dilos/libraries/pytdeextensions/debian/rules b/dilos/libraries/pytdeextensions/debian/rules index fe8947bec..009b362ca 100755 --- a/dilos/libraries/pytdeextensions/debian/rules +++ b/dilos/libraries/pytdeextensions/debian/rules @@ -30,8 +30,15 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr --with-extra-libs=/usr/lib/$(DEB_HOST_MULTIARCH) --with-extra-includes=/usr/include +# 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/dilos/libraries/python-trinity/debian/rules b/dilos/libraries/python-trinity/debian/rules index 34532b767..3bae8384b 100755 --- a/dilos/libraries/python-trinity/debian/rules +++ b/dilos/libraries/python-trinity/debian/rules @@ -13,8 +13,15 @@ DEB_CONFIGURE_INFODIR := /usr/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 # This has to be exported to make some magic below work. export DH_OPTIONS diff --git a/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/abakus/debian/rules b/ubuntu/_base/applications/abakus/debian/rules index d5221b39b..a9d88368b 100755 --- a/ubuntu/_base/applications/abakus/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/amarok/debian/rules b/ubuntu/_base/applications/amarok/debian/rules index 75146ddca..fce2f7d4a 100755 --- a/ubuntu/_base/applications/amarok/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/basket/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/basket/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/basket/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/basket/debian/rules b/ubuntu/_base/applications/basket/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/basket/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/bibletime/debian/rules b/ubuntu/_base/applications/bibletime/debian/rules index e15345749..430b47715 100755 --- a/ubuntu/_base/applications/bibletime/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/codeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/codeine/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/codeine/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/codeine/debian/rules b/ubuntu/_base/applications/codeine/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/codeine/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/rules b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/desktop-effects-tde/debian/rules b/ubuntu/_base/applications/desktop-effects-tde/debian/rules index 41ad63be2..eef8add16 100755 --- a/ubuntu/_base/applications/desktop-effects-tde/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/digikam/debian/rules b/ubuntu/_base/applications/digikam/debian/rules index 32d9653f6..99e80d2fc 100755 --- a/ubuntu/_base/applications/digikam/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/dolphin/debian/rules b/ubuntu/_base/applications/dolphin/debian/rules index 8d28bb5ba..ec74e914d 100755 --- a/ubuntu/_base/applications/dolphin/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/filelight/debian/rules b/ubuntu/_base/applications/filelight/debian/rules index d9ef0cae3..7bc15fb33 100755 --- a/ubuntu/_base/applications/filelight/debian/rules +++ b/ubuntu/_base/applications/filelight/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 -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - DEB_DH_ALWAYS_EXCLUDE=.svn # Build options @@ -26,6 +21,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/ubuntu/_base/applications/fusion-icon/debian/rules b/ubuntu/_base/applications/fusion-icon/debian/rules index 46359aca2..a0c6906dd 100755 --- a/ubuntu/_base/applications/fusion-icon/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/gtk-qt-engine/debian/rules b/ubuntu/_base/applications/gtk-qt-engine/debian/rules index 23c51fe19..8f250b682 100755 --- a/ubuntu/_base/applications/gtk-qt-engine/debian/rules +++ b/ubuntu/_base/applications/gtk-qt-engine/debian/rules @@ -13,15 +13,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 - -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 := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DLIB_SUFFIX="" \ @@ -36,9 +27,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/ubuntu/_base/applications/gtk3-tqt-engine/debian/rules b/ubuntu/_base/applications/gtk3-tqt-engine/debian/rules index 272168641..1a185d594 100755 --- a/ubuntu/_base/applications/gtk3-tqt-engine/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/gwenview-i18n/debian/rules b/ubuntu/_base/applications/gwenview-i18n/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/gwenview-i18n/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/gwenview/debian/rules b/ubuntu/_base/applications/gwenview/debian/rules index 82a7598cb..4f8a32879 100755 --- a/ubuntu/_base/applications/gwenview/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/k3b-i18n/debian/rules b/ubuntu/_base/applications/k3b-i18n/debian/rules index 3187f4385..440fce6c1 100755 --- a/ubuntu/_base/applications/k3b-i18n/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/k3b/debian/rules b/ubuntu/_base/applications/k3b/debian/rules index 12173a7e4..72db8e489 100755 --- a/ubuntu/_base/applications/k3b/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/k9copy/debian/rules b/ubuntu/_base/applications/k9copy/debian/rules index d68281794..aca7b475b 100755 --- a/ubuntu/_base/applications/k9copy/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kaffeine-mozilla/debian/rules b/ubuntu/_base/applications/kaffeine-mozilla/debian/rules index 806642cbf..edb9f2f68 100755 --- a/ubuntu/_base/applications/kaffeine-mozilla/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kaffeine/debian/rules b/ubuntu/_base/applications/kaffeine/debian/rules index 76edc3a0d..a6797f19a 100755 --- a/ubuntu/_base/applications/kaffeine/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kasablanca/debian/rules b/ubuntu/_base/applications/kasablanca/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/kasablanca/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/katapult/debian/rules b/ubuntu/_base/applications/katapult/debian/rules index ebb9ea16b..74e4fb499 100755 --- a/ubuntu/_base/applications/katapult/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kbarcode/debian/rules b/ubuntu/_base/applications/kbarcode/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/kbarcode/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kbfx/debian/rules b/ubuntu/_base/applications/kbfx/debian/rules index aa3fc3652..bb4d9b898 100755 --- a/ubuntu/_base/applications/kbfx/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kbibtex/debian/rules b/ubuntu/_base/applications/kbibtex/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/kbibtex/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kbiff/debian/rules b/ubuntu/_base/applications/kbiff/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kbiff/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kbookreader/debian/rules b/ubuntu/_base/applications/kbookreader/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kbookreader/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kchmviewer/debian/rules b/ubuntu/_base/applications/kchmviewer/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/kchmviewer/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kcmautostart/debian/rules b/ubuntu/_base/applications/kcmautostart/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kcmautostart/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kcmldap/debian/rules b/ubuntu/_base/applications/kcmldap/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kcmldap/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kcmldapcontroller/debian/rules b/ubuntu/_base/applications/kcmldapcontroller/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/kcmldapcontroller/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kcmldapmanager/debian/rules b/ubuntu/_base/applications/kcmldapmanager/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/kcmldapmanager/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kcpuload/debian/rules b/ubuntu/_base/applications/kcpuload/debian/rules index 894ebb8b3..f39393c74 100755 --- a/ubuntu/_base/applications/kcpuload/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kdbg/debian/rules b/ubuntu/_base/applications/kdbg/debian/rules index 91bb7058b..4bac98821 100755 --- a/ubuntu/_base/applications/kdbg/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kdbusnotification/debian/rules b/ubuntu/_base/applications/kdbusnotification/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/kdbusnotification/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kdiff3/debian/rules b/ubuntu/_base/applications/kdiff3/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kdiff3/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kdirstat/debian/rules b/ubuntu/_base/applications/kdirstat/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kdirstat/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kdpkg/debian/rules b/ubuntu/_base/applications/kdpkg/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/kdpkg/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/keep/debian/rules b/ubuntu/_base/applications/keep/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/keep/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kerberostray/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kerberostray/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kerberostray/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kerberostray/debian/rules b/ubuntu/_base/applications/kerberostray/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/kerberostray/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/keximdb/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/keximdb/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/keximdb/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/keximdb/debian/rules b/ubuntu/_base/applications/keximdb/debian/rules index 79eb6aada..72db8e489 100755 --- a/ubuntu/_base/applications/keximdb/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kftpgrabber/debian/rules b/ubuntu/_base/applications/kftpgrabber/debian/rules index c4ea6503a..8292bc38c 100755 --- a/ubuntu/_base/applications/kftpgrabber/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kgtk-qt3/debian/rules b/ubuntu/_base/applications/kgtk-qt3/debian/rules index 6c50cfb9e..f1aa52d1c 100755 --- a/ubuntu/_base/applications/kgtk-qt3/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kile/debian/rules b/ubuntu/_base/applications/kile/debian/rules index 30a48733b..bd5478578 100755 --- a/ubuntu/_base/applications/kile/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kima/debian/rules b/ubuntu/_base/applications/kima/debian/rules index 28412bc9d..7ae24f493 100755 --- a/ubuntu/_base/applications/kima/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kiosktool/debian/rules b/ubuntu/_base/applications/kiosktool/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kiosktool/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kkbswitch/debian/rules b/ubuntu/_base/applications/kkbswitch/debian/rules index cce9eac4c..0f666b3ca 100755 --- a/ubuntu/_base/applications/kkbswitch/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/klamav/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/klamav/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/klamav/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/klamav/debian/rules b/ubuntu/_base/applications/klamav/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/klamav/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/klcddimmer/debian/rules b/ubuntu/_base/applications/klcddimmer/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/klcddimmer/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kmplayer/debian/rules b/ubuntu/_base/applications/kmplayer/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kmplayer/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kmyfirewall/debian/rules b/ubuntu/_base/applications/kmyfirewall/debian/rules index a12bd0357..8b7e87e26 100755 --- a/ubuntu/_base/applications/kmyfirewall/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kmymoney/debian/rules b/ubuntu/_base/applications/kmymoney/debian/rules index 10490c3e4..0f794b445 100755 --- a/ubuntu/_base/applications/kmymoney/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/knetload/debian/rules b/ubuntu/_base/applications/knetload/debian/rules index 65318dd0d..5a0da42af 100755 --- a/ubuntu/_base/applications/knetload/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/knetstats/debian/rules b/ubuntu/_base/applications/knetstats/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/knetstats/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/knetworkmanager8/debian/rules b/ubuntu/_base/applications/knetworkmanager8/debian/rules index 1b87e9c65..d38592f45 100755 --- a/ubuntu/_base/applications/knetworkmanager8/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/knights/debian/rules b/ubuntu/_base/applications/knights/debian/rules index 2b56aa5de..01a4fb689 100755 --- a/ubuntu/_base/applications/knights/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/knmap/debian/rules b/ubuntu/_base/applications/knmap/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/knmap/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/knowit/debian/rules b/ubuntu/_base/applications/knowit/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/knowit/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/knutclient/debian/rules b/ubuntu/_base/applications/knutclient/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/knutclient/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/koffice-i18n/debian/rules b/ubuntu/_base/applications/koffice-i18n/debian/rules index 00a275f9e..8fb58ece9 100755 --- a/ubuntu/_base/applications/koffice-i18n/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/koffice/debian/rules b/ubuntu/_base/applications/koffice/debian/rules index b6505406b..397783a27 100755 --- a/ubuntu/_base/applications/koffice/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/konversation/debian/rules b/ubuntu/_base/applications/konversation/debian/rules index 13de3bade..61fe9b5c9 100755 --- a/ubuntu/_base/applications/konversation/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kooldock/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kooldock/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kooldock/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kooldock/debian/rules b/ubuntu/_base/applications/kooldock/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/kooldock/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kopete-otr/debian/rules b/ubuntu/_base/applications/kopete-otr/debian/rules index ef86fcc91..205e98266 100755 --- a/ubuntu/_base/applications/kopete-otr/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kpicosim/debian/rules b/ubuntu/_base/applications/kpicosim/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kpicosim/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kpilot/debian/rules b/ubuntu/_base/applications/kpilot/debian/rules index db3fcbede..f8596e545 100755 --- a/ubuntu/_base/applications/kpilot/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kplayer/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kplayer/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kplayer/debian/rules b/ubuntu/_base/applications/kplayer/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kplayer/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kpowersave/debian/rules b/ubuntu/_base/applications/kpowersave/debian/rules index 59e0f7751..9bd279c93 100755 --- a/ubuntu/_base/applications/kpowersave/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/krecipes/debian/rules b/ubuntu/_base/applications/krecipes/debian/rules index e4a26f2aa..e3708987f 100755 --- a/ubuntu/_base/applications/krecipes/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/krename/debian/rules b/ubuntu/_base/applications/krename/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/krename/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/krusader/debian/rules b/ubuntu/_base/applications/krusader/debian/rules index 978b9c75a..cdbcf9176 100755 --- a/ubuntu/_base/applications/krusader/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kscope/debian/rules b/ubuntu/_base/applications/kscope/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kscope/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/ksensors/debian/rules b/ubuntu/_base/applications/ksensors/debian/rules index 59588e933..4437933c3 100755 --- a/ubuntu/_base/applications/ksensors/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kshutdown/debian/rules b/ubuntu/_base/applications/kshutdown/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kshutdown/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/ksplash-engine-moodin/debian/rules b/ubuntu/_base/applications/ksplash-engine-moodin/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/ksquirrel/debian/rules b/ubuntu/_base/applications/ksquirrel/debian/rules index 328283c93..813fff66f 100755 --- a/ubuntu/_base/applications/ksquirrel/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kstreamripper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kstreamripper/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kstreamripper/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kstreamripper/debian/rules b/ubuntu/_base/applications/kstreamripper/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kstreamripper/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/ksystemlog/debian/rules b/ubuntu/_base/applications/ksystemlog/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/ksystemlog/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/ktechlab/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ktechlab/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/ktechlab/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/ktechlab/debian/rules b/ubuntu/_base/applications/ktechlab/debian/rules index b4b3fc8cb..4b05dbd51 100755 --- a/ubuntu/_base/applications/ktechlab/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/ktorrent/debian/rules b/ubuntu/_base/applications/ktorrent/debian/rules index 1be7001b0..a90794996 100755 --- a/ubuntu/_base/applications/ktorrent/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kvirc/debian/rules b/ubuntu/_base/applications/kvirc/debian/rules index 66b12bfe8..6fc9dffe2 100755 --- a/ubuntu/_base/applications/kvirc/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kvkbd/debian/rules b/ubuntu/_base/applications/kvkbd/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kvkbd/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kvpnc/debian/rules b/ubuntu/_base/applications/kvpnc/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/kvpnc/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/kxmleditor/debian/rules b/ubuntu/_base/applications/kxmleditor/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/kxmleditor/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/mathemagics/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/mathemagics/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/mathemagics/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/mathemagics/debian/rules b/ubuntu/_base/applications/mathemagics/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/mathemagics/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/mplayerthumbs/debian/rules b/ubuntu/_base/applications/mplayerthumbs/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/mplayerthumbs/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/piklab/debian/rules b/ubuntu/_base/applications/piklab/debian/rules index af84aa3fd..f21c51790 100755 --- a/ubuntu/_base/applications/piklab/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/potracegui/debian/rules b/ubuntu/_base/applications/potracegui/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/potracegui/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/qalculate-tde/debian/rules b/ubuntu/_base/applications/qalculate-tde/debian/rules index fb9daa940..d03dd383d 100755 --- a/ubuntu/_base/applications/qalculate-tde/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/rules b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/rules index 7db927c4b..11c6e4544 100755 --- a/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/rules +++ b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/rules @@ -9,8 +9,14 @@ 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/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/rosegarden/debian/rules b/ubuntu/_base/applications/rosegarden/debian/rules index be431c033..94fe8c0a8 100755 --- a/ubuntu/_base/applications/rosegarden/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/smartcardauth/debian/rules b/ubuntu/_base/applications/smartcardauth/debian/rules index b5f130de7..14ccf6018 100755 --- a/ubuntu/_base/applications/smartcardauth/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/smb4k/debian/rules b/ubuntu/_base/applications/smb4k/debian/rules index 726056ecb..95e8cd9f1 100755 --- a/ubuntu/_base/applications/smb4k/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/soundkonverter/debian/rules b/ubuntu/_base/applications/soundkonverter/debian/rules index 107bb6246..fa0a1f580 100755 --- a/ubuntu/_base/applications/soundkonverter/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tastymenu/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tastymenu/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tastymenu/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tastymenu/debian/rules b/ubuntu/_base/applications/tastymenu/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/tastymenu/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tde-guidance/debian/rules b/ubuntu/_base/applications/tde-guidance/debian/rules index 0cbf1123b..54328b46d 100755 --- a/ubuntu/_base/applications/tde-guidance/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tde-style-baghira/debian/rules b/ubuntu/_base/applications/tde-style-baghira/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/tde-style-baghira/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tde-style-domino/debian/rules b/ubuntu/_base/applications/tde-style-domino/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/tde-style-domino/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tde-style-ia-ora/debian/rules b/ubuntu/_base/applications/tde-style-ia-ora/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/tde-style-ia-ora/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tde-style-lipstik/debian/rules b/ubuntu/_base/applications/tde-style-lipstik/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/tde-style-lipstik/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tde-style-qtcurve/debian/rules b/ubuntu/_base/applications/tde-style-qtcurve/debian/rules index 32b311c4e..02999a177 100755 --- a/ubuntu/_base/applications/tde-style-qtcurve/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tde-systemsettings/debian/rules b/ubuntu/_base/applications/tde-systemsettings/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/tde-systemsettings/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tdedocker/debian/rules b/ubuntu/_base/applications/tdedocker/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/tdedocker/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tdeio-apt/debian/rules b/ubuntu/_base/applications/tdeio-apt/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/tdeio-apt/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tdeio-ftps/debian/rules b/ubuntu/_base/applications/tdeio-ftps/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/tdeio-ftps/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tdeio-gopher/debian/rules b/ubuntu/_base/applications/tdeio-gopher/debian/rules index 7c5507748..5a24d4563 100755 --- a/ubuntu/_base/applications/tdeio-gopher/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tdeio-locate/debian/rules b/ubuntu/_base/applications/tdeio-locate/debian/rules index 2e0315d2a..c9e6b78b0 100755 --- a/ubuntu/_base/applications/tdeio-locate/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tdeio-sword/debian/rules b/ubuntu/_base/applications/tdeio-sword/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/tdeio-sword/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tdeio-umountwrapper/debian/rules b/ubuntu/_base/applications/tdeio-umountwrapper/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/tdeio-umountwrapper/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tdenetworkmanager/debian/rules b/ubuntu/_base/applications/tdenetworkmanager/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/tdenetworkmanager/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tdepacman/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdepacman/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tdepacman/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tdepacman/debian/rules b/ubuntu/_base/applications/tdepacman/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/applications/tdepacman/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tdepowersave/debian/rules b/ubuntu/_base/applications/tdepowersave/debian/rules index d87f7f586..01e5357b6 100755 --- a/ubuntu/_base/applications/tdepowersave/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tderadio/debian/rules b/ubuntu/_base/applications/tderadio/debian/rules index 0dca2b923..4bef8d0a0 100755 --- a/ubuntu/_base/applications/tderadio/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tdesudo/debian/rules b/ubuntu/_base/applications/tdesudo/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/tdesudo/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tdesvn/debian/rules b/ubuntu/_base/applications/tdesvn/debian/rules index 7c91ce434..e56464216 100755 --- a/ubuntu/_base/applications/tdesvn/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tdmtheme/debian/rules b/ubuntu/_base/applications/tdmtheme/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/tdmtheme/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tellico/debian/rules b/ubuntu/_base/applications/tellico/debian/rules index 7b40ec99e..326e3e1c8 100755 --- a/ubuntu/_base/applications/tellico/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/tork/debian/rules b/ubuntu/_base/applications/tork/debian/rules index 4d427949d..e144721b9 100755 --- a/ubuntu/_base/applications/tork/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/twin-style-crystal/debian/rules b/ubuntu/_base/applications/twin-style-crystal/debian/rules index e6f9d63ae..a204efb1b 100755 --- a/ubuntu/_base/applications/twin-style-crystal/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/wlassistant/debian/rules b/ubuntu/_base/applications/wlassistant/debian/rules index 0abf76ac2..b9e54f6a9 100755 --- a/ubuntu/_base/applications/wlassistant/debian/rules +++ b/ubuntu/_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/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk +++ b/ubuntu/_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/ubuntu/_base/applications/yakuake/debian/rules b/ubuntu/_base/applications/yakuake/debian/rules index 905d63101..a6797f19a 100755 --- a/ubuntu/_base/applications/yakuake/debian/rules +++ b/ubuntu/_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" \ diff --git a/ubuntu/_base/core/tde-i18n/debian/rules b/ubuntu/_base/core/tde-i18n/debian/rules index ec0e5be5f..3ab71190d 100755 --- a/ubuntu/_base/core/tde-i18n/debian/rules +++ b/ubuntu/_base/core/tde-i18n/debian/rules @@ -25,6 +25,16 @@ 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 + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -34,9 +44,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DBUILD_ALL="ON" -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - build:: dh_testdir diff --git a/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdeaccessibility/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/ubuntu/_base/core/tdeaccessibility/debian/rules b/ubuntu/_base/core/tdeaccessibility/debian/rules index 1b0ed7032..2748fa452 100755 --- a/ubuntu/_base/core/tdeaccessibility/debian/rules +++ b/ubuntu/_base/core/tdeaccessibility/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_MAKE_CHECK_TARGET = check DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/core/tdeaddons/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeaddons/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdeaddons/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdeaddons/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/ubuntu/_base/core/tdeaddons/debian/rules b/ubuntu/_base/core/tdeaddons/debian/rules index 6ddd2c0b1..4d8d960f3 100755 --- a/ubuntu/_base/core/tdeaddons/debian/rules +++ b/ubuntu/_base/core/tdeaddons/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/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_CONFIGURE_EXTRA_FLAGS := --without-xmms --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --mandir=/opt/trinity/share/man - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -27,9 +18,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter binary-install/konq-plugins-trinity:: diff --git a/ubuntu/_base/core/tdeadmin/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeadmin/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdeadmin/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdeadmin/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/ubuntu/_base/core/tdeadmin/debian/rules b/ubuntu/_base/core/tdeadmin/debian/rules index 692ea7674..21bc8b8ec 100755 --- a/ubuntu/_base/core/tdeadmin/debian/rules +++ b/ubuntu/_base/core/tdeadmin/debian/rules @@ -4,22 +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=tdeadmin-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - -DEB_CONFIGURE_EXTRA_FLAGS := \ - --without-rpm --with-pam=tde --with-shadow --with-nis \ - --with-private-groups --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/ubuntu/_base/core/tdeartwork/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeartwork/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdeartwork/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdeartwork/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/ubuntu/_base/core/tdeartwork/debian/rules b/ubuntu/_base/core/tdeartwork/debian/rules index 753e97397..184b8d284 100755 --- a/ubuntu/_base/core/tdeartwork/debian/rules +++ b/ubuntu/_base/core/tdeartwork/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 := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -29,9 +20,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdeartwork-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - clean:: rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png diff --git a/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdebase/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/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules index b7d8ae5db..37d40ecb7 100755 --- a/ubuntu/_base/core/tdebase/debian/rules +++ b/ubuntu/_base/core/tdebase/debian/rules @@ -75,9 +75,6 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ diff --git a/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdebindings/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/ubuntu/_base/core/tdebindings/debian/rules b/ubuntu/_base/core/tdebindings/debian/rules index 5137ef2b8..fce67d163 100755 --- a/ubuntu/_base/core/tdebindings/debian/rules +++ b/ubuntu/_base/core/tdebindings/debian/rules @@ -35,9 +35,6 @@ DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/opt/trinity \ DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - # These are not all the packages with libraries, but only those that # need to be in DEB_SHLIBDEPS_INCLUDE... PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinity libkjsembed1-trinity diff --git a/ubuntu/_base/core/tdeedu/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeedu/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdeedu/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdeedu/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/ubuntu/_base/core/tdeedu/debian/rules b/ubuntu/_base/core/tdeedu/debian/rules index fa6957b40..dc2f755ee 100755 --- a/ubuntu/_base/core/tdeedu/debian/rules +++ b/ubuntu/_base/core/tdeedu/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_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done) diff --git a/ubuntu/_base/core/tdegames/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdegames/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdegames/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdegames/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/ubuntu/_base/core/tdegames/debian/rules b/ubuntu/_base/core/tdegames/debian/rules index 871437151..4d50a84a3 100755 --- a/ubuntu/_base/core/tdegames/debian/rules +++ b/ubuntu/_base/core/tdegames/debian/rules @@ -6,17 +6,8 @@ include debian/cdbs/debian-tde.mk export kde_bindir = /opt/trinity/games -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_KDE_APIDOX := yes -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -38,9 +29,6 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if DEB_INSTALL_CHANGELOGS_tdegames := $(DEB_SRCDIR)/ChangeLog -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity' DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V diff --git a/ubuntu/_base/core/tdegraphics/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdegraphics/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdegraphics/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdegraphics/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/ubuntu/_base/core/tdegraphics/debian/rules b/ubuntu/_base/core/tdegraphics/debian/rules index 2ff13720d..d29cd5566 100755 --- a/ubuntu/_base/core/tdegraphics/debian/rules +++ b/ubuntu/_base/core/tdegraphics/debian/rules @@ -32,9 +32,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := kfaxview-trinity kghostview-trinity kpovmodeler-trinity ksvg-trinity \ kuickshow-trinity kview-trinity kviewshell-trinity libkscan1-trinity diff --git a/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdelibs/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/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules index 23758877a..eafe84957 100755 --- a/ubuntu/_base/core/tdelibs/debian/rules +++ b/ubuntu/_base/core/tdelibs/debian/rules @@ -69,9 +69,6 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdelibs-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - binary-install/tdelibs-data-trinity:: install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/tde-applications.menu install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf diff --git a/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdemultimedia/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/ubuntu/_base/core/tdemultimedia/debian/rules b/ubuntu/_base/core/tdemultimedia/debian/rules index 7234ee70e..ea08bafa0 100755 --- a/ubuntu/_base/core/tdemultimedia/debian/rules +++ b/ubuntu/_base/core/tdemultimedia/debian/rules @@ -4,20 +4,6 @@ include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/debhelper.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-alsa --with-arts-alsa \ - --with-extra-includes=/usr/include/speex:/opt/trinity/include/tde/arts \ - --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - # The include/tde/arts one should be temporary. See - # "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk. - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -38,9 +24,6 @@ DOC_HTML_PRUNE := kcontrol-trinity DEB_DH_STRIP_ARGS := --dbg-package=tdemultimedia-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-tdeio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \ libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \ libkcddb1-trinity mpeglib-trinity noatun-trinity diff --git a/ubuntu/_base/core/tdenetwork/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdenetwork/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdenetwork/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdenetwork/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/ubuntu/_base/core/tdenetwork/debian/rules b/ubuntu/_base/core/tdenetwork/debian/rules index 0ab404480..98f81f81c 100755 --- a/ubuntu/_base/core/tdenetwork/debian/rules +++ b/ubuntu/_base/core/tdenetwork/debian/rules @@ -15,15 +15,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 := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -45,9 +36,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdenetwork-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/ubuntu/_base/core/tdepim/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdepim/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdepim/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdepim/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/ubuntu/_base/core/tdepim/debian/rules b/ubuntu/_base/core/tdepim/debian/rules index fef4fe2b9..f2de846ca 100755 --- a/ubuntu/_base/core/tdepim/debian/rules +++ b/ubuntu/_base/core/tdepim/debian/rules @@ -53,9 +53,6 @@ DEB_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - shlibs_ver=4:3.5.7 DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libtdenetwork2-trinity := -V'libtdenetwork2-trinity (>= $(shlibs_ver))' diff --git a/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdesdk/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/ubuntu/_base/core/tdesdk/debian/rules b/ubuntu/_base/core/tdesdk/debian/rules index b3ca7de94..d7be7d400 100755 --- a/ubuntu/_base/core/tdesdk/debian/rules +++ b/ubuntu/_base/core/tdesdk/debian/rules @@ -4,20 +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=tdesdk-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ diff --git a/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdetoys/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/ubuntu/_base/core/tdetoys/debian/rules b/ubuntu/_base/core/tdetoys/debian/rules index 50e0cee99..b8b2b309b 100755 --- a/ubuntu/_base/core/tdetoys/debian/rules +++ b/ubuntu/_base/core/tdetoys/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 := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -26,8 +17,5 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog DEB_INSTALL_CHANGELOGS_kteatime-trinity := kteatime/ChangeLog diff --git a/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdeutils/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/ubuntu/_base/core/tdeutils/debian/rules b/ubuntu/_base/core/tdeutils/debian/rules index 413d87ff6..6014293b3 100755 --- a/ubuntu/_base/core/tdeutils/debian/rules +++ b/ubuntu/_base/core/tdeutils/debian/rules @@ -4,19 +4,10 @@ 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_KDE_APIDOX := yes DEB_INSTALL_CHANGELOGS_tdefilereplace-trinity := tdefilereplace/ChangeLog -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -41,9 +32,6 @@ DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trini DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/ubuntu/_base/core/tdevelop/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdevelop/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdevelop/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdevelop/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/ubuntu/_base/core/tdevelop/debian/rules b/ubuntu/_base/core/tdevelop/debian/rules index 5f91d36a7..833ff7ecc 100755 --- a/ubuntu/_base/core/tdevelop/debian/rules +++ b/ubuntu/_base/core/tdevelop/debian/rules @@ -13,55 +13,11 @@ 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=tdevelop-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := tdevelop-trinity DEB_KDE_APIDOX := yes -DEB_KDE_ENABLE_FINAL := -DEB_INSTALL_DOCS_tdevelop = AUTHORS -DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp -DEB_CONFIGURE_EXTRA_FLAGS := \ - --disable-debug \ - --enable-docbase \ - --enable-scripting \ - --enable-ada \ - --enable-bash \ - --enable-cpp \ - --enable-fortran \ - --enable-haskell \ - --enable-java \ - --enable-pascal \ - --enable-perl \ - --enable-php \ - --enable-python \ - --enable-ruby \ - --enable-sql \ - --enable-antproject \ - --enable-autoproject \ - --enable-customproject \ - --enable-genericproject \ - --enable-scriptproject \ - --enable-trollproject \ - --enable-cvs \ - --enable-vba \ - --enable-subversion \ - --with-pic \ - --with-tdelibsdoxy-dir=/opt/trinity/share/doc/tde/HTML/en/tdelibs-apidocs \ - --with-pythondir=/usr \ -# --with-qtdoc-dir=/usr/share/tqt3/doc/html \ - --prefix=/opt/trinity \ - --with-extra-libs=/opt/trinity/lib DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/ubuntu/_base/core/tdewebdev/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdewebdev/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdewebdev/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdewebdev/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/ubuntu/_base/core/tdewebdev/debian/rules b/ubuntu/_base/core/tdewebdev/debian/rules index 192bba925..b839eb381 100755 --- a/ubuntu/_base/core/tdewebdev/debian/rules +++ b/ubuntu/_base/core/tdewebdev/debian/rules @@ -11,9 +11,6 @@ DEB_INSTALL_CHANGELOGS_quanta-trinity := quanta/ChangeLog DEB_DH_STRIP_ARGS := --dbg-package=tdewebdev-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := kommander-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/akode/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/ubuntu/_base/dependencies/akode/debian/rules b/ubuntu/_base/dependencies/akode/debian/rules index c912fbebf..d93e5d960 100755 --- a/ubuntu/_base/dependencies/akode/debian/rules +++ b/ubuntu/_base/dependencies/akode/debian/rules @@ -9,17 +9,12 @@ ifeq (linux,$(DEB_HOST_ARCH_OS)) DEB_DH_GENCONTROL_ARGS=-- -Valsa-dev=libasound2-dev endif -DEB_CONFIGURE_EXTRA_FLAGS := --without-libltdl --with-extra-includes=/usr/include/speex/ - DEB_DH_STRIP_ARGS := --dbg-package=akode-dbg PACKAGES_WITH_LIBS := libakode2 DEB_DH_MAKESHLIBS_ARGS_libakode2 := -V'libakode2 (>= 2-rc1-1)' -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/arts/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/ubuntu/_base/dependencies/arts/debian/rules b/ubuntu/_base/dependencies/arts/debian/rules index 708852525..cc4893ca9 100755 --- a/ubuntu/_base/dependencies/arts/debian/rules +++ b/ubuntu/_base/dependencies/arts/debian/rules @@ -30,9 +30,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity DEB_DH_MAKESHLIBS_ARGS_ALL := -V @@ -50,4 +47,3 @@ binary-predeb/libarts1-trinity-dev:: ifeq (linux,$(DEB_HOST_ARCH_OS)) echo "libasound2-dev=libasound2-dev" >> debian/libarts1-trinity-dev.substvars endif - diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/rules b/ubuntu/_base/dependencies/avahi-tqt/debian/rules index 89f073b9f..42b7e8ec6 100755 --- a/ubuntu/_base/dependencies/avahi-tqt/debian/rules +++ b/ubuntu/_base/dependencies/avahi-tqt/debian/rules @@ -7,6 +7,16 @@ include /usr/share/cdbs/1/class/cmake.mk # symbols, and speed up loading. export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 +# 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 + # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ @@ -14,6 +24,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DWITH_ALL_OPTIONS="ON" - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/dbus-1-tqt/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/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules b/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules index 00935ed3a..42417e634 100755 --- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules +++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules @@ -6,9 +6,6 @@ include debian/cdbs/debian-tde.mk DEB_KDE_APIDOX := yes -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/rules b/ubuntu/_base/dependencies/dbus-tqt/debian/rules index 71f625c30..ee5d0916d 100755 --- a/ubuntu/_base/dependencies/dbus-tqt/debian/rules +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/rules @@ -11,5 +11,12 @@ include /usr/share/cdbs/1/class/cmake.mk # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V +# 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 diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/rules b/ubuntu/_base/dependencies/libart-lgpl/debian/rules index 86885792c..ab3beba75 100755 --- a/ubuntu/_base/dependencies/libart-lgpl/debian/rules +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/rules @@ -7,8 +7,15 @@ libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:s DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' +# 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 # Build options DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/libcaldav/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/ubuntu/_base/dependencies/libcaldav/debian/rules b/ubuntu/_base/dependencies/libcaldav/debian/rules index bdcb3033c..e898aa6d2 100755 --- a/ubuntu/_base/dependencies/libcaldav/debian/rules +++ b/ubuntu/_base/dependencies/libcaldav/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) - ifdef DEB_HOST_MULTIARCH CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) else diff --git a/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/libcarddav/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/ubuntu/_base/dependencies/libcarddav/debian/rules b/ubuntu/_base/dependencies/libcarddav/debian/rules index bdcb3033c..e898aa6d2 100755 --- a/ubuntu/_base/dependencies/libcarddav/debian/rules +++ b/ubuntu/_base/dependencies/libcarddav/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) - ifdef DEB_HOST_MULTIARCH CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) else diff --git a/ubuntu/_base/dependencies/libr/debian/rules b/ubuntu/_base/dependencies/libr/debian/rules index 808640608..2d7dda386 100755 --- a/ubuntu/_base/dependencies/libr/debian/rules +++ b/ubuntu/_base/dependencies/libr/debian/rules @@ -6,8 +6,15 @@ include /usr/share/cdbs/1/rules/utils.mk DEB_BUILD_PARALLEL ?= true +# 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 # Build options DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/dependencies/python-tqt/debian/rules b/ubuntu/_base/dependencies/python-tqt/debian/rules index ba02eb70a..72a8d8dc0 100755 --- a/ubuntu/_base/dependencies/python-tqt/debian/rules +++ b/ubuntu/_base/dependencies/python-tqt/debian/rules @@ -3,8 +3,15 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# 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 export DH_OPTIONS diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/rules b/ubuntu/_base/dependencies/sip4-tqt/debian/rules index 71965fa31..1feb9c154 100755 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/rules +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/rules @@ -2,8 +2,15 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# 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 export DH_OPTIONS diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqca-tls/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/dependencies/tqca-tls/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/tqca-tls/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/ubuntu/_base/dependencies/tqca-tls/debian/rules b/ubuntu/_base/dependencies/tqca-tls/debian/rules index 8c2dd70cc..d3e967902 100755 --- a/ubuntu/_base/dependencies/tqca-tls/debian/rules +++ b/ubuntu/_base/dependencies/tqca-tls/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/ubuntu/_base/dependencies/tqca/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqca/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/dependencies/tqca/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/tqca/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/ubuntu/_base/dependencies/tqca/debian/rules b/ubuntu/_base/dependencies/tqca/debian/rules index ec48d0a8d..21df58b4f 100755 --- a/ubuntu/_base/dependencies/tqca/debian/rules +++ b/ubuntu/_base/dependencies/tqca/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) - ifdef DEB_HOST_MULTIARCH CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) else diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/rules b/ubuntu/_base/dependencies/tqscintilla/debian/rules index 750a1294a..e87355584 100755 --- a/ubuntu/_base/dependencies/tqscintilla/debian/rules +++ b/ubuntu/_base/dependencies/tqscintilla/debian/rules @@ -5,8 +5,15 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# 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 # This is the debhelper compatibility version to use. export TQTDIR=/usr/share/tqt3 diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules index dafa13359..ddc008924 100755 --- a/ubuntu/_base/dependencies/tqt3/debian/rules +++ b/ubuntu/_base/dependencies/tqt3/debian/rules @@ -11,8 +11,15 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +# 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_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules index 0700e9a39..fe114f5e8 100755 --- a/ubuntu/_base/dependencies/tqtinterface/debian/rules +++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules @@ -12,17 +12,24 @@ version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -DEB_CMAKE_EXTRA_FLAGS := \ - -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo - +# 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 # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL ?= true DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/libraries/kipi-plugins/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/ubuntu/_base/libraries/kipi-plugins/debian/rules b/ubuntu/_base/libraries/kipi-plugins/debian/rules index 0574b7052..33f9bcbd5 100755 --- a/ubuntu/_base/libraries/kipi-plugins/debian/rules +++ b/ubuntu/_base/libraries/kipi-plugins/debian/rules @@ -14,9 +14,6 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - clean :: rm -f po/*/*.gmo diff --git a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/libraries/libkdcraw/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/ubuntu/_base/libraries/libkdcraw/debian/rules b/ubuntu/_base/libraries/libkdcraw/debian/rules index a6a45ead6..a5de48a38 100755 --- a/ubuntu/_base/libraries/libkdcraw/debian/rules +++ b/ubuntu/_base/libraries/libkdcraw/debian/rules @@ -15,9 +15,6 @@ DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - # add installed liblcms*-dev to libkdcraw3-trinity-dev depends common-binary-arch:: (dpkg --get-selections "liblcms*-dev" | awk '{split($$1, p, ":"); lcms=lcms p[1] ","} END { print "lcms-dev=" lcms}' >>debian/libkdcraw3-trinity-dev.substvars) diff --git a/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/libraries/libkexiv2/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/ubuntu/_base/libraries/libkexiv2/debian/rules b/ubuntu/_base/libraries/libkexiv2/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/libraries/libkexiv2/debian/rules +++ b/ubuntu/_base/libraries/libkexiv2/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/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/libraries/libkipi/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/ubuntu/_base/libraries/libkipi/debian/rules b/ubuntu/_base/libraries/libkipi/debian/rules index 85bbba0dc..5a0da42af 100755 --- a/ubuntu/_base/libraries/libkipi/debian/rules +++ b/ubuntu/_base/libraries/libkipi/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/ubuntu/_base/libraries/libksquirrel/debian/rules b/ubuntu/_base/libraries/libksquirrel/debian/rules index 15f00b785..d761aa0a1 100755 --- a/ubuntu/_base/libraries/libksquirrel/debian/rules +++ b/ubuntu/_base/libraries/libksquirrel/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/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/libraries/libtdeldap/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/ubuntu/_base/libraries/libtdeldap/debian/rules b/ubuntu/_base/libraries/libtdeldap/debian/rules index 65318dd0d..5a0da42af 100755 --- a/ubuntu/_base/libraries/libtdeldap/debian/rules +++ b/ubuntu/_base/libraries/libtdeldap/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/ubuntu/_base/libraries/libtqt-perl/debian/rules b/ubuntu/_base/libraries/libtqt-perl/debian/rules index 28a9c7817..c498ce8ca 100755 --- a/ubuntu/_base/libraries/libtqt-perl/debian/rules +++ b/ubuntu/_base/libraries/libtqt-perl/debian/rules @@ -31,8 +31,15 @@ DEB_MAKE_INSTALL_TARGET := install \ prefix=/usr \ DESTDIR=$(CURDIR)/debian/libtqt-perl +# 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 pre-build:: pre-build-stamp @@ -60,4 +67,3 @@ clean:: repair: for f in $(SAVERESTORE) ; do rm -f $$f ; cp -p ../orig/*/$$f $$f ; done - diff --git a/ubuntu/_base/libraries/pytdeextensions/debian/rules b/ubuntu/_base/libraries/pytdeextensions/debian/rules index 28a7627ba..a9c996c88 100755 --- a/ubuntu/_base/libraries/pytdeextensions/debian/rules +++ b/ubuntu/_base/libraries/pytdeextensions/debian/rules @@ -26,8 +26,15 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include +# 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/ubuntu/_base/libraries/python-trinity/debian/rules b/ubuntu/_base/libraries/python-trinity/debian/rules index a8bd862cd..ddbb6b15f 100755 --- a/ubuntu/_base/libraries/python-trinity/debian/rules +++ b/ubuntu/_base/libraries/python-trinity/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 # This has to be exported to make some magic below work. export DH_OPTIONS diff --git a/ubuntu/_base/metapackages/casper-trinity/debian/rules b/ubuntu/_base/metapackages/casper-trinity/debian/rules index e6b6748ab..013e64a11 100755 --- a/ubuntu/_base/metapackages/casper-trinity/debian/rules +++ b/ubuntu/_base/metapackages/casper-trinity/debian/rules @@ -2,8 +2,15 @@ include /usr/share/cdbs/1/rules/debhelper.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 build: debian/stamp-distrospecific diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/rules b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/rules index b6386b0d8..2588d3623 100755 --- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/rules +++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/rules @@ -23,5 +23,12 @@ 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 diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/rules b/ubuntu/_base/metapackages/kubuntu-meta/debian/rules index 4ab7baa9d..62403e808 100755 --- a/ubuntu/_base/metapackages/kubuntu-meta/debian/rules +++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/rules @@ -2,8 +2,15 @@ #export DH_VERBOSE=1 +# 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 debian/stamp-distrospecific: dh_testdir diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/rules b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/rules index e6b6748ab..013e64a11 100755 --- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/rules +++ b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/rules @@ -2,8 +2,15 @@ include /usr/share/cdbs/1/rules/debhelper.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 build: debian/stamp-distrospecific diff --git a/ubuntu/_base/metapackages/trinity-livecd/debian/rules b/ubuntu/_base/metapackages/trinity-livecd/debian/rules index 3591ab5e4..90b7eb173 100755 --- a/ubuntu/_base/metapackages/trinity-livecd/debian/rules +++ b/ubuntu/_base/metapackages/trinity-livecd/debian/rules @@ -2,5 +2,12 @@ include /usr/share/cdbs/1/rules/debhelper.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 diff --git a/ubuntu/_base/metapackages/ubiquity-trinity/debian/rules b/ubuntu/_base/metapackages/ubiquity-trinity/debian/rules index e6b6748ab..013e64a11 100755 --- a/ubuntu/_base/metapackages/ubiquity-trinity/debian/rules +++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/rules @@ -2,8 +2,15 @@ include /usr/share/cdbs/1/rules/debhelper.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 build: debian/stamp-distrospecific |