summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise/tde-i18n/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/precise/tde-i18n/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/precise/tde-i18n/debian')
-rw-r--r--ubuntu/precise/tde-i18n/debian/control4
-rwxr-xr-xubuntu/precise/tde-i18n/debian/rules5
-rw-r--r--ubuntu/precise/tde-i18n/debian/source/options4
3 files changed, 8 insertions, 5 deletions
diff --git a/ubuntu/precise/tde-i18n/debian/control b/ubuntu/precise/tde-i18n/debian/control
index 11d0c979e..37422390f 100644
--- a/ubuntu/precise/tde-i18n/debian/control
+++ b/ubuntu/precise/tde-i18n/debian/control
@@ -25,7 +25,7 @@ Replaces: kde-i18n-ar-trinity (<< 4:14.0.0)
Breaks: kde-i18n-ar-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
-Provides: tde-i18n-trinity-trinity
+Provides: tde-i18n-trinity
Description: Arabic (ar) internationalized (i18n) files for KDE
This package contains the Arabic internationalized (i18n) files for
all KDE core applications.
@@ -505,7 +505,7 @@ Replaces: kde-i18n-nb-trinity (<< 4:14.0.0)
Breaks: kde-i18n-nb-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
-Provides: tde-i18n-trinity, tde-i18n-no
+Provides: tde-i18n-trinity, tde-i18n-no-trinity
Description: Norwegian Bookmal (nb) internationalized (i18n) files for KDE
This package contains the Norwegian Bookmal internationalized (i18n)
files for all KDE core applications.
diff --git a/ubuntu/precise/tde-i18n/debian/rules b/ubuntu/precise/tde-i18n/debian/rules
index e275e35df..b60af22ee 100755
--- a/ubuntu/precise/tde-i18n/debian/rules
+++ b/ubuntu/precise/tde-i18n/debian/rules
@@ -31,6 +31,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
debian/debiandirs: scripts/admin/debianrules
perl -w scripts/admin/debianrules echodirs > debian/debiandirs
@@ -107,7 +110,7 @@ binary-indep: build install
dh_shlibdeps
dh_gencontrol
dh_md5sums
- dh_builddeb
+ dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
# Below here is fairly generic really
diff --git a/ubuntu/precise/tde-i18n/debian/source/options b/ubuntu/precise/tde-i18n/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/precise/tde-i18n/debian/source/options
+++ b/ubuntu/precise/tde-i18n/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