summaryrefslogtreecommitdiffstats
path: root/dilos/libraries/libtdeldap
diff options
context:
space:
mode:
Diffstat (limited to 'dilos/libraries/libtdeldap')
-rw-r--r--dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk10
-rwxr-xr-xdilos/libraries/libtdeldap/debian/rules3
2 files changed, 10 insertions, 3 deletions
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 := \