summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/applications/tdeio
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base/applications/tdeio')
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-apt/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-locate/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-locate/debian/docs3
-rwxr-xr-xubuntu/_base/applications/tdeio/tdeio-locate/debian/rules24
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-sword/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control2
23 files changed, 62 insertions, 42 deletions
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .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 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control
index b5c61299d..3b616818e 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Robert Hogan <robert@roberthogan.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdeio-appinfo-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .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 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control
index 67b389d0e..ff1e186ca 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Emmanuel Bouthenot <kolter@openics.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdeio-apt-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .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 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control
index d1455f685..feb19c97d 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-ftps-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.3
Package: tdeio-ftps-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .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 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
index 2752551e6..578f51c5a 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Albert Astals Cid <aacid@kde.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdeio-gopher-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .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 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control
index fe7ee58c4..094ec1441 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, bzip2, python-all
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdeio-locate-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
index c9e6b78b0..a6797f19a 100755
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
@@ -1,35 +1,17 @@
#!/usr/bin/make -f
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_KDE_APIDOX := yes
-
-CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
-
DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -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_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DBUILD_ALL="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-DEB_INSTALL_DOCS_tdeio-locate-trinity := -XREADME -XNEWS -XTODO -XAUTHORS
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .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 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control
index a0a34a244..dd1d46eaa 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-sword-trinity
Section: tde
Priority: extra
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
Standards-Version: 3.7.2
Package: tdeio-sword-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .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 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control
index c0a1dda6c..9e47a2bdf 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-umountwrapper-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdeio-umountwrapper-trinity