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