summaryrefslogtreecommitdiffstats
path: root/debian/squeeze/tdeedu
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2013-01-03 22:47:53 +0100
committerFrancois Andriot <francois.andriot@free.fr>2013-01-03 22:47:53 +0100
commitd2f32337f00cf98faef8475e769d9c0381efd257 (patch)
tree9890ceb134945c4f24e624dca8ac4fa03888a979 /debian/squeeze/tdeedu
parentb566058ccb7fa94c6e34fb1e1349b093d4482d6a (diff)
parentfe7329f1eaa98f63b62e23449bb1345b3395ed37 (diff)
downloadtde-packaging-d2f32337f00cf98faef8475e769d9c0381efd257.tar.gz
tde-packaging-d2f32337f00cf98faef8475e769d9c0381efd257.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'debian/squeeze/tdeedu')
-rwxr-xr-xdebian/squeeze/tdeedu/debian/rules3
-rw-r--r--debian/squeeze/tdeedu/debian/source/options4
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/squeeze/tdeedu/debian/rules b/debian/squeeze/tdeedu/debian/rules
index d1258cdf0..9f81df4c0 100755
--- a/debian/squeeze/tdeedu/debian/rules
+++ b/debian/squeeze/tdeedu/debian/rules
@@ -16,6 +16,9 @@ DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
# Ensure that kig's python scripting built successfully.
common-build-arch::
test -e $(DEB_BUILDDIR)/kig/scripting/libscripting.la
diff --git a/debian/squeeze/tdeedu/debian/source/options b/debian/squeeze/tdeedu/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/debian/squeeze/tdeedu/debian/source/options
+++ b/debian/squeeze/tdeedu/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
compression-level = 9
# Don't run differences