summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/precise/libraries')
-rwxr-xr-xubuntu/precise/libraries/kipi-plugins/debian/rules3
-rw-r--r--ubuntu/precise/libraries/kipi-plugins/debian/source/options4
-rwxr-xr-xubuntu/precise/libraries/libkdcraw/debian/rules3
-rw-r--r--ubuntu/precise/libraries/libkdcraw/debian/source/options4
-rwxr-xr-xubuntu/precise/libraries/libkexiv2/debian/rules3
-rw-r--r--ubuntu/precise/libraries/libkexiv2/debian/source/options4
-rwxr-xr-xubuntu/precise/libraries/libkipi/debian/rules3
-rw-r--r--ubuntu/precise/libraries/libkipi/debian/source/options4
-rwxr-xr-xubuntu/precise/libraries/libksquirrel/debian/rules5
-rw-r--r--ubuntu/precise/libraries/libksquirrel/debian/source/options4
-rw-r--r--ubuntu/precise/libraries/libtdeldap/debian/control2
-rwxr-xr-xubuntu/precise/libraries/libtdeldap/debian/rules3
-rwxr-xr-xubuntu/precise/libraries/libtqt-perl/debian/rules3
-rw-r--r--ubuntu/precise/libraries/libtqt-perl/debian/source/options4
-rwxr-xr-xubuntu/precise/libraries/mlt++/debian/rules5
-rw-r--r--ubuntu/precise/libraries/mlt++/debian/source/options4
-rwxr-xr-xubuntu/precise/libraries/mlt/debian/rules5
-rw-r--r--ubuntu/precise/libraries/mlt/debian/source/options4
-rw-r--r--ubuntu/precise/libraries/pytdeextensions/debian/control2
-rwxr-xr-xubuntu/precise/libraries/pytdeextensions/debian/rules3
-rw-r--r--ubuntu/precise/libraries/pytdeextensions/debian/source/options4
-rwxr-xr-xubuntu/precise/libraries/python-trinity/debian/rules5
-rw-r--r--ubuntu/precise/libraries/python-trinity/debian/source/options4
23 files changed, 59 insertions, 26 deletions
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/rules b/ubuntu/precise/libraries/kipi-plugins/debian/rules
index 5177da213..c9f8bd279 100755
--- a/ubuntu/precise/libraries/kipi-plugins/debian/rules
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/rules
@@ -20,6 +20,9 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
clean ::
rm -f po/*/*.gmo
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/source/options b/ubuntu/precise/libraries/kipi-plugins/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/source/options
+++ b/ubuntu/precise/libraries/kipi-plugins/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
diff --git a/ubuntu/precise/libraries/libkdcraw/debian/rules b/ubuntu/precise/libraries/libkdcraw/debian/rules
index 7785e4bcc..f58c12e61 100755
--- a/ubuntu/precise/libraries/libkdcraw/debian/rules
+++ b/ubuntu/precise/libraries/libkdcraw/debian/rules
@@ -16,3 +16,6 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed"
DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
diff --git a/ubuntu/precise/libraries/libkdcraw/debian/source/options b/ubuntu/precise/libraries/libkdcraw/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/precise/libraries/libkdcraw/debian/source/options
+++ b/ubuntu/precise/libraries/libkdcraw/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
diff --git a/ubuntu/precise/libraries/libkexiv2/debian/rules b/ubuntu/precise/libraries/libkexiv2/debian/rules
index 28a1c06e8..705840830 100755
--- a/ubuntu/precise/libraries/libkexiv2/debian/rules
+++ b/ubuntu/precise/libraries/libkexiv2/debian/rules
@@ -19,6 +19,9 @@ DEB_KDE_ENABLE_FINAL = yes
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
diff --git a/ubuntu/precise/libraries/libkexiv2/debian/source/options b/ubuntu/precise/libraries/libkexiv2/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/precise/libraries/libkexiv2/debian/source/options
+++ b/ubuntu/precise/libraries/libkexiv2/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
diff --git a/ubuntu/precise/libraries/libkipi/debian/rules b/ubuntu/precise/libraries/libkipi/debian/rules
index 94eb41df3..ff0f40f12 100755
--- a/ubuntu/precise/libraries/libkipi/debian/rules
+++ b/ubuntu/precise/libraries/libkipi/debian/rules
@@ -18,6 +18,9 @@ DEB_KDE_ENABLE_FINAL = yes
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
clean ::
rm -f po/*/*.gmo
diff --git a/ubuntu/precise/libraries/libkipi/debian/source/options b/ubuntu/precise/libraries/libkipi/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/precise/libraries/libkipi/debian/source/options
+++ b/ubuntu/precise/libraries/libkipi/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
diff --git a/ubuntu/precise/libraries/libksquirrel/debian/rules b/ubuntu/precise/libraries/libksquirrel/debian/rules
index 4d113ccd7..f5bc572dc 100755
--- a/ubuntu/precise/libraries/libksquirrel/debian/rules
+++ b/ubuntu/precise/libraries/libksquirrel/debian/rules
@@ -16,6 +16,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)
+
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -88,7 +91,7 @@ binary-arch: build install
dh_shlibdeps
dh_gencontrol
dh_md5sums
- dh_builddeb
+ dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
diff --git a/ubuntu/precise/libraries/libksquirrel/debian/source/options b/ubuntu/precise/libraries/libksquirrel/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/precise/libraries/libksquirrel/debian/source/options
+++ b/ubuntu/precise/libraries/libksquirrel/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
diff --git a/ubuntu/precise/libraries/libtdeldap/debian/control b/ubuntu/precise/libraries/libtdeldap/debian/control
index 2f489d71e..cd0240ab3 100644
--- a/ubuntu/precise/libraries/libtdeldap/debian/control
+++ b/ubuntu/precise/libraries/libtdeldap/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.4
Package: libtdeldap-trinity
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients
+Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, nss-updatedb
Description: LDAP interface library for TDE
LDAP interface library for TDE management modules.
.
diff --git a/ubuntu/precise/libraries/libtdeldap/debian/rules b/ubuntu/precise/libraries/libtdeldap/debian/rules
index 242fb2c84..9bed17b05 100755
--- a/ubuntu/precise/libraries/libtdeldap/debian/rules
+++ b/ubuntu/precise/libraries/libtdeldap/debian/rules
@@ -11,6 +11,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)
+
post-patches:: debian/stamp-bootstrap
debian/stamp-bootstrap:
diff --git a/ubuntu/precise/libraries/libtqt-perl/debian/rules b/ubuntu/precise/libraries/libtqt-perl/debian/rules
index 7bf57d40b..1d77c70fc 100755
--- a/ubuntu/precise/libraries/libtqt-perl/debian/rules
+++ b/ubuntu/precise/libraries/libtqt-perl/debian/rules
@@ -32,6 +32,9 @@ DEB_MAKE_INSTALL_TARGET := install \
PREFIX=$(CURDIR)/debian/libtqt-perl/usr \
SITEPREFIX=$(CURDIR)/debian/libtqt-perl/usr \
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
pre-build:: pre-build-stamp
pre-build-stamp:
diff --git a/ubuntu/precise/libraries/libtqt-perl/debian/source/options b/ubuntu/precise/libraries/libtqt-perl/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/precise/libraries/libtqt-perl/debian/source/options
+++ b/ubuntu/precise/libraries/libtqt-perl/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
diff --git a/ubuntu/precise/libraries/mlt++/debian/rules b/ubuntu/precise/libraries/mlt++/debian/rules
index 0232c83be..99606e440 100755
--- a/ubuntu/precise/libraries/mlt++/debian/rules
+++ b/ubuntu/precise/libraries/mlt++/debian/rules
@@ -10,6 +10,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)
+
version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -88,7 +91,7 @@ binary-arch: build install
dh_shlibdeps -l/opt/trinity/lib
dh_gencontrol
dh_md5sums
- dh_builddeb
+ dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
diff --git a/ubuntu/precise/libraries/mlt++/debian/source/options b/ubuntu/precise/libraries/mlt++/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/precise/libraries/mlt++/debian/source/options
+++ b/ubuntu/precise/libraries/mlt++/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
diff --git a/ubuntu/precise/libraries/mlt/debian/rules b/ubuntu/precise/libraries/mlt/debian/rules
index 3889b6a3a..ce607fb77 100755
--- a/ubuntu/precise/libraries/mlt/debian/rules
+++ b/ubuntu/precise/libraries/mlt/debian/rules
@@ -10,6 +10,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)
+
version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1)
NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
@@ -114,7 +117,7 @@ binary-arch: build install
dh_shlibdeps --exclude=libmlt --exclude=libmiracle --exclude=libvalerie
dh_gencontrol
dh_md5sums
- dh_builddeb
+ dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
diff --git a/ubuntu/precise/libraries/mlt/debian/source/options b/ubuntu/precise/libraries/mlt/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/precise/libraries/mlt/debian/source/options
+++ b/ubuntu/precise/libraries/mlt/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
diff --git a/ubuntu/precise/libraries/pytdeextensions/debian/control b/ubuntu/precise/libraries/pytdeextensions/debian/control
index 73d813acb..695fb6c89 100644
--- a/ubuntu/precise/libraries/pytdeextensions/debian/control
+++ b/ubuntu/precise/libraries/pytdeextensions/debian/control
@@ -26,7 +26,7 @@ Architecture: any
Section: libdevel
Replaces: libpythonize0-trinity-dev (<< 4:14.0.0)
Breaks: libpythonize0-trinity-dev (<< 4:14.0.0)
-Depends: libpythonize0-trinity (= ${binary:Version}), python-dev
+Depends: libpythonize0-trinity (= ${binary:Version}), python-all-dev
Description: Python packages to support KDE applications (development) [Trinity]
PyKDE Extensions is a collection of software and Python packages
to support the creation and installation of KDE applications.
diff --git a/ubuntu/precise/libraries/pytdeextensions/debian/rules b/ubuntu/precise/libraries/pytdeextensions/debian/rules
index 4dcfaaae8..b4ae203da 100755
--- a/ubuntu/precise/libraries/pytdeextensions/debian/rules
+++ b/ubuntu/precise/libraries/pytdeextensions/debian/rules
@@ -18,6 +18,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
install/pytdeextensions-trinity::
# We have no idea if the built product is site-packages or dist-packages
cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages"
diff --git a/ubuntu/precise/libraries/pytdeextensions/debian/source/options b/ubuntu/precise/libraries/pytdeextensions/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/precise/libraries/pytdeextensions/debian/source/options
+++ b/ubuntu/precise/libraries/pytdeextensions/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
diff --git a/ubuntu/precise/libraries/python-trinity/debian/rules b/ubuntu/precise/libraries/python-trinity/debian/rules
index ffa56ad63..67af8c2d8 100755
--- a/ubuntu/precise/libraries/python-trinity/debian/rules
+++ b/ubuntu/precise/libraries/python-trinity/debian/rules
@@ -11,6 +11,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)
+
include /usr/share/dpatch/dpatch.make
# This has to be exported to make some magic below work.
export DH_OPTIONS
@@ -151,7 +154,7 @@ endif
dh_shlibdeps -l /opt/trinity/lib
dh_gencontrol
dh_md5sums
- dh_builddeb
+ dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
# Build architecture independant packages using the common target.
binary-indep: install-indep
diff --git a/ubuntu/precise/libraries/python-trinity/debian/source/options b/ubuntu/precise/libraries/python-trinity/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/precise/libraries/python-trinity/debian/source/options
+++ b/ubuntu/precise/libraries/python-trinity/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