6 files changed, 69 insertions, 48 deletions

diff --git a/debian/_base/core/tdesdk/debian/control b/debian/_base/core/tdesdk/debian/control
index cf38121ff..567119ca1 100644
--- a/debian/_base/core/tdesdk/debian/control
+++ b/debian/_base/core/tdesdk/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 9~), 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-trinity (<< 4:14.0.0~)
 Breaks: 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-trinity (<< 4:14.0.0~)
 Breaks: 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-trinity (<< 4:14.0.0~)
 Breaks: 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/debian/_base/core/tdesdk/debian/rules b/debian/_base/core/tdesdk/debian/rules
index 2a1a0c921..085eefac4 100755
--- a/debian/_base/core/tdesdk/debian/rules
+++ b/debian/_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-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
diff --git a/dilos/core/tdesdk/debian/control b/dilos/core/tdesdk/debian/control
index 1aa0ec28a..765f030e8 100644
--- a/dilos/core/tdesdk/debian/control
+++ b/dilos/core/tdesdk/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build,
  pkg-config, tdelibs14-trinity-dev, binutils-dev [!solaris-any], 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,
  libiconv-dev [solaris-any]
 Standards-Version: 3.8.4
 
@@ -166,7 +166,7 @@ Architecture: all
 Section: devel
 Replaces: kcachegrind-converters-trinity (<< 4:14.0.0~)
 Breaks: 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
@@ -220,7 +220,7 @@ Architecture: all
 Section: devel
 Replaces: kdesdk-scripts-trinity (<< 4:14.0.0~)
 Breaks: 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
@@ -361,7 +361,7 @@ Architecture: any
 Section: devel
 Replaces: umbrello-trinity (<< 4:14.0.0~)
 Breaks: 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/dilos/core/tdesdk/debian/rules b/dilos/core/tdesdk/debian/rules
index 2321e5f11..ef08fe448 100755
--- a/dilos/core/tdesdk/debian/rules
+++ b/dilos/core/tdesdk/debian/rules
@@ -43,28 +43,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/usr/bin/svn-clean \
-#		debian/tdesdk-scripts-trinity/usr/bin/svn-clean-kde
-#	mv -f debian/tdesdk-scripts-trinity/usr/bin/svnversions \
-#		debian/tdesdk-scripts-trinity/usr/bin/svnversion-kde
+#	mv -f debian/$(cdbs_curpkg)/usr/bin/svn-clean \
+#		debian/$(cdbs_curpkg)/usr/bin/svn-clean-kde
+#	mv -f debian/$(cdbs_curpkg)/usr/bin/svnversions \
+#		debian/$(cdbs_curpkg)/usr/bin/svnversion-kde
 	install -p -D -m644 scripts/kde-buildrc \
-		debian/tdesdk-scripts-trinity/usr/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
+		debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/bin
 
 binary-install/tdesdk-misc-trinity::
 	install -p -D -m644 kdeaccounts-plugin/README \
-		debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/README.kdeaccounts-plugin
+		debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/README.kdeaccounts-plugin
 	install -p -D -m644 tdeioslave/svn/AUTHORS \
-		debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn
+		debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn
 	install -p -D -m644 tdeioslave/svn/README \
-		debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/README.tdeioslave-svn
+		debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/README.tdeioslave-svn
 	install -p -D -m644 kprofilemethod/README \
-		debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/README.kprofilemethod
+		debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/README.kprofilemethod
 	install -p -D -m644 scheck/README \
-		debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/README.scheck
+		debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/README.scheck
 
 binary-install/kapptemplate-trinity::
-	rm -f debian/kapptemplate-trinity/usr/share/apps/kapptemplate/admin/*.cdbs-orig
+	rm -f debian/$(cdbs_curpkg)/usr/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/usr/share/apps/kapptemplate/admin/$$admindirfile; \
+		chmod 755 debian/$(cdbs_curpkg)/usr/share/apps/kapptemplate/admin/$$admindirfile; \
 	done
+
+binary-install/tdecachegrind-trinity::
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/bin
+
+binary-install/umbrello-trinity::
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/share/apps/umbrello/headings
diff --git a/ubuntu/_base/core/tdesdk/debian/control b/ubuntu/_base/core/tdesdk/debian/control
index 3a75d3ec4..33e7b042d 100644
--- a/ubuntu/_base/core/tdesdk/debian/control
+++ b/ubuntu/_base/core/tdesdk/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 9~), 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..085eefac4 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-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