summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/applications/tdesvn/debian
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 /ubuntu/maverick/applications/tdesvn/debian
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 'ubuntu/maverick/applications/tdesvn/debian')
-rwxr-xr-xubuntu/maverick/applications/tdesvn/debian/rules3
-rw-r--r--ubuntu/maverick/applications/tdesvn/debian/source/options4
2 files changed, 5 insertions, 2 deletions
diff --git a/ubuntu/maverick/applications/tdesvn/debian/rules b/ubuntu/maverick/applications/tdesvn/debian/rules
index d3e870fba..37d2a944b 100755
--- a/ubuntu/maverick/applications/tdesvn/debian/rules
+++ b/ubuntu/maverick/applications/tdesvn/debian/rules
@@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -
DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
# never build in parallel, regardless of DEB_BUILD_OPTIONS.
DEB_BUILD_PARALLEL = true
diff --git a/ubuntu/maverick/applications/tdesvn/debian/source/options b/ubuntu/maverick/applications/tdesvn/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/source/options
+++ b/ubuntu/maverick/applications/tdesvn/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