6 files changed, 31 insertions, 34 deletions
diff --git a/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/core/tdesdk/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/core/tdesdk/debian/cervisia-trinity.lintian b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian
index 6759ea297..189c5f2f2 100644
--- a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian
+++ b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian
@@ -4,6 +4,4 @@ cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/
 
 # This is from tdeinit black magic.
 cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
-cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
 cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst
deleted file mode 100644
index 800a596bf..000000000
--- a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for cervisia-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdesdk/debian/compat b/ubuntu/_base/core/tdesdk/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdesdk/debian/compat
+++ b/ubuntu/_base/core/tdesdk/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdesdk/debian/control b/ubuntu/_base/core/tdesdk/debian/control
index b4e0c1eae..0001d479c 100644
--- a/ubuntu/_base/core/tdesdk/debian/control
+++ b/ubuntu/_base/core/tdesdk/debian/control
@@ -4,11 +4,11 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build,
  pkg-config, tdelibs14-trinity-dev, binutils-dev, bison, flex, libfl-dev | flex (<< 2.5.39),
  tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev,
  libktnef1-trinity-dev, libsvn-dev, libdb-dev,
- libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~)
+ libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~), dh-python
 Standards-Version: 3.8.4
 
 Package: tdesdk-trinity
@@ -165,7 +165,7 @@ Architecture: all
 Section: devel
 Replaces: kcachegrind-converters-kde3 (<< 4:14.0.0~), kcachegrind-converters-trinity (<< 4:14.0.0~)
 Breaks: kcachegrind-converters-kde3 (<< 4:14.0.0~), kcachegrind-converters-trinity (<< 4:14.0.0~)
-Depends: ${perl:Depends}, php-cli | php5-cli, python-all
+Depends: ${perl:Depends}, ${python3:Depends}, php-cli | php5-cli
 Recommends: tdecachegrind-trinity
 Description: format converters for TDECachegrind profiling visualisation tool
  This is a collection of scripts for converting the output from
@@ -219,7 +219,7 @@ Architecture: all
 Section: devel
 Replaces: kdesdk-scripts-kde3 (<< 4:14.0.0~), kdesdk-scripts-trinity (<< 4:14.0.0~)
 Breaks: kdesdk-scripts-kde3 (<< 4:14.0.0~), kdesdk-scripts-trinity (<< 4:14.0.0~)
-Depends: ${perl:Depends}, python-all
+Depends: ${perl:Depends}, ${python3:Depends}
 Recommends: automake1.9 | automaken, cvs, gawk
 Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html, dmalloc, gdb, tdelibs14-trinity-doc, tqt3-doc, valgrind, devscripts
 Enhances: kate-trinity
@@ -360,7 +360,7 @@ Architecture: any
 Section: devel
 Replaces: umbrello-kde3 (<< 4:14.0.0~), umbrello-trinity (<< 4:14.0.0~)
 Breaks: umbrello-kde3 (<< 4:14.0.0~), umbrello-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${python3:Depends}
 Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
 Description: UML modelling tool and code generator
  Umbrello UML Modeller is a Unified Modelling Language editor for TDE.
diff --git a/ubuntu/_base/core/tdesdk/debian/rules b/ubuntu/_base/core/tdesdk/debian/rules
index 2a1a0c921..a550a3c23 100755
--- a/ubuntu/_base/core/tdesdk/debian/rules
+++ b/ubuntu/_base/core/tdesdk/debian/rules
@@ -32,28 +32,35 @@ DEB_INSTALL_CHANGELOGS_kompare-trinity := kompare/ChangeLog
 DEB_INSTALL_CHANGELOGS_umbrello-trinity := umbrello/ChangeLog
 
 binary-install/tdesdk-scripts-trinity::
-	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean \
-		debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean-kde
-	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversions \
-		debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversion-kde
+	mv -f debian/$(cdbs_curpkg)/opt/trinity/bin/svn-clean \
+		debian/$(cdbs_curpkg)/opt/trinity/bin/svn-clean-kde
+	mv -f debian/$(cdbs_curpkg)/opt/trinity/bin/svnversions \
+		debian/$(cdbs_curpkg)/opt/trinity/bin/svnversion-kde
 	install -p -D -m644 scripts/kde-buildrc \
-		debian/tdesdk-scripts-trinity/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
+		debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin
 
 binary-install/tdesdk-misc-trinity::
 	install -p -D -m644 kdeaccounts-plugin/README \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kdeaccounts-plugin
+		debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.kdeaccounts-plugin
 	install -p -D -m644 tdeioslave/svn/AUTHORS \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn
+		debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn
 	install -p -D -m644 tdeioslave/svn/README \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.tdeioslave-svn
+		debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.tdeioslave-svn
 	install -p -D -m644 kprofilemethod/README \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kprofilemethod
+		debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.kprofilemethod
 	install -p -D -m644 scheck/README \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.scheck
+		debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.scheck
 
 binary-install/kapptemplate-trinity::
-	rm -f debian/kapptemplate-trinity/opt/trinity/share/apps/kapptemplate/admin/*.cdbs-orig
+	rm -f debian/$(cdbs_curpkg)/opt/trinity/share/apps/kapptemplate/admin/*.cdbs-orig
 	for admindirfile in compile config.guess config.sub debianrules depcomp detect-autoconf.pl \
 			Doxyfile.global install-sh missing mkinstalldirs nmcheck ylwrap; do \
-		chmod 755 debian/kapptemplate-trinity/opt/trinity/share/apps/kapptemplate/admin/$$admindirfile; \
+		chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/kapptemplate/admin/$$admindirfile; \
 	done
+
+binary-install/tdecachegrind-converters-trinity::
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin
+
+binary-install/umbrello-trinity::
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/umbrello/headings