summaryrefslogtreecommitdiffstats
path: root/dilos/core/tdeutils
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-04-04 03:02:11 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-04-04 16:10:05 +0200
commita92a915c5d3a438e4d8f7b538efeca6b81fcc4a5 (patch)
tree1026c3d6ecf34c4910f61be62e09761e34eb7318 /dilos/core/tdeutils
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 <slavek.banko@axis.cz> (cherry picked from commit 3d0fe45a7b0b586d096644a3581df8307787eb3a)
Diffstat (limited to 'dilos/core/tdeutils')
-rw-r--r--dilos/core/tdeutils/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/core/tdeutils/debian/rules3
2 files changed, 10 insertions, 3 deletions
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