summaryrefslogtreecommitdiffstats
path: root/dilos/core
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2021-04-04 03:02:11 +0200
committerSlávek Banko <[email protected]>2021-04-04 16:10:05 +0200
commita92a915c5d3a438e4d8f7b538efeca6b81fcc4a5 (patch)
tree1026c3d6ecf34c4910f61be62e09761e34eb7318 /dilos/core
parent166fcf9e56586808911b33205ab2aa1c035afe2e (diff)
downloadtde-packaging-a92a915c5d3a438e4d8f7b538efeca6b81fcc4a5.tar.gz
tde-packaging-a92a915c5d3a438e4d8f7b538efeca6b81fcc4a5.zip
DEB: Move DEB_DH_BUILDDEB_ARGS to common cdbs rules.
Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit 3d0fe45a7b0b586d096644a3581df8307787eb3a)
Diffstat (limited to 'dilos/core')
-rwxr-xr-xdilos/core/tde-i18n/debian/rules13
-rw-r--r--dilos/core/tdeaccessibility/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdeaccessibility/debian/rules3
-rw-r--r--dilos/core/tdeaddons/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdeaddons/debian/rules3
-rw-r--r--dilos/core/tdeadmin/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdeadmin/debian/rules3
-rw-r--r--dilos/core/tdeartwork/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdeartwork/debian/rules3
-rw-r--r--dilos/core/tdebase/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdebase/debian/rules3
-rw-r--r--dilos/core/tdebindings/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdebindings/debian/rules3
-rw-r--r--dilos/core/tdeedu/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdeedu/debian/rules3
-rw-r--r--dilos/core/tdegames/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdegames/debian/rules3
-rw-r--r--dilos/core/tdegraphics/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdegraphics/debian/rules3
-rw-r--r--dilos/core/tdelibs/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdelibs/debian/rules3
-rw-r--r--dilos/core/tdemultimedia/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdemultimedia/debian/rules3
-rw-r--r--dilos/core/tdenetwork/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdenetwork/debian/rules3
-rw-r--r--dilos/core/tdepim/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdepim/debian/rules3
-rw-r--r--dilos/core/tdesdk/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdesdk/debian/rules3
-rw-r--r--dilos/core/tdetoys/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdetoys/debian/rules3
-rw-r--r--dilos/core/tdeutils/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdeutils/debian/rules3
-rw-r--r--dilos/core/tdevelop/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdevelop/debian/rules44
35 files changed, 180 insertions, 95 deletions
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 e5221df93..8adaa5ebe 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 c85e8031a..178a5b647 100755
--- a/dilos/core/tdelibs/debian/rules
+++ b/dilos/core/tdelibs/debian/rules
@@ -139,9 +139,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 6a9f803da..3e7294690 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" \