Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

author: François Andriot <albator78@libertysurf.fr> 2013-08-27 21:17:52 +0200
committer: François Andriot <albator78@libertysurf.fr> 2013-08-27 21:17:52 +0200
commit: 1af57210e2e55d40eb39a274fcf48779c6b9e7d5 (patch)
tree: 55c22bbd35462f1c940b24614af05ea07bcd7f35 /ubuntu
parent: af8c5ead9ac4c1ece3408b74224e5e273b6994ce (diff)
parent: 2d0d0ba99b507cab093962cb910ddc7dd4755c94 (diff)
download: tde-packaging-1af57210e2e55d40eb39a274fcf48779c6b9e7d5.tar.gz
tde-packaging-1af57210e2e55d40eb39a274fcf48779c6b9e7d5.zip
141 files changed, 1824 insertions, 615 deletions
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/control b/ubuntu/maverick/applications/desktop-effects-tde/debian/control
index d2efdcdc4..9a9fe5b4c 100644
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/control
+++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/control
@@ -2,7 +2,7 @@ Source: desktop-effects-tde-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), python-central (>= 0.5.6)
+Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), python-support (>= 0.6) | python-dev (>= 2.6.6-3~)
 Standards-Version: 3.8.4
 XS-Python-Version: all
 
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/rules b/ubuntu/maverick/applications/desktop-effects-tde/debian/rules
index d494616db..41ad63be2 100755
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/rules
+++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
@@ -13,4 +16,4 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
 binary-install/desktop-effects-tde-trinity::
-	dh_pycentral -pdesktop-effects-tde-trinity
+	${DH_PYTHON2} -pdesktop-effects-tde-trinity
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/control b/ubuntu/maverick/applications/fusion-icon/debian/control
index 2b2a5d206..0c45f670d 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/control
+++ b/ubuntu/maverick/applications/fusion-icon/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
 XS-Python-Version: all
 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), pkg-config, python-all-dev
-Build-Depends-Indep: python-central (>= 0.6.0), intltool
+Build-Depends-Indep: python-support (>= 0.6), intltool
 Standards-Version: 3.8.4
 
 Package: fusion-icon-trinity
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/rules b/ubuntu/maverick/applications/fusion-icon/debian/rules
index 8c79610db..2b780a204 100755
--- a/ubuntu/maverick/applications/fusion-icon/debian/rules
+++ b/ubuntu/maverick/applications/fusion-icon/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pycentral
+DEB_PYTHON_SYSTEM=pysupport
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 # include /usr/share/cdbs/1/class/python-distutils.mk
@@ -17,5 +17,5 @@ binary-install/fusion-icon-trinity::
 	mkdir -p debian/fusion-icon-trinity/opt/trinity
 	cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
 	rm -rf debian/fusion-icon-trinity/usr
-	dh_pycentral -pfusion-icon-trinity
+	dh_pysupport -pfusion-icon-trinity
 	dh_icons
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..ba002080b
--- /dev/null
+++ b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+#include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/kde.mk b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/kde.mk
new file mode 100644
index 000000000..765560c89
--- /dev/null
+++ b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final =
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/versions.pl b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/changelog b/ubuntu/maverick/applications/klcddimmer/debian/changelog
new file mode 100644
index 000000000..c7731210d
--- /dev/null
+++ b/ubuntu/maverick/applications/klcddimmer/debian/changelog
@@ -0,0 +1,6 @@
+klcddimmer-trinity (0.3-0) unstable; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Wed, 21 Aug 2013 21:11:10 +0200
+
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/compat b/ubuntu/maverick/applications/klcddimmer/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/maverick/applications/klcddimmer/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/control b/ubuntu/maverick/applications/klcddimmer/debian/control
new file mode 100644
index 000000000..785e17d0a
--- /dev/null
+++ b/ubuntu/maverick/applications/klcddimmer/debian/control
@@ -0,0 +1,15 @@
+Source: klcddimmer-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>= 5.0.0), cdbs, automake, libtool, tdelibs4-trinity-dev
+Standards-Version: 3.7.3
+Homepage: http://klcddimeer.sourceforge.net/
+
+Package: klcddimmer-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: smartdimmer
+Description: Applet to adjust LCD brightness for TDE
+ KLcdDimmer is applet for simple adjust LCD brightness.
+ Notice that this applet relies on an external program to get/set the brightness.
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/copyright b/ubuntu/maverick/applications/klcddimmer/debian/copyright
new file mode 100644
index 000000000..e8fb907ba
--- /dev/null
+++ b/ubuntu/maverick/applications/klcddimmer/debian/copyright
@@ -0,0 +1,19 @@
+This package was debianized by Slávek Banko <slavek.banko@axis.cz> on
+Wed, 21 Aug 2013 21:11:10 +0200.
+
+It was downloaded from http://klcddimmer.sourceforge.net
+
+Copyright Holder: 2006-2007 Lorenzo Bettini
+
+Upstream Author:  Lorenzo Bettini
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/docs b/ubuntu/maverick/applications/klcddimmer/debian/docs
new file mode 100644
index 000000000..724e08449
--- /dev/null
+++ b/ubuntu/maverick/applications/klcddimmer/debian/docs
@@ -0,0 +1,2 @@
+README
+TODO
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/rules b/ubuntu/maverick/applications/klcddimmer/debian/rules
new file mode 100755
index 000000000..55935a695
--- /dev/null
+++ b/ubuntu/maverick/applications/klcddimmer/debian/rules
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	dh_testdir
+
+	# Regenerate build system
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+	autoreconf --install && automake -f && \
+	$(MAKE) -f admin/Makefile.common && \
+	touch debian/stamp-bootstrap
+
+clean::
+	dh_testdir
+	rm -f debian/stamp-bootstrap
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/source/format b/ubuntu/maverick/applications/klcddimmer/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/maverick/applications/klcddimmer/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/source/options b/ubuntu/maverick/applications/klcddimmer/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/maverick/applications/klcddimmer/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/maverick/dependencies/arts/debian/control.in b/ubuntu/maverick/dependencies/arts/debian/control.in
index 42a6b7273..b9f79f602 100644
--- a/ubuntu/maverick/dependencies/arts/debian/control.in
+++ b/ubuntu/maverick/dependencies/arts/debian/control.in
@@ -32,7 +32,7 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, oss-compat
 Recommends: libarts1-akode-trinity
-Conflicts: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), tdelibs4c2a (<< 4:3.5.9)
+Conflicts: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), tdelibs14 (<< 4:3.5.9)
 Replaces: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0)
 Description: aRts sound system core components
  aRts is a short form for "analog realtime synthesizer". aRts is highly
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/control b/ubuntu/maverick/dependencies/python-tqt/debian/control
index 71f586675..4eb3719bd 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/control
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1), python-sip-dbg, python-all-dbg
+Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), python-sip-dbg, python-all-dbg
 Standards-Version: 3.8.4
 
 Package: python-tqt
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
index 3d0ed6137..36e6c1349 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
@@ -1,15 +1,15 @@
 # lintian test overriden as the files tripping this error are put into the source
 # of the generated package. This is a false-positive
 
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qt/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtaxcontainer/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtcanvas/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtext/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtgl/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtnetwork/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtpe/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtsql/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qttable/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtui/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtxml/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qt/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtaxcontainer/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtcanvas/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtext/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtgl/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtnetwork/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtpe/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtsql/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qttable/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtui/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtxml/copying.sip
 
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.preinst b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.preinst
deleted file mode 100644
index b17b35a44..000000000
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.preinst
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# TODO: remove this file after releasing Squeeze
-set -e
-if [ "$1" = upgrade ]
-then
-	if dpkg --compare-versions "$2" lt 3.17.6-2; then
-	    if which python >/dev/null 2>&1 && which pycentral >/dev/null 2>&1; then
-		pycentral pkgremove python-qt-dev
-	    else
-		flist=$(tempfile)
-		find /usr/share/pycentral/python-qt-dev -depth -mindepth 2 \
-		    \( -name '*.py' -printf 'p %P\n' -o -printf '%y %P\n' \) \
-		    > $flist 2>/dev/null || true
-		    if [ -s $flist ]; then
-			for d in /usr/lib/python[0-9].[0-9]; do
-			    case "$d" in */python2.1|*/python2.2) continue; esac
-			    while read t n; do
-				case "$t" in
-				    p) rm -f $d/$n $d/${n}[co];;
-				    d) rmdir $d/$n 2>/dev/null || true;;
-				    *) rm -f $d/$n
-				esac
-			    done < $flist
-			done
-		    fi
-		    rm -f $flist
-		    dpkg -L python-qt-dev \
-			| awk '/\/usr\/share\/pycentral/ {next} /\.py$/ {print $0"c\n" $0"o"}' \
-			| xargs rm -f >&2
-	    fi
-	fi
-fi
-
-#DEBHELPER#
-
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs
index dcd0e5b12..43a4fa9fa 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs
@@ -1,2 +1,2 @@
-usr/share/doc/python-qt3-doc/html
-usr/share/doc/python-qt3-doc/examples
+usr/share/doc/python-tqt-doc/html
+usr/share/doc/python-tqt-doc/examples
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install
index 840625c0a..65f82036b 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install
@@ -1 +1 @@
-doc/PyQt.html usr/share/doc/python-qt3-doc/html
+doc/PyQt.html usr/share/doc/python-tqt-doc/html
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/rules b/ubuntu/maverick/dependencies/python-tqt/debian/rules
index 86eca95c9..b0acb35f6 100755
--- a/ubuntu/maverick/dependencies/python-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/rules
@@ -32,6 +32,9 @@ CXXFLAGS += "-I/usr/include/tqt"
 
 PYTHONS	:= $(shell pyversions -vr debian/control)
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
 
 GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
 ifneq (,$(filter $(GCCVER),4.2 4.3))
@@ -154,7 +157,7 @@ endif
 #	dh_strip
 	dh_compress -X.py -X.bmp -X.ui -X.sql
 	dh_fixperms
-	dh_pysupport
+	${DH_PYTHON2}
 	dh_sip
 	dh_lintian
 	dh_installdeb
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/control b/ubuntu/maverick/dependencies/sip4-tqt/debian/control
index 825f458eb..7091f5392 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/control
+++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1), libtqtinterface-dev
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), libtqtinterface-dev
 Standards-Version: 3.8.4
 XS-Python-Version: all
 
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links
index 26a9ded9b..26a9ded9b 100755..100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links
+++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules
index 2286739d5..9073bd22f 100755
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules
@@ -19,6 +19,9 @@ endif
 
 PYTHONS	:= $(shell pyversions -vr debian/control)
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2 --no-dbg-cleaning,dh_pysupport)
+
 -include /usr/share/python/python.mk
 ifeq (,$(py_sitename))
 py_sitename = site-packages
@@ -132,7 +135,7 @@ ifneq (,$(findstring -a, $(DH_OPTIONS)))
 endif
 	dh_compress 
 	dh_fixperms
-	dh_pysupport
+	${DH_PYTHON2}
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/control b/ubuntu/maverick/libraries/pytdeextensions/debian/control
index e2657b279..b9b40b127 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/control
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libtool,
+Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool,
  libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
  python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5)
 Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
index 17743dd31..7cd5d5817 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
@@ -1,10 +1,10 @@
-pytdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
-pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop tdecmshell
-pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
-pytdeextensions: desktop-entry-invalid-category X-TDE-settings-system ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
-pytdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
-pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
-pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
+pytdeextensions-trinity: desktop-entry-contains-unknown-key ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
+pytdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop tdecmshell
+pytdeextensions-trinity: desktop-entry-invalid-category QT ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions-trinity: desktop-entry-invalid-category X-TDE-settings-system ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions-trinity: desktop-entry-lacks-main-category ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pytdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
+pytdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pytdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
 
-pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py
-pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py
+pytdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py
+pytdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pytdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control
index f8b85ccae..d68748cae 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/control
+++ b/ubuntu/maverick/libraries/python-trinity/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-tqt-dev, tdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
+Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-tqt-dev, tdelibs4-trinity-dev, python-support (>= 0.6) | python-dev (>= 2.6.6-3~), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
 Standards-Version: 3.8.4
 Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
 XS-Python-Version: all
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/rules b/ubuntu/maverick/libraries/python-trinity/debian/rules
index 67af8c2d8..d4dac70f3 100755
--- a/ubuntu/maverick/libraries/python-trinity/debian/rules
+++ b/ubuntu/maverick/libraries/python-trinity/debian/rules
@@ -31,6 +31,9 @@ endif
 PYTHONS := $(shell pyversions -vr debian/control)
 DBG_PYTHONS := $(shell pyversions -vd)
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
 GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
 ifneq (,$(filter $(GCCVER),4.2 4.3))
         SPLIT=20
@@ -149,7 +152,7 @@ ifeq (,$(findstring -i, $(DH_OPTIONS)))
 endif
 	dh_compress -X.py -X.ui -X.dtd
 	dh_fixperms
-	DH_PYCENTRAL=nomove dh_pycentral
+	${DH_PYTHON2}
 	dh_installdeb
 	dh_shlibdeps -l /opt/trinity/lib
 	dh_gencontrol
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/control b/ubuntu/maverick/metapackages/rename-meta/debian/control
index c0847566e..8ae8b513b 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/control
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/control
@@ -38,7 +38,7 @@ Description: Transitional dummy package.  This can be safely removed after your
 
 Package: kdelibs4c2a-trinity
 Architecture: all
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Conflicts: kdelibs4c2a-trinity (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
diff --git a/ubuntu/maverick/tde-i18n/debian/control b/ubuntu/maverick/tde-i18n/debian/control
index ab2e12813..a9c03b5d2 100644
--- a/ubuntu/maverick/tde-i18n/debian/control
+++ b/ubuntu/maverick/tde-i18n/debian/control
@@ -11,7 +11,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-af-kde3 (<< 4:14.0.0), kde-i18n-af-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-af-kde3 (<< 4:14.0.0), kde-i18n-af-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Afrikaans (af) internationalized (i18n) files for KDE
@@ -23,7 +23,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ar-kde3 (<< 4:14.0.0), kde-i18n-ar-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ar-kde3 (<< 4:14.0.0), kde-i18n-ar-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Arabic (ar) internationalized (i18n) files for KDE
@@ -35,7 +35,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-az-kde3 (<< 4:14.0.0), kde-i18n-az-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-az-kde3 (<< 4:14.0.0), kde-i18n-az-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Azerbaijani (az) internationalized (i18n) files for KDE
@@ -47,7 +47,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-be-kde3 (<< 4:14.0.0), kde-i18n-be-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-be-kde3 (<< 4:14.0.0), kde-i18n-be-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Belarusian (be) internationalized (i18n) files for KDE
@@ -59,7 +59,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-bg-kde3 (<< 4:14.0.0), kde-i18n-bg-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-bg-kde3 (<< 4:14.0.0), kde-i18n-bg-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Bulgarian (bg) internationalized (i18n) files for KDE
@@ -71,7 +71,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-bn-kde3 (<< 4:14.0.0), kde-i18n-bn-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-bn-kde3 (<< 4:14.0.0), kde-i18n-bn-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Bengali (bn) internationalized (i18n) files for KDE
@@ -83,7 +83,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-br-kde3 (<< 4:14.0.0), kde-i18n-br-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-br-kde3 (<< 4:14.0.0), kde-i18n-br-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Breton (br) internationalized (i18n) files for KDE
@@ -95,7 +95,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-bs-kde3 (<< 4:14.0.0), kde-i18n-bs-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-bs-kde3 (<< 4:14.0.0), kde-i18n-bs-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Bosnian (bs) internationalized (i18n) files for KDE
@@ -107,7 +107,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ca-kde3 (<< 4:14.0.0), kde-i18n-ca-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ca-kde3 (<< 4:14.0.0), kde-i18n-ca-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Catalan (ca) internationalized (i18n) files for KDE
@@ -119,7 +119,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-cs-kde3 (<< 4:14.0.0), kde-i18n-cs-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-cs-kde3 (<< 4:14.0.0), kde-i18n-cs-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Czech (cs) internationalized (i18n) files for KDE
@@ -131,7 +131,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-csb-kde3 (<< 4:14.0.0), kde-i18n-csb-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-csb-kde3 (<< 4:14.0.0), kde-i18n-csb-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Kashubian (csb) internationalized (i18n) files for KDE
@@ -143,7 +143,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-cy-kde3 (<< 4:14.0.0), kde-i18n-cy-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-cy-kde3 (<< 4:14.0.0), kde-i18n-cy-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Welsh (cy) internationalized (i18n) files for KDE
@@ -155,7 +155,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-da-kde3 (<< 4:14.0.0), kde-i18n-da-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-da-kde3 (<< 4:14.0.0), kde-i18n-da-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Danish (da) internationalized (i18n) files for KDE
@@ -167,7 +167,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-de-kde3 (<< 4:14.0.0), kde-i18n-de-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-de-kde3 (<< 4:14.0.0), kde-i18n-de-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: German (de) internationalized (i18n) files for KDE
@@ -179,7 +179,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-el-kde3 (<< 4:14.0.0), kde-i18n-el-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-el-kde3 (<< 4:14.0.0), kde-i18n-el-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Greek (el) internationalized (i18n) files for KDE
@@ -191,7 +191,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-engb-kde3 (<< 4:14.0.0), kde-i18n-engb-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-engb-kde3 (<< 4:14.0.0), kde-i18n-engb-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: British English (en_GB) internationalized (i18n) files for KDE
@@ -203,7 +203,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-eo-kde3 (<< 4:14.0.0), kde-i18n-eo-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-eo-kde3 (<< 4:14.0.0), kde-i18n-eo-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Esperanto (eo) internationalized (i18n) files for KDE
@@ -215,7 +215,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-es-kde3 (<< 4:14.0.0), kde-i18n-es-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-es-kde3 (<< 4:14.0.0), kde-i18n-es-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Spanish (es) internationalized (i18n) files for KDE
@@ -227,7 +227,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-et-kde3 (<< 4:14.0.0), kde-i18n-et-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-et-kde3 (<< 4:14.0.0), kde-i18n-et-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Estonian (et) internationalized (i18n) files for KDE
@@ -239,7 +239,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-eu-kde3 (<< 4:14.0.0), kde-i18n-eu-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-eu-kde3 (<< 4:14.0.0), kde-i18n-eu-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Basque (eu) internationalized (i18n) files for KDE
@@ -251,7 +251,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-fa-kde3 (<< 4:14.0.0), kde-i18n-fa-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-fa-kde3 (<< 4:14.0.0), kde-i18n-fa-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Farsi (Persian) (fa) internationalized (i18n) files for KDE
@@ -263,7 +263,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-fi-kde3 (<< 4:14.0.0), kde-i18n-fi-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-fi-kde3 (<< 4:14.0.0), kde-i18n-fi-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Finnish (fi) internationalized (i18n) files for KDE
@@ -275,7 +275,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-fr-kde3 (<< 4:14.0.0), kde-i18n-fr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-fr-kde3 (<< 4:14.0.0), kde-i18n-fr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: French (fr) internationalized (i18n) files for KDE
@@ -287,7 +287,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-fy-kde3 (<< 4:14.0.0), kde-i18n-fy-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-fy-kde3 (<< 4:14.0.0), kde-i18n-fy-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Frisian (fy) internationalized (i18n) files for KDE
@@ -299,7 +299,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ga-kde3 (<< 4:14.0.0), kde-i18n-ga-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ga-kde3 (<< 4:14.0.0), kde-i18n-ga-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Irish Gaelic (ga) internationalized (i18n) files for KDE
@@ -311,7 +311,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-gl-kde3 (<< 4:14.0.0), kde-i18n-gl-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-gl-kde3 (<< 4:14.0.0), kde-i18n-gl-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Galician (gl) internationalized (i18n) files for KDE
@@ -323,7 +323,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-he-kde3 (<< 4:14.0.0), kde-i18n-he-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-he-kde3 (<< 4:14.0.0), kde-i18n-he-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Hebrew (he) internationalized (i18n) files for KDE
@@ -335,7 +335,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-hi-kde3 (<< 4:14.0.0), kde-i18n-hi-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-hi-kde3 (<< 4:14.0.0), kde-i18n-hi-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Hindi (hi) internationalized (i18n) files for KDE
@@ -347,7 +347,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-hr-kde3 (<< 4:14.0.0), kde-i18n-hr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-hr-kde3 (<< 4:14.0.0), kde-i18n-hr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Croatian (hr) internationalized (i18n) files for KDE
@@ -359,7 +359,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-hu-kde3 (<< 4:14.0.0), kde-i18n-hu-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-hu-kde3 (<< 4:14.0.0), kde-i18n-hu-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Hungarian (hu) internationalized (i18n) files for KDE
@@ -371,7 +371,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-is-kde3 (<< 4:14.0.0), kde-i18n-is-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-is-kde3 (<< 4:14.0.0), kde-i18n-is-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Icelandic (is) internationalized (i18n) files for KDE
@@ -383,7 +383,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-it-kde3 (<< 4:14.0.0), kde-i18n-it-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-it-kde3 (<< 4:14.0.0), kde-i18n-it-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Italian (it) internationalized (i18n) files for KDE
@@ -395,7 +395,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ja-kde3 (<< 4:14.0.0), kde-i18n-ja-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ja-kde3 (<< 4:14.0.0), kde-i18n-ja-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Japanese (ja) internationalized (i18n) files for KDE
@@ -407,7 +407,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-kk-kde3 (<< 4:14.0.0), kde-i18n-kk-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-kk-kde3 (<< 4:14.0.0), kde-i18n-kk-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Kazakh (kk) internationalized (i18n) files for KDE
@@ -419,7 +419,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-km-kde3 (<< 4:14.0.0), kde-i18n-km-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-km-kde3 (<< 4:14.0.0), kde-i18n-km-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Khmer (km) internationalized (i18n) files for KDE
@@ -431,7 +431,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ko-kde3 (<< 4:14.0.0), kde-i18n-ko-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ko-kde3 (<< 4:14.0.0), kde-i18n-ko-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Korean (ko) internationalized (i18n) files for KDE
@@ -443,7 +443,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-lt-kde3 (<< 4:14.0.0), kde-i18n-lt-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-lt-kde3 (<< 4:14.0.0), kde-i18n-lt-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Lithuanian (lt) internationalized (i18n) files for KDE
@@ -455,7 +455,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-lv-kde3 (<< 4:14.0.0), kde-i18n-lv-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-lv-kde3 (<< 4:14.0.0), kde-i18n-lv-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Latvian (lv) internationalized (i18n) files for KDE
@@ -467,7 +467,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-mk-kde3 (<< 4:14.0.0), kde-i18n-mk-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-mk-kde3 (<< 4:14.0.0), kde-i18n-mk-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Macedonian (mk) internationalized (i18n) files for KDE
@@ -479,7 +479,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-mn-kde3 (<< 4:14.0.0), kde-i18n-mn-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-mn-kde3 (<< 4:14.0.0), kde-i18n-mn-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Mongolian (mn) internationalized (i18n) files for KDE
@@ -491,7 +491,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ms-kde3 (<< 4:14.0.0), kde-i18n-ms-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ms-kde3 (<< 4:14.0.0), kde-i18n-ms-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Malay (ms) internationalized (i18n) files for KDE
@@ -503,7 +503,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-nb-kde3 (<< 4:14.0.0), kde-i18n-nb-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-nb-kde3 (<< 4:14.0.0), kde-i18n-nb-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity, tde-i18n-no-trinity
 Description: Norwegian Bookmal (nb) internationalized (i18n) files for KDE
@@ -515,7 +515,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-nds-kde3 (<< 4:14.0.0), kde-i18n-nds-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-nds-kde3 (<< 4:14.0.0), kde-i18n-nds-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Low Saxon (nds) internationalized (i18n) files for KDE
@@ -527,7 +527,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-nl-kde3 (<< 4:14.0.0), kde-i18n-nl-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-nl-kde3 (<< 4:14.0.0), kde-i18n-nl-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Dutch (nl) internationalized (i18n) files for KDE
@@ -539,7 +539,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-nn-kde3 (<< 4:14.0.0), kde-i18n-nn-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-nn-kde3 (<< 4:14.0.0), kde-i18n-nn-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Description: Norwegian Nynorsk (nn) internationalized (i18n) files for KDE
  This package contains the Norwegian Nynorsk (nn) internationalized (i18n)
@@ -550,7 +550,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-pa-kde3 (<< 4:14.0.0), kde-i18n-pa-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-pa-kde3 (<< 4:14.0.0), kde-i18n-pa-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Punjabi (pa) internationalized (i18n) files for KDE
@@ -562,7 +562,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-pl-kde3 (<< 4:14.0.0), kde-i18n-pl-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-pl-kde3 (<< 4:14.0.0), kde-i18n-pl-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Polish (pl) internationalized (i18n) files for KDE
@@ -574,7 +574,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-pt-kde3 (<< 4:14.0.0), kde-i18n-pt-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-pt-kde3 (<< 4:14.0.0), kde-i18n-pt-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Portuguese (pt) internationalized (i18n) files for KDE
@@ -586,7 +586,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ptbr-kde3 (<< 4:14.0.0), kde-i18n-ptbr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ptbr-kde3 (<< 4:14.0.0), kde-i18n-ptbr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Brazilian Portuguese (pt_BR) internationalized (i18n) files for KDE
@@ -598,7 +598,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ro-kde3 (<< 4:14.0.0), kde-i18n-ro-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ro-kde3 (<< 4:14.0.0), kde-i18n-ro-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Romanian (ro) internationalized (i18n) files for KDE
@@ -610,7 +610,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ru-kde3 (<< 4:14.0.0), kde-i18n-ru-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ru-kde3 (<< 4:14.0.0), kde-i18n-ru-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Russian (ru) internationalized (i18n) files for KDE
@@ -622,7 +622,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-rw-kde3 (<< 4:14.0.0), kde-i18n-rw-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-rw-kde3 (<< 4:14.0.0), kde-i18n-rw-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Kinyarwanda (rw) internationalized (i18n) files for KDE
@@ -634,7 +634,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-se-kde3 (<< 4:14.0.0), kde-i18n-se-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-se-kde3 (<< 4:14.0.0), kde-i18n-se-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Northern Sami (se) internationalized (i18n) files for KDE
@@ -646,7 +646,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-sk-kde3 (<< 4:14.0.0), kde-i18n-sk-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-sk-kde3 (<< 4:14.0.0), kde-i18n-sk-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Slovak (sk) internationalized (i18n) files for KDE
@@ -658,7 +658,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-sl-kde3 (<< 4:14.0.0), kde-i18n-sl-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-sl-kde3 (<< 4:14.0.0), kde-i18n-sl-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Slovenian (sl) internationalized (i18n) files for KDE
@@ -670,7 +670,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-sr-kde3 (<< 4:14.0.0), kde-i18n-sr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-sr-kde3 (<< 4:14.0.0), kde-i18n-sr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Serbian (sr) internationalized (i18n) files for KDE
@@ -682,7 +682,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ss-kde3 (<< 4:14.0.0), kde-i18n-ss-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ss-kde3 (<< 4:14.0.0), kde-i18n-ss-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Swati (ss) internationalized (i18n) files for KDE
@@ -694,7 +694,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-srlatin-kde3 (<< 4:14.0.0), kde-i18n-srlatin-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-srlatin-kde3 (<< 4:14.0.0), kde-i18n-srlatin-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Latin Serbian (sr@Latn) internationalized (i18n) files for KDE
@@ -706,7 +706,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-sv-kde3 (<< 4:14.0.0), kde-i18n-sv-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-sv-kde3 (<< 4:14.0.0), kde-i18n-sv-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Swedish (sv) internationalized (i18n) files for KDE
@@ -718,7 +718,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ta-kde3 (<< 4:14.0.0), kde-i18n-ta-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ta-kde3 (<< 4:14.0.0), kde-i18n-ta-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Tamil (ta) internationalized (i18n) files for KDE
@@ -730,7 +730,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-te-kde3 (<< 4:14.0.0), kde-i18n-te-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-te-kde3 (<< 4:14.0.0), kde-i18n-te-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Telugu (te) internationalized (i18n) files for KDE
@@ -742,7 +742,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-tg-kde3 (<< 4:14.0.0), kde-i18n-tg-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-tg-kde3 (<< 4:14.0.0), kde-i18n-tg-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Tajik (tg) internationalized (i18n) files for KDE
@@ -754,7 +754,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-th-kde3 (<< 4:14.0.0), kde-i18n-th-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-th-kde3 (<< 4:14.0.0), kde-i18n-th-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Thai (th) internationalized (i18n) files for KDE
@@ -766,7 +766,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-tr-kde3 (<< 4:14.0.0), kde-i18n-tr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-tr-kde3 (<< 4:14.0.0), kde-i18n-tr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Turkish (tr) internationalized (i18n) files for KDE
@@ -778,7 +778,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-uk-kde3 (<< 4:14.0.0), kde-i18n-uk-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-uk-kde3 (<< 4:14.0.0), kde-i18n-uk-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Ukrainian (uk) internationalized (i18n) files for KDE
@@ -790,7 +790,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-uz-kde3 (<< 4:14.0.0), kde-i18n-uz-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-uz-kde3 (<< 4:14.0.0), kde-i18n-uz-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Uzbek (uz) internationalized (i18n) files for KDE
@@ -803,7 +803,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-uzcyrillic-kde3 (<< 4:14.0.0), kde-i18n-uzcyrillic-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-uzcyrillic-kde3 (<< 4:14.0.0), kde-i18n-uzcyrillic-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Cyrillic Uzbek (uz@cyrillic) internationalized (i18n) files for KDE
@@ -815,7 +815,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-vi-kde3 (<< 4:14.0.0), kde-i18n-vi-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-vi-kde3 (<< 4:14.0.0), kde-i18n-vi-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Vietnamese (vi) internationalized (i18n) files for KDE
@@ -827,7 +827,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-wa-kde3 (<< 4:14.0.0), kde-i18n-wa-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-wa-kde3 (<< 4:14.0.0), kde-i18n-wa-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Walloon (wa) internationalized (i18n) files for KDE
@@ -839,7 +839,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-zhcn-kde3 (<< 4:14.0.0), kde-i18n-zhcn-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-zhcn-kde3 (<< 4:14.0.0), kde-i18n-zhcn-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Chinese Simplified (zh_CN) internationalized (i18n) files for KDE
@@ -851,7 +851,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-zhtw-kde3 (<< 4:14.0.0), kde-i18n-zhtw-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-zhtw-kde3 (<< 4:14.0.0), kde-i18n-zhtw-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Chinese Traditional (zh_TW) internationalized (i18n) files for KDE
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index 43c9f14aa..f4ff3113f 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 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>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, binutils-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, binutils-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control
index ad28b4291..a6f1eb5f3 100644
--- a/ubuntu/maverick/tdebindings/debian/control
+++ b/ubuntu/maverick/tdebindings/debian/control
@@ -1,6 +1,6 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
- python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk,
+ python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk,
  gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
  tdelibs4-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby-dev, flex, bison,
diff --git a/ubuntu/maverick/tdebindings/debian/rules b/ubuntu/maverick/tdebindings/debian/rules
index f6ae5709b..c31999f17 100755
--- a/ubuntu/maverick/tdebindings/debian/rules
+++ b/ubuntu/maverick/tdebindings/debian/rules
@@ -3,6 +3,9 @@
 DEB_QUILT_PATCHDIR_LINK :=
 export QUILT_PATCHES=debian/patches
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 override DEB_BUILDDIR := $(DEB_SRCDIR)
@@ -131,7 +134,7 @@ binary-install/libqt0-ruby1.8-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
 binary-install/python-dcop-trinity::
-	dh_pysupport -p$(cdbs_curpkg)
+	${DH_PYTHON2} -p$(cdbs_curpkg)
 
 ###
 
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control
index 8274ad36a..fd9246ac6 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
 Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
- binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
+ binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 14.0.0), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev, libnm-util-dev,
@@ -27,7 +27,7 @@ Replaces: kdelibs-kde3 (<< 4:14.0.0), kdelibs-trinity (<< 4:14.0.0)
 Breaks: kdelibs-kde3 (<< 4:14.0.0), kdelibs-trinity (<< 4:14.0.0)
 Provides: tdelibs
 Conflicts: tdelibs
-Depends: tdelibs4c2a-trinity (>= ${Source-Version}),
+Depends: tdelibs14-trinity (>= ${Source-Version}),
  tdelibs-data-trinity (>= ${Source-Version})
 Description: core libraries from the official Trinity release
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@@ -55,11 +55,12 @@ Description: core shared data for all TDE applications
  This package is part of TDE, and a component of the TDE libraries module.
  See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
 
-Package: tdelibs4c2a-trinity
+Package: tdelibs14-trinity
 Section: libs
 Architecture: any
-Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0)
-Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0)
+Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0), tdelibs4c2a-trinity
+Provides: tdelibs4c2a-trinity
+Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0), tdelibs4c2a-trinity
 Depends: ${shlibs:Depends}, tdelibs-data-trinity,
  tdelibs-data-trinity, libart-2.0-2 (>= 14.0.0), perl, xbase-clients, sudo
 Recommends: xdg-user-dirs, upower
@@ -80,7 +81,7 @@ Section: libdevel
 Architecture: any
 Replaces: kdelibs4-kde3-dev (<< 4:14.0.0), kdelibs4-trinity-dev (<< 4:14.0.0)
 Breaks: kdelibs4-kde3-dev (<< 4:14.0.0), kdelibs4-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 14.0.0),
+Depends: tdelibs14-trinity (= ${Source-Version}), libart-2.0-dev (>= 14.0.0),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
@@ -118,8 +119,8 @@ Architecture: any
 Replaces: kdelibs-kde3-dbg (<< 4:14.0.0), kdelibs-trinity-dbg (<< 4:14.0.0)
 Breaks: kdelibs-kde3-dbg (<< 4:14.0.0), kdelibs-trinity-dbg (<< 4:14.0.0)
 Priority: extra
-Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg
-Depends: tdelibs4c2a-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64]
+Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs14-trinity-dbg
+Depends: tdelibs14-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64]
 Description: debugging symbols for tdelibs
  This package contains the debugging symbols associated with tdelibs.
  They will automatically be used by gdb for debugging tdelibs-related
diff --git a/ubuntu/maverick/tdelibs/debian/control.in b/ubuntu/maverick/tdelibs/debian/control.in
index e949855d8..43f0657aa 100644
--- a/ubuntu/maverick/tdelibs/debian/control.in
+++ b/ubuntu/maverick/tdelibs/debian/control.in
@@ -22,7 +22,7 @@ Standards-Version: 3.7.2
 Package: tdelibs
 Section: libs
 Architecture: all
-Depends: tdelibs4c2a (>= ${Source-Version}),
+Depends: tdelibs14 (>= ${Source-Version}),
  tdelibs-data (>= ${Source-Version})
 Description: core libraries from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -52,7 +52,7 @@ Description: core shared data for all KDE applications
  This package is part of KDE, and a component of the KDE libraries module.
  See the 'kde' and 'tdelibs' packages for more information.
 
-Package: tdelibs4c2a
+Package: tdelibs14
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, tdelibs-data (>> ${KDE-Version3}),
@@ -76,7 +76,7 @@ Description: core libraries and binaries for all KDE applications
 Package: tdelibs4-dev
 Section: libdevel
 Architecture: any
-Depends: tdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
+Depends: tdelibs14 (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
@@ -86,7 +86,7 @@ Depends: tdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4),
  gettext-kde, tdesdk-scripts
 Provides: tdelibs-dev
-Replaces: tdebase-dev (<< 4:3.4.0), tdelibs4c2a (<< 4:3.5.7.dfsg.1-5)
+Replaces: tdebase-dev (<< 4:3.4.0), tdelibs14 (<< 4:3.5.7.dfsg.1-5)
 Description: development files for the KDE core libraries
  This package contains all the headers and other related files needed
  to compile KDE applications, or develop applications which use the
@@ -111,9 +111,9 @@ Package: tdelibs-dbg
 Section: libdevel
 Architecture: any
 Priority: extra
-Conflicts: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs4c2a-dbg
-Replaces: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs4c2a-dbg
-Depends: tdelibs4c2a (= ${Source-Version}), qt-x11-free-dbg, libc6-dbg [amd64]
+Conflicts: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs14-dbg
+Replaces: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs14-dbg
+Depends: tdelibs14 (= ${Source-Version}), qt-x11-free-dbg, libc6-dbg [amd64]
 Description: debugging symbols for tdelibs
  This package contains the debugging symbols associated with tdelibs.
  They will automatically be used by gdb for debugging tdelibs-related
diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules
index 8d56f7eb0..ff689557e 100755
--- a/ubuntu/maverick/tdelibs/debian/rules
+++ b/ubuntu/maverick/tdelibs/debian/rules
@@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes
 version=Debian Package $(DEB_VERSION)
 DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
 
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" -DWITH_LIBBFD="ON" \
 -DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" -DWITH_TDEHWLIB_DAEMONS="ON" -DWITH_UPOWER="ON" -DWITH_UDISKS="ON" -DWITH_UDISKS2="ON" -DWITH_CONSOLEKIT="ON" -DWITH_NETWORK_MANAGER_BACKEND="ON" -DWITH_LZMA="ON" \
 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
@@ -98,7 +98,7 @@ common-install-prehook-impl::
 	  rm -f LIST; \
 	fi
 
-binary-install/tdelibs4c2a-trinity::
+binary-install/tdelibs14-trinity::
 	mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs4c2a-trinity/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tdecmshell debian/tdelibs4c2a-trinity/opt/trinity/bin/tdecmshell
+	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell.real
+	install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links
index a94119055..3b0f1cdf4 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links
@@ -1 +1 @@
-/etc/ssl/certs/ca-certificates.crt	debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt
+/etc/ssl/certs/ca-certificates.crt	opt/trinity/share/apps/kssl/ca-bundle.crt
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.docs b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.docs
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.docs
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.install
index a6c084acd..c836b40b0 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.install
@@ -218,8 +218,8 @@ debian/tmp/opt/trinity/lib/trinity/plugins/styles/plastik.la
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/plastik.so
 debian/tmp/opt/trinity/lib/libartskde.so.1
 debian/tmp/opt/trinity/lib/libartskde.so.1.2.0
-debian/tmp/opt/trinity/lib/libDCOP.so.4
-debian/tmp/opt/trinity/lib/libDCOP.so.4.2.0
+debian/tmp/opt/trinity/lib/libDCOP.so.14
+debian/tmp/opt/trinity/lib/libDCOP.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeabc_dir.so.1
 debian/tmp/opt/trinity/lib/libtdeabc_dir.so.1.0.0
 debian/tmp/opt/trinity/lib/libtdeabc_file.so.1
@@ -240,12 +240,12 @@ debian/tmp/opt/trinity/lib/libtdeabc.so.1
 debian/tmp/opt/trinity/lib/libtdeabc.so.1.2.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0.0.0
-debian/tmp/opt/trinity/lib/libtdecore.so.4
-debian/tmp/opt/trinity/lib/libtdecore.so.4.2.0
-debian/tmp/opt/trinity/lib/libtdefakes.so.4
-debian/tmp/opt/trinity/lib/libtdefakes.so.4.2.0
-debian/tmp/opt/trinity/lib/libtdefx.so.4
-debian/tmp/opt/trinity/lib/libtdefx.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdecore.so.14
+debian/tmp/opt/trinity/lib/libtdecore.so.14.0.0
+debian/tmp/opt/trinity/lib/libtdefakes.so.14
+debian/tmp/opt/trinity/lib/libtdefakes.so.14.0.0
+debian/tmp/opt/trinity/lib/libtdefx.so.14
+debian/tmp/opt/trinity/lib/libtdefx.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.so
 debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.so
@@ -257,24 +257,24 @@ debian/tmp/opt/trinity/lib/libtdeinit_kded.so
 debian/tmp/opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
 debian/tmp/opt/trinity/lib/libtdeinit_tdeio_uiserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_tdelauncher.so
-debian/tmp/opt/trinity/lib/libtdeprint_management.so.4
-debian/tmp/opt/trinity/lib/libtdeprint_management.so.4.2.0
-debian/tmp/opt/trinity/lib/libtdeprint.so.4
-debian/tmp/opt/trinity/lib/libtdeprint.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.14
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.14.0.0
+debian/tmp/opt/trinity/lib/libtdeprint.so.14
+debian/tmp/opt/trinity/lib/libtdeprint.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdesasl.so.1
 debian/tmp/opt/trinity/lib/libtdesasl.so.1.2.0
-debian/tmp/opt/trinity/lib/libtdesu.so.4
-debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0
-debian/tmp/opt/trinity/lib/libtdeui.so.4
-debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdesu.so.14
+debian/tmp/opt/trinity/lib/libtdesu.so.14.0.0
+debian/tmp/opt/trinity/lib/libtdeui.so.14
+debian/tmp/opt/trinity/lib/libtdeui.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdednssd.so.1
 debian/tmp/opt/trinity/lib/libtdednssd.so.1.0.0
-debian/tmp/opt/trinity/lib/libtdehtml.so.4
-debian/tmp/opt/trinity/lib/libtdehtml.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdehtml.so.14
+debian/tmp/opt/trinity/lib/libtdehtml.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeimproxy.so.0
 debian/tmp/opt/trinity/lib/libtdeimproxy.so.0.0.0
-debian/tmp/opt/trinity/lib/libtdeio.so.4
-debian/tmp/opt/trinity/lib/libtdeio.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeio.so.14
+debian/tmp/opt/trinity/lib/libtdeio.so.14.0.0
 debian/tmp/opt/trinity/lib/libkjava.so.1
 debian/tmp/opt/trinity/lib/libkjava.so.1.0.0
 debian/tmp/opt/trinity/lib/libkjs.so.1
@@ -299,14 +299,14 @@ debian/tmp/opt/trinity/lib/libtdersync.so.0
 debian/tmp/opt/trinity/lib/libtdersync.so.0.0.1
 debian/tmp/opt/trinity/lib/libtderesources.so.1
 debian/tmp/opt/trinity/lib/libtderesources.so.1.2.0
-debian/tmp/opt/trinity/lib/libtdescreensaver.so.4
-debian/tmp/opt/trinity/lib/libtdescreensaver.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdescreensaver.so.14
+debian/tmp/opt/trinity/lib/libtdescreensaver.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdescript.so.0
 debian/tmp/opt/trinity/lib/libtdescript.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdespell2.so.1
 debian/tmp/opt/trinity/lib/libtdespell2.so.1.0.0
-debian/tmp/opt/trinity/lib/libtdespell.so.4
-debian/tmp/opt/trinity/lib/libtdespell.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdespell.so.14
+debian/tmp/opt/trinity/lib/libtdespell.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdetexteditor.so.0
 debian/tmp/opt/trinity/lib/libtdetexteditor.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdeunittest.so.1
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.lintian b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.lintian
new file mode 100644
index 000000000..6272877c3
--- /dev/null
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.lintian
@@ -0,0 +1,15 @@
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.manpages
index 7c2d23170..7c2d23170 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.manpages
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.postinst b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.postinst
index 6dbf5d9e1..6dbf5d9e1 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.postinst
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.postinst
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.presubj b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.presubj
index 0213d87a4..0213d87a4 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.presubj
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.presubj
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian
deleted file mode 100644
index 4a5ad60ed..000000000
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ /dev/null
@@ -1,15 +0,0 @@
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/ubuntu/precise/applications/desktop-effects-tde/debian/control b/ubuntu/precise/applications/desktop-effects-tde/debian/control
index d2efdcdc4..9a9fe5b4c 100644
--- a/ubuntu/precise/applications/desktop-effects-tde/debian/control
+++ b/ubuntu/precise/applications/desktop-effects-tde/debian/control
@@ -2,7 +2,7 @@ Source: desktop-effects-tde-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), python-central (>= 0.5.6)
+Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), python-support (>= 0.6) | python-dev (>= 2.6.6-3~)
 Standards-Version: 3.8.4
 XS-Python-Version: all
 
diff --git a/ubuntu/precise/applications/desktop-effects-tde/debian/rules b/ubuntu/precise/applications/desktop-effects-tde/debian/rules
index d494616db..41ad63be2 100755
--- a/ubuntu/precise/applications/desktop-effects-tde/debian/rules
+++ b/ubuntu/precise/applications/desktop-effects-tde/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
@@ -13,4 +16,4 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
 binary-install/desktop-effects-tde-trinity::
-	dh_pycentral -pdesktop-effects-tde-trinity
+	${DH_PYTHON2} -pdesktop-effects-tde-trinity
diff --git a/ubuntu/precise/applications/fusion-icon/debian/control b/ubuntu/precise/applications/fusion-icon/debian/control
index 2b2a5d206..0c45f670d 100644
--- a/ubuntu/precise/applications/fusion-icon/debian/control
+++ b/ubuntu/precise/applications/fusion-icon/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
 XS-Python-Version: all
 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), pkg-config, python-all-dev
-Build-Depends-Indep: python-central (>= 0.6.0), intltool
+Build-Depends-Indep: python-support (>= 0.6), intltool
 Standards-Version: 3.8.4
 
 Package: fusion-icon-trinity
diff --git a/ubuntu/precise/applications/fusion-icon/debian/rules b/ubuntu/precise/applications/fusion-icon/debian/rules
index 8c79610db..2b780a204 100755
--- a/ubuntu/precise/applications/fusion-icon/debian/rules
+++ b/ubuntu/precise/applications/fusion-icon/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pycentral
+DEB_PYTHON_SYSTEM=pysupport
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 # include /usr/share/cdbs/1/class/python-distutils.mk
@@ -17,5 +17,5 @@ binary-install/fusion-icon-trinity::
 	mkdir -p debian/fusion-icon-trinity/opt/trinity
 	cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
 	rm -rf debian/fusion-icon-trinity/usr
-	dh_pycentral -pfusion-icon-trinity
+	dh_pysupport -pfusion-icon-trinity
 	dh_icons
diff --git a/ubuntu/precise/applications/klcddimmer/debian/cdbs/buildvars.mk b/ubuntu/precise/applications/klcddimmer/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/precise/applications/klcddimmer/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/ubuntu/precise/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..ba002080b
--- /dev/null
+++ b/ubuntu/precise/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+#include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/precise/applications/klcddimmer/debian/cdbs/kde.mk b/ubuntu/precise/applications/klcddimmer/debian/cdbs/kde.mk
new file mode 100644
index 000000000..765560c89
--- /dev/null
+++ b/ubuntu/precise/applications/klcddimmer/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final =
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/precise/applications/klcddimmer/debian/cdbs/uploaders.mk b/ubuntu/precise/applications/klcddimmer/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/precise/applications/klcddimmer/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/ubuntu/precise/applications/klcddimmer/debian/cdbs/versions.pl b/ubuntu/precise/applications/klcddimmer/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/precise/applications/klcddimmer/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/precise/applications/klcddimmer/debian/changelog b/ubuntu/precise/applications/klcddimmer/debian/changelog
new file mode 100644
index 000000000..c7731210d
--- /dev/null
+++ b/ubuntu/precise/applications/klcddimmer/debian/changelog
@@ -0,0 +1,6 @@
+klcddimmer-trinity (0.3-0) unstable; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Wed, 21 Aug 2013 21:11:10 +0200
+
diff --git a/ubuntu/precise/applications/klcddimmer/debian/compat b/ubuntu/precise/applications/klcddimmer/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/precise/applications/klcddimmer/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/precise/applications/klcddimmer/debian/control b/ubuntu/precise/applications/klcddimmer/debian/control
new file mode 100644
index 000000000..785e17d0a
--- /dev/null
+++ b/ubuntu/precise/applications/klcddimmer/debian/control
@@ -0,0 +1,15 @@
+Source: klcddimmer-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>= 5.0.0), cdbs, automake, libtool, tdelibs4-trinity-dev
+Standards-Version: 3.7.3
+Homepage: http://klcddimeer.sourceforge.net/
+
+Package: klcddimmer-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: smartdimmer
+Description: Applet to adjust LCD brightness for TDE
+ KLcdDimmer is applet for simple adjust LCD brightness.
+ Notice that this applet relies on an external program to get/set the brightness.
diff --git a/ubuntu/precise/applications/klcddimmer/debian/copyright b/ubuntu/precise/applications/klcddimmer/debian/copyright
new file mode 100644
index 000000000..e8fb907ba
--- /dev/null
+++ b/ubuntu/precise/applications/klcddimmer/debian/copyright
@@ -0,0 +1,19 @@
+This package was debianized by Slávek Banko <slavek.banko@axis.cz> on
+Wed, 21 Aug 2013 21:11:10 +0200.
+
+It was downloaded from http://klcddimmer.sourceforge.net
+
+Copyright Holder: 2006-2007 Lorenzo Bettini
+
+Upstream Author:  Lorenzo Bettini
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
diff --git a/ubuntu/precise/applications/klcddimmer/debian/docs b/ubuntu/precise/applications/klcddimmer/debian/docs
new file mode 100644
index 000000000..724e08449
--- /dev/null
+++ b/ubuntu/precise/applications/klcddimmer/debian/docs
@@ -0,0 +1,2 @@
+README
+TODO
diff --git a/ubuntu/precise/applications/klcddimmer/debian/rules b/ubuntu/precise/applications/klcddimmer/debian/rules
new file mode 100755
index 000000000..55935a695
--- /dev/null
+++ b/ubuntu/precise/applications/klcddimmer/debian/rules
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	dh_testdir
+
+	# Regenerate build system
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+	autoreconf --install && automake -f && \
+	$(MAKE) -f admin/Makefile.common && \
+	touch debian/stamp-bootstrap
+
+clean::
+	dh_testdir
+	rm -f debian/stamp-bootstrap
diff --git a/ubuntu/precise/applications/klcddimmer/debian/source/format b/ubuntu/precise/applications/klcddimmer/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/precise/applications/klcddimmer/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/precise/applications/klcddimmer/debian/source/options b/ubuntu/precise/applications/klcddimmer/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/precise/applications/klcddimmer/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/precise/dependencies/arts/debian/control.in b/ubuntu/precise/dependencies/arts/debian/control.in
index 42a6b7273..b9f79f602 100644
--- a/ubuntu/precise/dependencies/arts/debian/control.in
+++ b/ubuntu/precise/dependencies/arts/debian/control.in
@@ -32,7 +32,7 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, oss-compat
 Recommends: libarts1-akode-trinity
-Conflicts: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), tdelibs4c2a (<< 4:3.5.9)
+Conflicts: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), tdelibs14 (<< 4:3.5.9)
 Replaces: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0)
 Description: aRts sound system core components
  aRts is a short form for "analog realtime synthesizer". aRts is highly
diff --git a/ubuntu/precise/dependencies/python-tqt/debian/control b/ubuntu/precise/dependencies/python-tqt/debian/control
index 71f586675..4eb3719bd 100644
--- a/ubuntu/precise/dependencies/python-tqt/debian/control
+++ b/ubuntu/precise/dependencies/python-tqt/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1), python-sip-dbg, python-all-dbg
+Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), python-sip-dbg, python-all-dbg
 Standards-Version: 3.8.4
 
 Package: python-tqt
diff --git a/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
index 3d0ed6137..36e6c1349 100644
--- a/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ b/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
@@ -1,15 +1,15 @@
 # lintian test overriden as the files tripping this error are put into the source
 # of the generated package. This is a false-positive
 
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qt/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtaxcontainer/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtcanvas/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtext/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtgl/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtnetwork/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtpe/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtsql/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qttable/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtui/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtxml/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qt/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtaxcontainer/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtcanvas/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtext/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtgl/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtnetwork/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtpe/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtsql/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qttable/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtui/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtxml/copying.sip
 
diff --git a/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-dev.preinst b/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-dev.preinst
deleted file mode 100644
index b17b35a44..000000000
--- a/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-dev.preinst
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# TODO: remove this file after releasing Squeeze
-set -e
-if [ "$1" = upgrade ]
-then
-	if dpkg --compare-versions "$2" lt 3.17.6-2; then
-	    if which python >/dev/null 2>&1 && which pycentral >/dev/null 2>&1; then
-		pycentral pkgremove python-qt-dev
-	    else
-		flist=$(tempfile)
-		find /usr/share/pycentral/python-qt-dev -depth -mindepth 2 \
-		    \( -name '*.py' -printf 'p %P\n' -o -printf '%y %P\n' \) \
-		    > $flist 2>/dev/null || true
-		    if [ -s $flist ]; then
-			for d in /usr/lib/python[0-9].[0-9]; do
-			    case "$d" in */python2.1|*/python2.2) continue; esac
-			    while read t n; do
-				case "$t" in
-				    p) rm -f $d/$n $d/${n}[co];;
-				    d) rmdir $d/$n 2>/dev/null || true;;
-				    *) rm -f $d/$n
-				esac
-			    done < $flist
-			done
-		    fi
-		    rm -f $flist
-		    dpkg -L python-qt-dev \
-			| awk '/\/usr\/share\/pycentral/ {next} /\.py$/ {print $0"c\n" $0"o"}' \
-			| xargs rm -f >&2
-	    fi
-	fi
-fi
-
-#DEBHELPER#
-
diff --git a/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-doc.dirs b/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-doc.dirs
index dcd0e5b12..43a4fa9fa 100644
--- a/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-doc.dirs
+++ b/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-doc.dirs
@@ -1,2 +1,2 @@
-usr/share/doc/python-qt3-doc/html
-usr/share/doc/python-qt3-doc/examples
+usr/share/doc/python-tqt-doc/html
+usr/share/doc/python-tqt-doc/examples
diff --git a/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-doc.install b/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-doc.install
index 840625c0a..65f82036b 100644
--- a/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-doc.install
+++ b/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-doc.install
@@ -1 +1 @@
-doc/PyQt.html usr/share/doc/python-qt3-doc/html
+doc/PyQt.html usr/share/doc/python-tqt-doc/html
diff --git a/ubuntu/precise/dependencies/python-tqt/debian/rules b/ubuntu/precise/dependencies/python-tqt/debian/rules
index 86eca95c9..b0acb35f6 100755
--- a/ubuntu/precise/dependencies/python-tqt/debian/rules
+++ b/ubuntu/precise/dependencies/python-tqt/debian/rules
@@ -32,6 +32,9 @@ CXXFLAGS += "-I/usr/include/tqt"
 
 PYTHONS	:= $(shell pyversions -vr debian/control)
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
 
 GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
 ifneq (,$(filter $(GCCVER),4.2 4.3))
@@ -154,7 +157,7 @@ endif
 #	dh_strip
 	dh_compress -X.py -X.bmp -X.ui -X.sql
 	dh_fixperms
-	dh_pysupport
+	${DH_PYTHON2}
 	dh_sip
 	dh_lintian
 	dh_installdeb
diff --git a/ubuntu/precise/dependencies/sip4-tqt/debian/control b/ubuntu/precise/dependencies/sip4-tqt/debian/control
index 825f458eb..7091f5392 100644
--- a/ubuntu/precise/dependencies/sip4-tqt/debian/control
+++ b/ubuntu/precise/dependencies/sip4-tqt/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1), libtqtinterface-dev
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), libtqtinterface-dev
 Standards-Version: 3.8.4
 XS-Python-Version: all
 
diff --git a/ubuntu/precise/dependencies/sip4-tqt/debian/python-sip-dev.links b/ubuntu/precise/dependencies/sip4-tqt/debian/python-sip-dev.links
index 26a9ded9b..26a9ded9b 100755..100644
--- a/ubuntu/precise/dependencies/sip4-tqt/debian/python-sip-dev.links
+++ b/ubuntu/precise/dependencies/sip4-tqt/debian/python-sip-dev.links
diff --git a/ubuntu/precise/dependencies/sip4-tqt/debian/rules b/ubuntu/precise/dependencies/sip4-tqt/debian/rules
index 2286739d5..9073bd22f 100755
--- a/ubuntu/precise/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/precise/dependencies/sip4-tqt/debian/rules
@@ -19,6 +19,9 @@ endif
 
 PYTHONS	:= $(shell pyversions -vr debian/control)
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2 --no-dbg-cleaning,dh_pysupport)
+
 -include /usr/share/python/python.mk
 ifeq (,$(py_sitename))
 py_sitename = site-packages
@@ -132,7 +135,7 @@ ifneq (,$(findstring -a, $(DH_OPTIONS)))
 endif
 	dh_compress 
 	dh_fixperms
-	dh_pysupport
+	${DH_PYTHON2}
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
diff --git a/ubuntu/precise/libraries/pytdeextensions/debian/control b/ubuntu/precise/libraries/pytdeextensions/debian/control
index e2657b279..b9b40b127 100644
--- a/ubuntu/precise/libraries/pytdeextensions/debian/control
+++ b/ubuntu/precise/libraries/pytdeextensions/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libtool,
+Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool,
  libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
  python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5)
 Standards-Version: 3.8.4
diff --git a/ubuntu/precise/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides b/ubuntu/precise/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
index 17743dd31..7cd5d5817 100644
--- a/ubuntu/precise/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
+++ b/ubuntu/precise/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
@@ -1,10 +1,10 @@
-pytdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
-pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop tdecmshell
-pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
-pytdeextensions: desktop-entry-invalid-category X-TDE-settings-system ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
-pytdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
-pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
-pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
+pytdeextensions-trinity: desktop-entry-contains-unknown-key ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
+pytdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop tdecmshell
+pytdeextensions-trinity: desktop-entry-invalid-category QT ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions-trinity: desktop-entry-invalid-category X-TDE-settings-system ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions-trinity: desktop-entry-lacks-main-category ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pytdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
+pytdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pytdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
 
-pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py
-pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py
+pytdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py
+pytdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pytdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py
diff --git a/ubuntu/precise/libraries/python-trinity/debian/control b/ubuntu/precise/libraries/python-trinity/debian/control
index f8b85ccae..d68748cae 100644
--- a/ubuntu/precise/libraries/python-trinity/debian/control
+++ b/ubuntu/precise/libraries/python-trinity/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-tqt-dev, tdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
+Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-tqt-dev, tdelibs4-trinity-dev, python-support (>= 0.6) | python-dev (>= 2.6.6-3~), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
 Standards-Version: 3.8.4
 Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
 XS-Python-Version: all
diff --git a/ubuntu/precise/libraries/python-trinity/debian/rules b/ubuntu/precise/libraries/python-trinity/debian/rules
index 67af8c2d8..d4dac70f3 100755
--- a/ubuntu/precise/libraries/python-trinity/debian/rules
+++ b/ubuntu/precise/libraries/python-trinity/debian/rules
@@ -31,6 +31,9 @@ endif
 PYTHONS := $(shell pyversions -vr debian/control)
 DBG_PYTHONS := $(shell pyversions -vd)
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
 GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
 ifneq (,$(filter $(GCCVER),4.2 4.3))
         SPLIT=20
@@ -149,7 +152,7 @@ ifeq (,$(findstring -i, $(DH_OPTIONS)))
 endif
 	dh_compress -X.py -X.ui -X.dtd
 	dh_fixperms
-	DH_PYCENTRAL=nomove dh_pycentral
+	${DH_PYTHON2}
 	dh_installdeb
 	dh_shlibdeps -l /opt/trinity/lib
 	dh_gencontrol
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/control b/ubuntu/precise/metapackages/rename-meta/debian/control
index c0847566e..8ae8b513b 100644
--- a/ubuntu/precise/metapackages/rename-meta/debian/control
+++ b/ubuntu/precise/metapackages/rename-meta/debian/control
@@ -38,7 +38,7 @@ Description: Transitional dummy package.  This can be safely removed after your
 
 Package: kdelibs4c2a-trinity
 Architecture: all
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Conflicts: kdelibs4c2a-trinity (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
diff --git a/ubuntu/precise/tde-i18n/debian/control b/ubuntu/precise/tde-i18n/debian/control
index ab2e12813..a9c03b5d2 100644
--- a/ubuntu/precise/tde-i18n/debian/control
+++ b/ubuntu/precise/tde-i18n/debian/control
@@ -11,7 +11,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-af-kde3 (<< 4:14.0.0), kde-i18n-af-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-af-kde3 (<< 4:14.0.0), kde-i18n-af-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Afrikaans (af) internationalized (i18n) files for KDE
@@ -23,7 +23,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ar-kde3 (<< 4:14.0.0), kde-i18n-ar-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ar-kde3 (<< 4:14.0.0), kde-i18n-ar-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Arabic (ar) internationalized (i18n) files for KDE
@@ -35,7 +35,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-az-kde3 (<< 4:14.0.0), kde-i18n-az-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-az-kde3 (<< 4:14.0.0), kde-i18n-az-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Azerbaijani (az) internationalized (i18n) files for KDE
@@ -47,7 +47,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-be-kde3 (<< 4:14.0.0), kde-i18n-be-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-be-kde3 (<< 4:14.0.0), kde-i18n-be-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Belarusian (be) internationalized (i18n) files for KDE
@@ -59,7 +59,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-bg-kde3 (<< 4:14.0.0), kde-i18n-bg-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-bg-kde3 (<< 4:14.0.0), kde-i18n-bg-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Bulgarian (bg) internationalized (i18n) files for KDE
@@ -71,7 +71,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-bn-kde3 (<< 4:14.0.0), kde-i18n-bn-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-bn-kde3 (<< 4:14.0.0), kde-i18n-bn-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Bengali (bn) internationalized (i18n) files for KDE
@@ -83,7 +83,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-br-kde3 (<< 4:14.0.0), kde-i18n-br-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-br-kde3 (<< 4:14.0.0), kde-i18n-br-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Breton (br) internationalized (i18n) files for KDE
@@ -95,7 +95,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-bs-kde3 (<< 4:14.0.0), kde-i18n-bs-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-bs-kde3 (<< 4:14.0.0), kde-i18n-bs-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Bosnian (bs) internationalized (i18n) files for KDE
@@ -107,7 +107,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ca-kde3 (<< 4:14.0.0), kde-i18n-ca-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ca-kde3 (<< 4:14.0.0), kde-i18n-ca-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Catalan (ca) internationalized (i18n) files for KDE
@@ -119,7 +119,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-cs-kde3 (<< 4:14.0.0), kde-i18n-cs-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-cs-kde3 (<< 4:14.0.0), kde-i18n-cs-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Czech (cs) internationalized (i18n) files for KDE
@@ -131,7 +131,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-csb-kde3 (<< 4:14.0.0), kde-i18n-csb-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-csb-kde3 (<< 4:14.0.0), kde-i18n-csb-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Kashubian (csb) internationalized (i18n) files for KDE
@@ -143,7 +143,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-cy-kde3 (<< 4:14.0.0), kde-i18n-cy-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-cy-kde3 (<< 4:14.0.0), kde-i18n-cy-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Welsh (cy) internationalized (i18n) files for KDE
@@ -155,7 +155,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-da-kde3 (<< 4:14.0.0), kde-i18n-da-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-da-kde3 (<< 4:14.0.0), kde-i18n-da-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Danish (da) internationalized (i18n) files for KDE
@@ -167,7 +167,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-de-kde3 (<< 4:14.0.0), kde-i18n-de-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-de-kde3 (<< 4:14.0.0), kde-i18n-de-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: German (de) internationalized (i18n) files for KDE
@@ -179,7 +179,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-el-kde3 (<< 4:14.0.0), kde-i18n-el-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-el-kde3 (<< 4:14.0.0), kde-i18n-el-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Greek (el) internationalized (i18n) files for KDE
@@ -191,7 +191,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-engb-kde3 (<< 4:14.0.0), kde-i18n-engb-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-engb-kde3 (<< 4:14.0.0), kde-i18n-engb-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: British English (en_GB) internationalized (i18n) files for KDE
@@ -203,7 +203,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-eo-kde3 (<< 4:14.0.0), kde-i18n-eo-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-eo-kde3 (<< 4:14.0.0), kde-i18n-eo-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Esperanto (eo) internationalized (i18n) files for KDE
@@ -215,7 +215,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-es-kde3 (<< 4:14.0.0), kde-i18n-es-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-es-kde3 (<< 4:14.0.0), kde-i18n-es-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Spanish (es) internationalized (i18n) files for KDE
@@ -227,7 +227,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-et-kde3 (<< 4:14.0.0), kde-i18n-et-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-et-kde3 (<< 4:14.0.0), kde-i18n-et-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Estonian (et) internationalized (i18n) files for KDE
@@ -239,7 +239,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-eu-kde3 (<< 4:14.0.0), kde-i18n-eu-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-eu-kde3 (<< 4:14.0.0), kde-i18n-eu-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Basque (eu) internationalized (i18n) files for KDE
@@ -251,7 +251,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-fa-kde3 (<< 4:14.0.0), kde-i18n-fa-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-fa-kde3 (<< 4:14.0.0), kde-i18n-fa-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Farsi (Persian) (fa) internationalized (i18n) files for KDE
@@ -263,7 +263,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-fi-kde3 (<< 4:14.0.0), kde-i18n-fi-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-fi-kde3 (<< 4:14.0.0), kde-i18n-fi-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Finnish (fi) internationalized (i18n) files for KDE
@@ -275,7 +275,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-fr-kde3 (<< 4:14.0.0), kde-i18n-fr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-fr-kde3 (<< 4:14.0.0), kde-i18n-fr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: French (fr) internationalized (i18n) files for KDE
@@ -287,7 +287,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-fy-kde3 (<< 4:14.0.0), kde-i18n-fy-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-fy-kde3 (<< 4:14.0.0), kde-i18n-fy-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Frisian (fy) internationalized (i18n) files for KDE
@@ -299,7 +299,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ga-kde3 (<< 4:14.0.0), kde-i18n-ga-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ga-kde3 (<< 4:14.0.0), kde-i18n-ga-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Irish Gaelic (ga) internationalized (i18n) files for KDE
@@ -311,7 +311,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-gl-kde3 (<< 4:14.0.0), kde-i18n-gl-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-gl-kde3 (<< 4:14.0.0), kde-i18n-gl-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Galician (gl) internationalized (i18n) files for KDE
@@ -323,7 +323,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-he-kde3 (<< 4:14.0.0), kde-i18n-he-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-he-kde3 (<< 4:14.0.0), kde-i18n-he-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Hebrew (he) internationalized (i18n) files for KDE
@@ -335,7 +335,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-hi-kde3 (<< 4:14.0.0), kde-i18n-hi-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-hi-kde3 (<< 4:14.0.0), kde-i18n-hi-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Hindi (hi) internationalized (i18n) files for KDE
@@ -347,7 +347,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-hr-kde3 (<< 4:14.0.0), kde-i18n-hr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-hr-kde3 (<< 4:14.0.0), kde-i18n-hr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Croatian (hr) internationalized (i18n) files for KDE
@@ -359,7 +359,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-hu-kde3 (<< 4:14.0.0), kde-i18n-hu-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-hu-kde3 (<< 4:14.0.0), kde-i18n-hu-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Hungarian (hu) internationalized (i18n) files for KDE
@@ -371,7 +371,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-is-kde3 (<< 4:14.0.0), kde-i18n-is-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-is-kde3 (<< 4:14.0.0), kde-i18n-is-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Icelandic (is) internationalized (i18n) files for KDE
@@ -383,7 +383,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-it-kde3 (<< 4:14.0.0), kde-i18n-it-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-it-kde3 (<< 4:14.0.0), kde-i18n-it-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Italian (it) internationalized (i18n) files for KDE
@@ -395,7 +395,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ja-kde3 (<< 4:14.0.0), kde-i18n-ja-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ja-kde3 (<< 4:14.0.0), kde-i18n-ja-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Japanese (ja) internationalized (i18n) files for KDE
@@ -407,7 +407,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-kk-kde3 (<< 4:14.0.0), kde-i18n-kk-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-kk-kde3 (<< 4:14.0.0), kde-i18n-kk-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Kazakh (kk) internationalized (i18n) files for KDE
@@ -419,7 +419,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-km-kde3 (<< 4:14.0.0), kde-i18n-km-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-km-kde3 (<< 4:14.0.0), kde-i18n-km-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Khmer (km) internationalized (i18n) files for KDE
@@ -431,7 +431,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ko-kde3 (<< 4:14.0.0), kde-i18n-ko-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ko-kde3 (<< 4:14.0.0), kde-i18n-ko-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Korean (ko) internationalized (i18n) files for KDE
@@ -443,7 +443,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-lt-kde3 (<< 4:14.0.0), kde-i18n-lt-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-lt-kde3 (<< 4:14.0.0), kde-i18n-lt-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Lithuanian (lt) internationalized (i18n) files for KDE
@@ -455,7 +455,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-lv-kde3 (<< 4:14.0.0), kde-i18n-lv-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-lv-kde3 (<< 4:14.0.0), kde-i18n-lv-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Latvian (lv) internationalized (i18n) files for KDE
@@ -467,7 +467,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-mk-kde3 (<< 4:14.0.0), kde-i18n-mk-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-mk-kde3 (<< 4:14.0.0), kde-i18n-mk-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Macedonian (mk) internationalized (i18n) files for KDE
@@ -479,7 +479,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-mn-kde3 (<< 4:14.0.0), kde-i18n-mn-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-mn-kde3 (<< 4:14.0.0), kde-i18n-mn-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Mongolian (mn) internationalized (i18n) files for KDE
@@ -491,7 +491,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ms-kde3 (<< 4:14.0.0), kde-i18n-ms-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ms-kde3 (<< 4:14.0.0), kde-i18n-ms-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Malay (ms) internationalized (i18n) files for KDE
@@ -503,7 +503,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-nb-kde3 (<< 4:14.0.0), kde-i18n-nb-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-nb-kde3 (<< 4:14.0.0), kde-i18n-nb-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity, tde-i18n-no-trinity
 Description: Norwegian Bookmal (nb) internationalized (i18n) files for KDE
@@ -515,7 +515,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-nds-kde3 (<< 4:14.0.0), kde-i18n-nds-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-nds-kde3 (<< 4:14.0.0), kde-i18n-nds-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Low Saxon (nds) internationalized (i18n) files for KDE
@@ -527,7 +527,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-nl-kde3 (<< 4:14.0.0), kde-i18n-nl-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-nl-kde3 (<< 4:14.0.0), kde-i18n-nl-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Dutch (nl) internationalized (i18n) files for KDE
@@ -539,7 +539,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-nn-kde3 (<< 4:14.0.0), kde-i18n-nn-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-nn-kde3 (<< 4:14.0.0), kde-i18n-nn-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Description: Norwegian Nynorsk (nn) internationalized (i18n) files for KDE
  This package contains the Norwegian Nynorsk (nn) internationalized (i18n)
@@ -550,7 +550,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-pa-kde3 (<< 4:14.0.0), kde-i18n-pa-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-pa-kde3 (<< 4:14.0.0), kde-i18n-pa-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Punjabi (pa) internationalized (i18n) files for KDE
@@ -562,7 +562,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-pl-kde3 (<< 4:14.0.0), kde-i18n-pl-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-pl-kde3 (<< 4:14.0.0), kde-i18n-pl-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Polish (pl) internationalized (i18n) files for KDE
@@ -574,7 +574,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-pt-kde3 (<< 4:14.0.0), kde-i18n-pt-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-pt-kde3 (<< 4:14.0.0), kde-i18n-pt-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Portuguese (pt) internationalized (i18n) files for KDE
@@ -586,7 +586,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ptbr-kde3 (<< 4:14.0.0), kde-i18n-ptbr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ptbr-kde3 (<< 4:14.0.0), kde-i18n-ptbr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Brazilian Portuguese (pt_BR) internationalized (i18n) files for KDE
@@ -598,7 +598,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ro-kde3 (<< 4:14.0.0), kde-i18n-ro-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ro-kde3 (<< 4:14.0.0), kde-i18n-ro-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Romanian (ro) internationalized (i18n) files for KDE
@@ -610,7 +610,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ru-kde3 (<< 4:14.0.0), kde-i18n-ru-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ru-kde3 (<< 4:14.0.0), kde-i18n-ru-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Russian (ru) internationalized (i18n) files for KDE
@@ -622,7 +622,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-rw-kde3 (<< 4:14.0.0), kde-i18n-rw-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-rw-kde3 (<< 4:14.0.0), kde-i18n-rw-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Kinyarwanda (rw) internationalized (i18n) files for KDE
@@ -634,7 +634,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-se-kde3 (<< 4:14.0.0), kde-i18n-se-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-se-kde3 (<< 4:14.0.0), kde-i18n-se-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Northern Sami (se) internationalized (i18n) files for KDE
@@ -646,7 +646,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-sk-kde3 (<< 4:14.0.0), kde-i18n-sk-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-sk-kde3 (<< 4:14.0.0), kde-i18n-sk-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Slovak (sk) internationalized (i18n) files for KDE
@@ -658,7 +658,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-sl-kde3 (<< 4:14.0.0), kde-i18n-sl-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-sl-kde3 (<< 4:14.0.0), kde-i18n-sl-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Slovenian (sl) internationalized (i18n) files for KDE
@@ -670,7 +670,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-sr-kde3 (<< 4:14.0.0), kde-i18n-sr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-sr-kde3 (<< 4:14.0.0), kde-i18n-sr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Serbian (sr) internationalized (i18n) files for KDE
@@ -682,7 +682,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ss-kde3 (<< 4:14.0.0), kde-i18n-ss-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ss-kde3 (<< 4:14.0.0), kde-i18n-ss-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Swati (ss) internationalized (i18n) files for KDE
@@ -694,7 +694,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-srlatin-kde3 (<< 4:14.0.0), kde-i18n-srlatin-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-srlatin-kde3 (<< 4:14.0.0), kde-i18n-srlatin-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Latin Serbian (sr@Latn) internationalized (i18n) files for KDE
@@ -706,7 +706,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-sv-kde3 (<< 4:14.0.0), kde-i18n-sv-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-sv-kde3 (<< 4:14.0.0), kde-i18n-sv-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Swedish (sv) internationalized (i18n) files for KDE
@@ -718,7 +718,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ta-kde3 (<< 4:14.0.0), kde-i18n-ta-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ta-kde3 (<< 4:14.0.0), kde-i18n-ta-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Tamil (ta) internationalized (i18n) files for KDE
@@ -730,7 +730,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-te-kde3 (<< 4:14.0.0), kde-i18n-te-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-te-kde3 (<< 4:14.0.0), kde-i18n-te-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Telugu (te) internationalized (i18n) files for KDE
@@ -742,7 +742,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-tg-kde3 (<< 4:14.0.0), kde-i18n-tg-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-tg-kde3 (<< 4:14.0.0), kde-i18n-tg-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Tajik (tg) internationalized (i18n) files for KDE
@@ -754,7 +754,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-th-kde3 (<< 4:14.0.0), kde-i18n-th-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-th-kde3 (<< 4:14.0.0), kde-i18n-th-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Thai (th) internationalized (i18n) files for KDE
@@ -766,7 +766,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-tr-kde3 (<< 4:14.0.0), kde-i18n-tr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-tr-kde3 (<< 4:14.0.0), kde-i18n-tr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Turkish (tr) internationalized (i18n) files for KDE
@@ -778,7 +778,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-uk-kde3 (<< 4:14.0.0), kde-i18n-uk-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-uk-kde3 (<< 4:14.0.0), kde-i18n-uk-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Ukrainian (uk) internationalized (i18n) files for KDE
@@ -790,7 +790,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-uz-kde3 (<< 4:14.0.0), kde-i18n-uz-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-uz-kde3 (<< 4:14.0.0), kde-i18n-uz-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Uzbek (uz) internationalized (i18n) files for KDE
@@ -803,7 +803,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-uzcyrillic-kde3 (<< 4:14.0.0), kde-i18n-uzcyrillic-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-uzcyrillic-kde3 (<< 4:14.0.0), kde-i18n-uzcyrillic-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Cyrillic Uzbek (uz@cyrillic) internationalized (i18n) files for KDE
@@ -815,7 +815,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-vi-kde3 (<< 4:14.0.0), kde-i18n-vi-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-vi-kde3 (<< 4:14.0.0), kde-i18n-vi-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Vietnamese (vi) internationalized (i18n) files for KDE
@@ -827,7 +827,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-wa-kde3 (<< 4:14.0.0), kde-i18n-wa-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-wa-kde3 (<< 4:14.0.0), kde-i18n-wa-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Walloon (wa) internationalized (i18n) files for KDE
@@ -839,7 +839,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-zhcn-kde3 (<< 4:14.0.0), kde-i18n-zhcn-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-zhcn-kde3 (<< 4:14.0.0), kde-i18n-zhcn-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Chinese Simplified (zh_CN) internationalized (i18n) files for KDE
@@ -851,7 +851,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-zhtw-kde3 (<< 4:14.0.0), kde-i18n-zhtw-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-zhtw-kde3 (<< 4:14.0.0), kde-i18n-zhtw-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Chinese Traditional (zh_TW) internationalized (i18n) files for KDE
diff --git a/ubuntu/precise/tdebase/debian/control b/ubuntu/precise/tdebase/debian/control
index 43c9f14aa..f4ff3113f 100644
--- a/ubuntu/precise/tdebase/debian/control
+++ b/ubuntu/precise/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 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>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, binutils-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, binutils-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
diff --git a/ubuntu/precise/tdebindings/debian/control b/ubuntu/precise/tdebindings/debian/control
index ad28b4291..a6f1eb5f3 100644
--- a/ubuntu/precise/tdebindings/debian/control
+++ b/ubuntu/precise/tdebindings/debian/control
@@ -1,6 +1,6 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
- python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk,
+ python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk,
  gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
  tdelibs4-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby-dev, flex, bison,
diff --git a/ubuntu/precise/tdebindings/debian/rules b/ubuntu/precise/tdebindings/debian/rules
index f6ae5709b..c31999f17 100755
--- a/ubuntu/precise/tdebindings/debian/rules
+++ b/ubuntu/precise/tdebindings/debian/rules
@@ -3,6 +3,9 @@
 DEB_QUILT_PATCHDIR_LINK :=
 export QUILT_PATCHES=debian/patches
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 override DEB_BUILDDIR := $(DEB_SRCDIR)
@@ -131,7 +134,7 @@ binary-install/libqt0-ruby1.8-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
 binary-install/python-dcop-trinity::
-	dh_pysupport -p$(cdbs_curpkg)
+	${DH_PYTHON2} -p$(cdbs_curpkg)
 
 ###
 
diff --git a/ubuntu/precise/tdelibs/debian/control b/ubuntu/precise/tdelibs/debian/control
index 8274ad36a..fd9246ac6 100644
--- a/ubuntu/precise/tdelibs/debian/control
+++ b/ubuntu/precise/tdelibs/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
 Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
- binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
+ binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 14.0.0), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev, libnm-util-dev,
@@ -27,7 +27,7 @@ Replaces: kdelibs-kde3 (<< 4:14.0.0), kdelibs-trinity (<< 4:14.0.0)
 Breaks: kdelibs-kde3 (<< 4:14.0.0), kdelibs-trinity (<< 4:14.0.0)
 Provides: tdelibs
 Conflicts: tdelibs
-Depends: tdelibs4c2a-trinity (>= ${Source-Version}),
+Depends: tdelibs14-trinity (>= ${Source-Version}),
  tdelibs-data-trinity (>= ${Source-Version})
 Description: core libraries from the official Trinity release
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@@ -55,11 +55,12 @@ Description: core shared data for all TDE applications
  This package is part of TDE, and a component of the TDE libraries module.
  See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
 
-Package: tdelibs4c2a-trinity
+Package: tdelibs14-trinity
 Section: libs
 Architecture: any
-Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0)
-Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0)
+Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0), tdelibs4c2a-trinity
+Provides: tdelibs4c2a-trinity
+Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0), tdelibs4c2a-trinity
 Depends: ${shlibs:Depends}, tdelibs-data-trinity,
  tdelibs-data-trinity, libart-2.0-2 (>= 14.0.0), perl, xbase-clients, sudo
 Recommends: xdg-user-dirs, upower
@@ -80,7 +81,7 @@ Section: libdevel
 Architecture: any
 Replaces: kdelibs4-kde3-dev (<< 4:14.0.0), kdelibs4-trinity-dev (<< 4:14.0.0)
 Breaks: kdelibs4-kde3-dev (<< 4:14.0.0), kdelibs4-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 14.0.0),
+Depends: tdelibs14-trinity (= ${Source-Version}), libart-2.0-dev (>= 14.0.0),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
@@ -118,8 +119,8 @@ Architecture: any
 Replaces: kdelibs-kde3-dbg (<< 4:14.0.0), kdelibs-trinity-dbg (<< 4:14.0.0)
 Breaks: kdelibs-kde3-dbg (<< 4:14.0.0), kdelibs-trinity-dbg (<< 4:14.0.0)
 Priority: extra
-Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg
-Depends: tdelibs4c2a-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64]
+Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs14-trinity-dbg
+Depends: tdelibs14-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64]
 Description: debugging symbols for tdelibs
  This package contains the debugging symbols associated with tdelibs.
  They will automatically be used by gdb for debugging tdelibs-related
diff --git a/ubuntu/precise/tdelibs/debian/control.in b/ubuntu/precise/tdelibs/debian/control.in
index e949855d8..43f0657aa 100644
--- a/ubuntu/precise/tdelibs/debian/control.in
+++ b/ubuntu/precise/tdelibs/debian/control.in
@@ -22,7 +22,7 @@ Standards-Version: 3.7.2
 Package: tdelibs
 Section: libs
 Architecture: all
-Depends: tdelibs4c2a (>= ${Source-Version}),
+Depends: tdelibs14 (>= ${Source-Version}),
  tdelibs-data (>= ${Source-Version})
 Description: core libraries from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -52,7 +52,7 @@ Description: core shared data for all KDE applications
  This package is part of KDE, and a component of the KDE libraries module.
  See the 'kde' and 'tdelibs' packages for more information.
 
-Package: tdelibs4c2a
+Package: tdelibs14
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, tdelibs-data (>> ${KDE-Version3}),
@@ -76,7 +76,7 @@ Description: core libraries and binaries for all KDE applications
 Package: tdelibs4-dev
 Section: libdevel
 Architecture: any
-Depends: tdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
+Depends: tdelibs14 (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
@@ -86,7 +86,7 @@ Depends: tdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4),
  gettext-kde, tdesdk-scripts
 Provides: tdelibs-dev
-Replaces: tdebase-dev (<< 4:3.4.0), tdelibs4c2a (<< 4:3.5.7.dfsg.1-5)
+Replaces: tdebase-dev (<< 4:3.4.0), tdelibs14 (<< 4:3.5.7.dfsg.1-5)
 Description: development files for the KDE core libraries
  This package contains all the headers and other related files needed
  to compile KDE applications, or develop applications which use the
@@ -111,9 +111,9 @@ Package: tdelibs-dbg
 Section: libdevel
 Architecture: any
 Priority: extra
-Conflicts: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs4c2a-dbg
-Replaces: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs4c2a-dbg
-Depends: tdelibs4c2a (= ${Source-Version}), qt-x11-free-dbg, libc6-dbg [amd64]
+Conflicts: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs14-dbg
+Replaces: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs14-dbg
+Depends: tdelibs14 (= ${Source-Version}), qt-x11-free-dbg, libc6-dbg [amd64]
 Description: debugging symbols for tdelibs
  This package contains the debugging symbols associated with tdelibs.
  They will automatically be used by gdb for debugging tdelibs-related
diff --git a/ubuntu/precise/tdelibs/debian/rules b/ubuntu/precise/tdelibs/debian/rules
index 8d56f7eb0..ff689557e 100755
--- a/ubuntu/precise/tdelibs/debian/rules
+++ b/ubuntu/precise/tdelibs/debian/rules
@@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes
 version=Debian Package $(DEB_VERSION)
 DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
 
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" -DWITH_LIBBFD="ON" \
 -DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" -DWITH_TDEHWLIB_DAEMONS="ON" -DWITH_UPOWER="ON" -DWITH_UDISKS="ON" -DWITH_UDISKS2="ON" -DWITH_CONSOLEKIT="ON" -DWITH_NETWORK_MANAGER_BACKEND="ON" -DWITH_LZMA="ON" \
 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
@@ -98,7 +98,7 @@ common-install-prehook-impl::
 	  rm -f LIST; \
 	fi
 
-binary-install/tdelibs4c2a-trinity::
+binary-install/tdelibs14-trinity::
 	mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs4c2a-trinity/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tdecmshell debian/tdelibs4c2a-trinity/opt/trinity/bin/tdecmshell
+	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell.real
+	install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.links b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.links
index a94119055..3b0f1cdf4 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.links
+++ b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.links
@@ -1 +1 @@
-/etc/ssl/certs/ca-certificates.crt	debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt
+/etc/ssl/certs/ca-certificates.crt	opt/trinity/share/apps/kssl/ca-bundle.crt
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.docs b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.docs
+++ b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.docs
diff --git a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.install
index a6c084acd..c836b40b0 100644
--- a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.install
@@ -218,8 +218,8 @@ debian/tmp/opt/trinity/lib/trinity/plugins/styles/plastik.la
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/plastik.so
 debian/tmp/opt/trinity/lib/libartskde.so.1
 debian/tmp/opt/trinity/lib/libartskde.so.1.2.0
-debian/tmp/opt/trinity/lib/libDCOP.so.4
-debian/tmp/opt/trinity/lib/libDCOP.so.4.2.0
+debian/tmp/opt/trinity/lib/libDCOP.so.14
+debian/tmp/opt/trinity/lib/libDCOP.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeabc_dir.so.1
 debian/tmp/opt/trinity/lib/libtdeabc_dir.so.1.0.0
 debian/tmp/opt/trinity/lib/libtdeabc_file.so.1
@@ -240,12 +240,12 @@ debian/tmp/opt/trinity/lib/libtdeabc.so.1
 debian/tmp/opt/trinity/lib/libtdeabc.so.1.2.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0.0.0
-debian/tmp/opt/trinity/lib/libtdecore.so.4
-debian/tmp/opt/trinity/lib/libtdecore.so.4.2.0
-debian/tmp/opt/trinity/lib/libtdefakes.so.4
-debian/tmp/opt/trinity/lib/libtdefakes.so.4.2.0
-debian/tmp/opt/trinity/lib/libtdefx.so.4
-debian/tmp/opt/trinity/lib/libtdefx.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdecore.so.14
+debian/tmp/opt/trinity/lib/libtdecore.so.14.0.0
+debian/tmp/opt/trinity/lib/libtdefakes.so.14
+debian/tmp/opt/trinity/lib/libtdefakes.so.14.0.0
+debian/tmp/opt/trinity/lib/libtdefx.so.14
+debian/tmp/opt/trinity/lib/libtdefx.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.so
 debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.so
@@ -257,24 +257,24 @@ debian/tmp/opt/trinity/lib/libtdeinit_kded.so
 debian/tmp/opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
 debian/tmp/opt/trinity/lib/libtdeinit_tdeio_uiserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_tdelauncher.so
-debian/tmp/opt/trinity/lib/libtdeprint_management.so.4
-debian/tmp/opt/trinity/lib/libtdeprint_management.so.4.2.0
-debian/tmp/opt/trinity/lib/libtdeprint.so.4
-debian/tmp/opt/trinity/lib/libtdeprint.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.14
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.14.0.0
+debian/tmp/opt/trinity/lib/libtdeprint.so.14
+debian/tmp/opt/trinity/lib/libtdeprint.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdesasl.so.1
 debian/tmp/opt/trinity/lib/libtdesasl.so.1.2.0
-debian/tmp/opt/trinity/lib/libtdesu.so.4
-debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0
-debian/tmp/opt/trinity/lib/libtdeui.so.4
-debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdesu.so.14
+debian/tmp/opt/trinity/lib/libtdesu.so.14.0.0
+debian/tmp/opt/trinity/lib/libtdeui.so.14
+debian/tmp/opt/trinity/lib/libtdeui.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdednssd.so.1
 debian/tmp/opt/trinity/lib/libtdednssd.so.1.0.0
-debian/tmp/opt/trinity/lib/libtdehtml.so.4
-debian/tmp/opt/trinity/lib/libtdehtml.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdehtml.so.14
+debian/tmp/opt/trinity/lib/libtdehtml.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeimproxy.so.0
 debian/tmp/opt/trinity/lib/libtdeimproxy.so.0.0.0
-debian/tmp/opt/trinity/lib/libtdeio.so.4
-debian/tmp/opt/trinity/lib/libtdeio.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeio.so.14
+debian/tmp/opt/trinity/lib/libtdeio.so.14.0.0
 debian/tmp/opt/trinity/lib/libkjava.so.1
 debian/tmp/opt/trinity/lib/libkjava.so.1.0.0
 debian/tmp/opt/trinity/lib/libkjs.so.1
@@ -299,14 +299,14 @@ debian/tmp/opt/trinity/lib/libtdersync.so.0
 debian/tmp/opt/trinity/lib/libtdersync.so.0.0.1
 debian/tmp/opt/trinity/lib/libtderesources.so.1
 debian/tmp/opt/trinity/lib/libtderesources.so.1.2.0
-debian/tmp/opt/trinity/lib/libtdescreensaver.so.4
-debian/tmp/opt/trinity/lib/libtdescreensaver.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdescreensaver.so.14
+debian/tmp/opt/trinity/lib/libtdescreensaver.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdescript.so.0
 debian/tmp/opt/trinity/lib/libtdescript.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdespell2.so.1
 debian/tmp/opt/trinity/lib/libtdespell2.so.1.0.0
-debian/tmp/opt/trinity/lib/libtdespell.so.4
-debian/tmp/opt/trinity/lib/libtdespell.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdespell.so.14
+debian/tmp/opt/trinity/lib/libtdespell.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdetexteditor.so.0
 debian/tmp/opt/trinity/lib/libtdetexteditor.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdeunittest.so.1
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.lintian b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.lintian
new file mode 100644
index 000000000..6272877c3
--- /dev/null
+++ b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.lintian
@@ -0,0 +1,15 @@
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.manpages b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.manpages
index 7c2d23170..7c2d23170 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.manpages
+++ b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.manpages
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.postinst b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.postinst
index 6dbf5d9e1..6dbf5d9e1 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.postinst
+++ b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.postinst
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.presubj b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.presubj
index 0213d87a4..0213d87a4 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.presubj
+++ b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.presubj
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.lintian b/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.lintian
deleted file mode 100644
index 4a5ad60ed..000000000
--- a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ /dev/null
@@ -1,15 +0,0 @@
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/ubuntu/raring/applications/desktop-effects-tde/debian/control b/ubuntu/raring/applications/desktop-effects-tde/debian/control
index d2efdcdc4..9a9fe5b4c 100644
--- a/ubuntu/raring/applications/desktop-effects-tde/debian/control
+++ b/ubuntu/raring/applications/desktop-effects-tde/debian/control
@@ -2,7 +2,7 @@ Source: desktop-effects-tde-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), python-central (>= 0.5.6)
+Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), python-support (>= 0.6) | python-dev (>= 2.6.6-3~)
 Standards-Version: 3.8.4
 XS-Python-Version: all
 
diff --git a/ubuntu/raring/applications/desktop-effects-tde/debian/rules b/ubuntu/raring/applications/desktop-effects-tde/debian/rules
index d494616db..41ad63be2 100755
--- a/ubuntu/raring/applications/desktop-effects-tde/debian/rules
+++ b/ubuntu/raring/applications/desktop-effects-tde/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
@@ -13,4 +16,4 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
 binary-install/desktop-effects-tde-trinity::
-	dh_pycentral -pdesktop-effects-tde-trinity
+	${DH_PYTHON2} -pdesktop-effects-tde-trinity
diff --git a/ubuntu/raring/applications/fusion-icon/debian/control b/ubuntu/raring/applications/fusion-icon/debian/control
index 2b2a5d206..0c45f670d 100644
--- a/ubuntu/raring/applications/fusion-icon/debian/control
+++ b/ubuntu/raring/applications/fusion-icon/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
 XS-Python-Version: all
 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), pkg-config, python-all-dev
-Build-Depends-Indep: python-central (>= 0.6.0), intltool
+Build-Depends-Indep: python-support (>= 0.6), intltool
 Standards-Version: 3.8.4
 
 Package: fusion-icon-trinity
diff --git a/ubuntu/raring/applications/fusion-icon/debian/rules b/ubuntu/raring/applications/fusion-icon/debian/rules
index 8c79610db..2b780a204 100755
--- a/ubuntu/raring/applications/fusion-icon/debian/rules
+++ b/ubuntu/raring/applications/fusion-icon/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pycentral
+DEB_PYTHON_SYSTEM=pysupport
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 # include /usr/share/cdbs/1/class/python-distutils.mk
@@ -17,5 +17,5 @@ binary-install/fusion-icon-trinity::
 	mkdir -p debian/fusion-icon-trinity/opt/trinity
 	cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
 	rm -rf debian/fusion-icon-trinity/usr
-	dh_pycentral -pfusion-icon-trinity
+	dh_pysupport -pfusion-icon-trinity
 	dh_icons
diff --git a/ubuntu/raring/applications/klcddimmer/debian/cdbs/buildvars.mk b/ubuntu/raring/applications/klcddimmer/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/raring/applications/klcddimmer/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/ubuntu/raring/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..ba002080b
--- /dev/null
+++ b/ubuntu/raring/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+#include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/raring/applications/klcddimmer/debian/cdbs/kde.mk b/ubuntu/raring/applications/klcddimmer/debian/cdbs/kde.mk
new file mode 100644
index 000000000..765560c89
--- /dev/null
+++ b/ubuntu/raring/applications/klcddimmer/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final =
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/raring/applications/klcddimmer/debian/cdbs/uploaders.mk b/ubuntu/raring/applications/klcddimmer/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/raring/applications/klcddimmer/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/ubuntu/raring/applications/klcddimmer/debian/cdbs/versions.pl b/ubuntu/raring/applications/klcddimmer/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/raring/applications/klcddimmer/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/raring/applications/klcddimmer/debian/changelog b/ubuntu/raring/applications/klcddimmer/debian/changelog
new file mode 100644
index 000000000..c7731210d
--- /dev/null
+++ b/ubuntu/raring/applications/klcddimmer/debian/changelog
@@ -0,0 +1,6 @@
+klcddimmer-trinity (0.3-0) unstable; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Wed, 21 Aug 2013 21:11:10 +0200
+
diff --git a/ubuntu/raring/applications/klcddimmer/debian/compat b/ubuntu/raring/applications/klcddimmer/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/raring/applications/klcddimmer/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/raring/applications/klcddimmer/debian/control b/ubuntu/raring/applications/klcddimmer/debian/control
new file mode 100644
index 000000000..785e17d0a
--- /dev/null
+++ b/ubuntu/raring/applications/klcddimmer/debian/control
@@ -0,0 +1,15 @@
+Source: klcddimmer-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>= 5.0.0), cdbs, automake, libtool, tdelibs4-trinity-dev
+Standards-Version: 3.7.3
+Homepage: http://klcddimeer.sourceforge.net/
+
+Package: klcddimmer-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: smartdimmer
+Description: Applet to adjust LCD brightness for TDE
+ KLcdDimmer is applet for simple adjust LCD brightness.
+ Notice that this applet relies on an external program to get/set the brightness.
diff --git a/ubuntu/raring/applications/klcddimmer/debian/copyright b/ubuntu/raring/applications/klcddimmer/debian/copyright
new file mode 100644
index 000000000..e8fb907ba
--- /dev/null
+++ b/ubuntu/raring/applications/klcddimmer/debian/copyright
@@ -0,0 +1,19 @@
+This package was debianized by Slávek Banko <slavek.banko@axis.cz> on
+Wed, 21 Aug 2013 21:11:10 +0200.
+
+It was downloaded from http://klcddimmer.sourceforge.net
+
+Copyright Holder: 2006-2007 Lorenzo Bettini
+
+Upstream Author:  Lorenzo Bettini
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
diff --git a/ubuntu/raring/applications/klcddimmer/debian/docs b/ubuntu/raring/applications/klcddimmer/debian/docs
new file mode 100644
index 000000000..724e08449
--- /dev/null
+++ b/ubuntu/raring/applications/klcddimmer/debian/docs
@@ -0,0 +1,2 @@
+README
+TODO
diff --git a/ubuntu/raring/applications/klcddimmer/debian/rules b/ubuntu/raring/applications/klcddimmer/debian/rules
new file mode 100755
index 000000000..55935a695
--- /dev/null
+++ b/ubuntu/raring/applications/klcddimmer/debian/rules
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	dh_testdir
+
+	# Regenerate build system
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+	autoreconf --install && automake -f && \
+	$(MAKE) -f admin/Makefile.common && \
+	touch debian/stamp-bootstrap
+
+clean::
+	dh_testdir
+	rm -f debian/stamp-bootstrap
diff --git a/ubuntu/raring/applications/klcddimmer/debian/source/format b/ubuntu/raring/applications/klcddimmer/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/raring/applications/klcddimmer/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/raring/applications/klcddimmer/debian/source/options b/ubuntu/raring/applications/klcddimmer/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/raring/applications/klcddimmer/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/raring/dependencies/arts/debian/control.in b/ubuntu/raring/dependencies/arts/debian/control.in
index 42a6b7273..b9f79f602 100644
--- a/ubuntu/raring/dependencies/arts/debian/control.in
+++ b/ubuntu/raring/dependencies/arts/debian/control.in
@@ -32,7 +32,7 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, oss-compat
 Recommends: libarts1-akode-trinity
-Conflicts: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), tdelibs4c2a (<< 4:3.5.9)
+Conflicts: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), tdelibs14 (<< 4:3.5.9)
 Replaces: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0)
 Description: aRts sound system core components
  aRts is a short form for "analog realtime synthesizer". aRts is highly
diff --git a/ubuntu/raring/dependencies/python-tqt/debian/control b/ubuntu/raring/dependencies/python-tqt/debian/control
index 71f586675..4eb3719bd 100644
--- a/ubuntu/raring/dependencies/python-tqt/debian/control
+++ b/ubuntu/raring/dependencies/python-tqt/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1), python-sip-dbg, python-all-dbg
+Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), python-sip-dbg, python-all-dbg
 Standards-Version: 3.8.4
 
 Package: python-tqt
diff --git a/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
index 3d0ed6137..36e6c1349 100644
--- a/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ b/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
@@ -1,15 +1,15 @@
 # lintian test overriden as the files tripping this error are put into the source
 # of the generated package. This is a false-positive
 
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qt/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtaxcontainer/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtcanvas/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtext/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtgl/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtnetwork/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtpe/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtsql/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qttable/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtui/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtxml/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qt/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtaxcontainer/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtcanvas/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtext/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtgl/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtnetwork/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtpe/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtsql/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qttable/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtui/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtxml/copying.sip
 
diff --git a/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-dev.preinst b/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-dev.preinst
deleted file mode 100644
index b17b35a44..000000000
--- a/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-dev.preinst
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# TODO: remove this file after releasing Squeeze
-set -e
-if [ "$1" = upgrade ]
-then
-	if dpkg --compare-versions "$2" lt 3.17.6-2; then
-	    if which python >/dev/null 2>&1 && which pycentral >/dev/null 2>&1; then
-		pycentral pkgremove python-qt-dev
-	    else
-		flist=$(tempfile)
-		find /usr/share/pycentral/python-qt-dev -depth -mindepth 2 \
-		    \( -name '*.py' -printf 'p %P\n' -o -printf '%y %P\n' \) \
-		    > $flist 2>/dev/null || true
-		    if [ -s $flist ]; then
-			for d in /usr/lib/python[0-9].[0-9]; do
-			    case "$d" in */python2.1|*/python2.2) continue; esac
-			    while read t n; do
-				case "$t" in
-				    p) rm -f $d/$n $d/${n}[co];;
-				    d) rmdir $d/$n 2>/dev/null || true;;
-				    *) rm -f $d/$n
-				esac
-			    done < $flist
-			done
-		    fi
-		    rm -f $flist
-		    dpkg -L python-qt-dev \
-			| awk '/\/usr\/share\/pycentral/ {next} /\.py$/ {print $0"c\n" $0"o"}' \
-			| xargs rm -f >&2
-	    fi
-	fi
-fi
-
-#DEBHELPER#
-
diff --git a/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-doc.dirs b/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-doc.dirs
index dcd0e5b12..43a4fa9fa 100644
--- a/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-doc.dirs
+++ b/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-doc.dirs
@@ -1,2 +1,2 @@
-usr/share/doc/python-qt3-doc/html
-usr/share/doc/python-qt3-doc/examples
+usr/share/doc/python-tqt-doc/html
+usr/share/doc/python-tqt-doc/examples
diff --git a/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-doc.install b/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-doc.install
index 840625c0a..65f82036b 100644
--- a/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-doc.install
+++ b/ubuntu/raring/dependencies/python-tqt/debian/python-tqt-doc.install
@@ -1 +1 @@
-doc/PyQt.html usr/share/doc/python-qt3-doc/html
+doc/PyQt.html usr/share/doc/python-tqt-doc/html
diff --git a/ubuntu/raring/dependencies/python-tqt/debian/rules b/ubuntu/raring/dependencies/python-tqt/debian/rules
index 86eca95c9..b0acb35f6 100755
--- a/ubuntu/raring/dependencies/python-tqt/debian/rules
+++ b/ubuntu/raring/dependencies/python-tqt/debian/rules
@@ -32,6 +32,9 @@ CXXFLAGS += "-I/usr/include/tqt"
 
 PYTHONS	:= $(shell pyversions -vr debian/control)
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
 
 GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
 ifneq (,$(filter $(GCCVER),4.2 4.3))
@@ -154,7 +157,7 @@ endif
 #	dh_strip
 	dh_compress -X.py -X.bmp -X.ui -X.sql
 	dh_fixperms
-	dh_pysupport
+	${DH_PYTHON2}
 	dh_sip
 	dh_lintian
 	dh_installdeb
diff --git a/ubuntu/raring/dependencies/sip4-tqt/debian/control b/ubuntu/raring/dependencies/sip4-tqt/debian/control
index 825f458eb..7091f5392 100644
--- a/ubuntu/raring/dependencies/sip4-tqt/debian/control
+++ b/ubuntu/raring/dependencies/sip4-tqt/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1), libtqtinterface-dev
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), libtqtinterface-dev
 Standards-Version: 3.8.4
 XS-Python-Version: all
 
diff --git a/ubuntu/raring/dependencies/sip4-tqt/debian/python-sip-dev.links b/ubuntu/raring/dependencies/sip4-tqt/debian/python-sip-dev.links
index 26a9ded9b..26a9ded9b 100755..100644
--- a/ubuntu/raring/dependencies/sip4-tqt/debian/python-sip-dev.links
+++ b/ubuntu/raring/dependencies/sip4-tqt/debian/python-sip-dev.links
diff --git a/ubuntu/raring/dependencies/sip4-tqt/debian/rules b/ubuntu/raring/dependencies/sip4-tqt/debian/rules
index 2286739d5..9073bd22f 100755
--- a/ubuntu/raring/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/raring/dependencies/sip4-tqt/debian/rules
@@ -19,6 +19,9 @@ endif
 
 PYTHONS	:= $(shell pyversions -vr debian/control)
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2 --no-dbg-cleaning,dh_pysupport)
+
 -include /usr/share/python/python.mk
 ifeq (,$(py_sitename))
 py_sitename = site-packages
@@ -132,7 +135,7 @@ ifneq (,$(findstring -a, $(DH_OPTIONS)))
 endif
 	dh_compress 
 	dh_fixperms
-	dh_pysupport
+	${DH_PYTHON2}
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
diff --git a/ubuntu/raring/libraries/pytdeextensions/debian/control b/ubuntu/raring/libraries/pytdeextensions/debian/control
index e2657b279..b9b40b127 100644
--- a/ubuntu/raring/libraries/pytdeextensions/debian/control
+++ b/ubuntu/raring/libraries/pytdeextensions/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libtool,
+Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool,
  libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
  python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5)
 Standards-Version: 3.8.4
diff --git a/ubuntu/raring/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides b/ubuntu/raring/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
index 17743dd31..7cd5d5817 100644
--- a/ubuntu/raring/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
+++ b/ubuntu/raring/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
@@ -1,10 +1,10 @@
-pytdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
-pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop tdecmshell
-pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
-pytdeextensions: desktop-entry-invalid-category X-TDE-settings-system ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
-pytdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
-pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
-pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
+pytdeextensions-trinity: desktop-entry-contains-unknown-key ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
+pytdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop tdecmshell
+pytdeextensions-trinity: desktop-entry-invalid-category QT ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions-trinity: desktop-entry-invalid-category X-TDE-settings-system ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions-trinity: desktop-entry-lacks-main-category ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pytdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
+pytdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pytdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
 
-pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py
-pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py
+pytdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py
+pytdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pytdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py
diff --git a/ubuntu/raring/libraries/python-trinity/debian/control b/ubuntu/raring/libraries/python-trinity/debian/control
index f8b85ccae..d68748cae 100644
--- a/ubuntu/raring/libraries/python-trinity/debian/control
+++ b/ubuntu/raring/libraries/python-trinity/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-tqt-dev, tdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
+Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-tqt-dev, tdelibs4-trinity-dev, python-support (>= 0.6) | python-dev (>= 2.6.6-3~), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
 Standards-Version: 3.8.4
 Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
 XS-Python-Version: all
diff --git a/ubuntu/raring/libraries/python-trinity/debian/rules b/ubuntu/raring/libraries/python-trinity/debian/rules
index 67af8c2d8..d4dac70f3 100755
--- a/ubuntu/raring/libraries/python-trinity/debian/rules
+++ b/ubuntu/raring/libraries/python-trinity/debian/rules
@@ -31,6 +31,9 @@ endif
 PYTHONS := $(shell pyversions -vr debian/control)
 DBG_PYTHONS := $(shell pyversions -vd)
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
 GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
 ifneq (,$(filter $(GCCVER),4.2 4.3))
         SPLIT=20
@@ -149,7 +152,7 @@ ifeq (,$(findstring -i, $(DH_OPTIONS)))
 endif
 	dh_compress -X.py -X.ui -X.dtd
 	dh_fixperms
-	DH_PYCENTRAL=nomove dh_pycentral
+	${DH_PYTHON2}
 	dh_installdeb
 	dh_shlibdeps -l /opt/trinity/lib
 	dh_gencontrol
diff --git a/ubuntu/raring/metapackages/rename-meta/debian/control b/ubuntu/raring/metapackages/rename-meta/debian/control
index c0847566e..8ae8b513b 100644
--- a/ubuntu/raring/metapackages/rename-meta/debian/control
+++ b/ubuntu/raring/metapackages/rename-meta/debian/control
@@ -38,7 +38,7 @@ Description: Transitional dummy package.  This can be safely removed after your
 
 Package: kdelibs4c2a-trinity
 Architecture: all
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Conflicts: kdelibs4c2a-trinity (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
diff --git a/ubuntu/raring/tde-i18n/debian/control b/ubuntu/raring/tde-i18n/debian/control
index ab2e12813..a9c03b5d2 100644
--- a/ubuntu/raring/tde-i18n/debian/control
+++ b/ubuntu/raring/tde-i18n/debian/control
@@ -11,7 +11,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-af-kde3 (<< 4:14.0.0), kde-i18n-af-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-af-kde3 (<< 4:14.0.0), kde-i18n-af-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Afrikaans (af) internationalized (i18n) files for KDE
@@ -23,7 +23,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ar-kde3 (<< 4:14.0.0), kde-i18n-ar-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ar-kde3 (<< 4:14.0.0), kde-i18n-ar-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Arabic (ar) internationalized (i18n) files for KDE
@@ -35,7 +35,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-az-kde3 (<< 4:14.0.0), kde-i18n-az-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-az-kde3 (<< 4:14.0.0), kde-i18n-az-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Azerbaijani (az) internationalized (i18n) files for KDE
@@ -47,7 +47,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-be-kde3 (<< 4:14.0.0), kde-i18n-be-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-be-kde3 (<< 4:14.0.0), kde-i18n-be-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Belarusian (be) internationalized (i18n) files for KDE
@@ -59,7 +59,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-bg-kde3 (<< 4:14.0.0), kde-i18n-bg-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-bg-kde3 (<< 4:14.0.0), kde-i18n-bg-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Bulgarian (bg) internationalized (i18n) files for KDE
@@ -71,7 +71,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-bn-kde3 (<< 4:14.0.0), kde-i18n-bn-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-bn-kde3 (<< 4:14.0.0), kde-i18n-bn-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Bengali (bn) internationalized (i18n) files for KDE
@@ -83,7 +83,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-br-kde3 (<< 4:14.0.0), kde-i18n-br-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-br-kde3 (<< 4:14.0.0), kde-i18n-br-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Breton (br) internationalized (i18n) files for KDE
@@ -95,7 +95,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-bs-kde3 (<< 4:14.0.0), kde-i18n-bs-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-bs-kde3 (<< 4:14.0.0), kde-i18n-bs-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Bosnian (bs) internationalized (i18n) files for KDE
@@ -107,7 +107,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ca-kde3 (<< 4:14.0.0), kde-i18n-ca-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ca-kde3 (<< 4:14.0.0), kde-i18n-ca-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Catalan (ca) internationalized (i18n) files for KDE
@@ -119,7 +119,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-cs-kde3 (<< 4:14.0.0), kde-i18n-cs-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-cs-kde3 (<< 4:14.0.0), kde-i18n-cs-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Czech (cs) internationalized (i18n) files for KDE
@@ -131,7 +131,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-csb-kde3 (<< 4:14.0.0), kde-i18n-csb-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-csb-kde3 (<< 4:14.0.0), kde-i18n-csb-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Kashubian (csb) internationalized (i18n) files for KDE
@@ -143,7 +143,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-cy-kde3 (<< 4:14.0.0), kde-i18n-cy-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-cy-kde3 (<< 4:14.0.0), kde-i18n-cy-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Welsh (cy) internationalized (i18n) files for KDE
@@ -155,7 +155,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-da-kde3 (<< 4:14.0.0), kde-i18n-da-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-da-kde3 (<< 4:14.0.0), kde-i18n-da-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Danish (da) internationalized (i18n) files for KDE
@@ -167,7 +167,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-de-kde3 (<< 4:14.0.0), kde-i18n-de-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-de-kde3 (<< 4:14.0.0), kde-i18n-de-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: German (de) internationalized (i18n) files for KDE
@@ -179,7 +179,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-el-kde3 (<< 4:14.0.0), kde-i18n-el-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-el-kde3 (<< 4:14.0.0), kde-i18n-el-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Greek (el) internationalized (i18n) files for KDE
@@ -191,7 +191,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-engb-kde3 (<< 4:14.0.0), kde-i18n-engb-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-engb-kde3 (<< 4:14.0.0), kde-i18n-engb-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: British English (en_GB) internationalized (i18n) files for KDE
@@ -203,7 +203,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-eo-kde3 (<< 4:14.0.0), kde-i18n-eo-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-eo-kde3 (<< 4:14.0.0), kde-i18n-eo-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Esperanto (eo) internationalized (i18n) files for KDE
@@ -215,7 +215,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-es-kde3 (<< 4:14.0.0), kde-i18n-es-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-es-kde3 (<< 4:14.0.0), kde-i18n-es-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Spanish (es) internationalized (i18n) files for KDE
@@ -227,7 +227,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-et-kde3 (<< 4:14.0.0), kde-i18n-et-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-et-kde3 (<< 4:14.0.0), kde-i18n-et-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Estonian (et) internationalized (i18n) files for KDE
@@ -239,7 +239,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-eu-kde3 (<< 4:14.0.0), kde-i18n-eu-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-eu-kde3 (<< 4:14.0.0), kde-i18n-eu-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Basque (eu) internationalized (i18n) files for KDE
@@ -251,7 +251,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-fa-kde3 (<< 4:14.0.0), kde-i18n-fa-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-fa-kde3 (<< 4:14.0.0), kde-i18n-fa-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Farsi (Persian) (fa) internationalized (i18n) files for KDE
@@ -263,7 +263,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-fi-kde3 (<< 4:14.0.0), kde-i18n-fi-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-fi-kde3 (<< 4:14.0.0), kde-i18n-fi-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Finnish (fi) internationalized (i18n) files for KDE
@@ -275,7 +275,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-fr-kde3 (<< 4:14.0.0), kde-i18n-fr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-fr-kde3 (<< 4:14.0.0), kde-i18n-fr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: French (fr) internationalized (i18n) files for KDE
@@ -287,7 +287,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-fy-kde3 (<< 4:14.0.0), kde-i18n-fy-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-fy-kde3 (<< 4:14.0.0), kde-i18n-fy-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Frisian (fy) internationalized (i18n) files for KDE
@@ -299,7 +299,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ga-kde3 (<< 4:14.0.0), kde-i18n-ga-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ga-kde3 (<< 4:14.0.0), kde-i18n-ga-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Irish Gaelic (ga) internationalized (i18n) files for KDE
@@ -311,7 +311,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-gl-kde3 (<< 4:14.0.0), kde-i18n-gl-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-gl-kde3 (<< 4:14.0.0), kde-i18n-gl-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Galician (gl) internationalized (i18n) files for KDE
@@ -323,7 +323,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-he-kde3 (<< 4:14.0.0), kde-i18n-he-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-he-kde3 (<< 4:14.0.0), kde-i18n-he-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Hebrew (he) internationalized (i18n) files for KDE
@@ -335,7 +335,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-hi-kde3 (<< 4:14.0.0), kde-i18n-hi-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-hi-kde3 (<< 4:14.0.0), kde-i18n-hi-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Hindi (hi) internationalized (i18n) files for KDE
@@ -347,7 +347,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-hr-kde3 (<< 4:14.0.0), kde-i18n-hr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-hr-kde3 (<< 4:14.0.0), kde-i18n-hr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Croatian (hr) internationalized (i18n) files for KDE
@@ -359,7 +359,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-hu-kde3 (<< 4:14.0.0), kde-i18n-hu-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-hu-kde3 (<< 4:14.0.0), kde-i18n-hu-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Hungarian (hu) internationalized (i18n) files for KDE
@@ -371,7 +371,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-is-kde3 (<< 4:14.0.0), kde-i18n-is-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-is-kde3 (<< 4:14.0.0), kde-i18n-is-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Icelandic (is) internationalized (i18n) files for KDE
@@ -383,7 +383,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-it-kde3 (<< 4:14.0.0), kde-i18n-it-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-it-kde3 (<< 4:14.0.0), kde-i18n-it-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Italian (it) internationalized (i18n) files for KDE
@@ -395,7 +395,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ja-kde3 (<< 4:14.0.0), kde-i18n-ja-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ja-kde3 (<< 4:14.0.0), kde-i18n-ja-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Japanese (ja) internationalized (i18n) files for KDE
@@ -407,7 +407,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-kk-kde3 (<< 4:14.0.0), kde-i18n-kk-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-kk-kde3 (<< 4:14.0.0), kde-i18n-kk-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Kazakh (kk) internationalized (i18n) files for KDE
@@ -419,7 +419,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-km-kde3 (<< 4:14.0.0), kde-i18n-km-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-km-kde3 (<< 4:14.0.0), kde-i18n-km-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Khmer (km) internationalized (i18n) files for KDE
@@ -431,7 +431,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ko-kde3 (<< 4:14.0.0), kde-i18n-ko-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ko-kde3 (<< 4:14.0.0), kde-i18n-ko-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Korean (ko) internationalized (i18n) files for KDE
@@ -443,7 +443,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-lt-kde3 (<< 4:14.0.0), kde-i18n-lt-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-lt-kde3 (<< 4:14.0.0), kde-i18n-lt-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Lithuanian (lt) internationalized (i18n) files for KDE
@@ -455,7 +455,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-lv-kde3 (<< 4:14.0.0), kde-i18n-lv-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-lv-kde3 (<< 4:14.0.0), kde-i18n-lv-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Latvian (lv) internationalized (i18n) files for KDE
@@ -467,7 +467,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-mk-kde3 (<< 4:14.0.0), kde-i18n-mk-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-mk-kde3 (<< 4:14.0.0), kde-i18n-mk-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Macedonian (mk) internationalized (i18n) files for KDE
@@ -479,7 +479,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-mn-kde3 (<< 4:14.0.0), kde-i18n-mn-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-mn-kde3 (<< 4:14.0.0), kde-i18n-mn-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Mongolian (mn) internationalized (i18n) files for KDE
@@ -491,7 +491,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ms-kde3 (<< 4:14.0.0), kde-i18n-ms-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ms-kde3 (<< 4:14.0.0), kde-i18n-ms-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Malay (ms) internationalized (i18n) files for KDE
@@ -503,7 +503,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-nb-kde3 (<< 4:14.0.0), kde-i18n-nb-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-nb-kde3 (<< 4:14.0.0), kde-i18n-nb-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity, tde-i18n-no-trinity
 Description: Norwegian Bookmal (nb) internationalized (i18n) files for KDE
@@ -515,7 +515,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-nds-kde3 (<< 4:14.0.0), kde-i18n-nds-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-nds-kde3 (<< 4:14.0.0), kde-i18n-nds-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Low Saxon (nds) internationalized (i18n) files for KDE
@@ -527,7 +527,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-nl-kde3 (<< 4:14.0.0), kde-i18n-nl-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-nl-kde3 (<< 4:14.0.0), kde-i18n-nl-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Dutch (nl) internationalized (i18n) files for KDE
@@ -539,7 +539,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-nn-kde3 (<< 4:14.0.0), kde-i18n-nn-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-nn-kde3 (<< 4:14.0.0), kde-i18n-nn-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Description: Norwegian Nynorsk (nn) internationalized (i18n) files for KDE
  This package contains the Norwegian Nynorsk (nn) internationalized (i18n)
@@ -550,7 +550,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-pa-kde3 (<< 4:14.0.0), kde-i18n-pa-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-pa-kde3 (<< 4:14.0.0), kde-i18n-pa-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Punjabi (pa) internationalized (i18n) files for KDE
@@ -562,7 +562,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-pl-kde3 (<< 4:14.0.0), kde-i18n-pl-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-pl-kde3 (<< 4:14.0.0), kde-i18n-pl-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Polish (pl) internationalized (i18n) files for KDE
@@ -574,7 +574,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-pt-kde3 (<< 4:14.0.0), kde-i18n-pt-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-pt-kde3 (<< 4:14.0.0), kde-i18n-pt-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Portuguese (pt) internationalized (i18n) files for KDE
@@ -586,7 +586,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ptbr-kde3 (<< 4:14.0.0), kde-i18n-ptbr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ptbr-kde3 (<< 4:14.0.0), kde-i18n-ptbr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Brazilian Portuguese (pt_BR) internationalized (i18n) files for KDE
@@ -598,7 +598,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ro-kde3 (<< 4:14.0.0), kde-i18n-ro-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ro-kde3 (<< 4:14.0.0), kde-i18n-ro-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Romanian (ro) internationalized (i18n) files for KDE
@@ -610,7 +610,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ru-kde3 (<< 4:14.0.0), kde-i18n-ru-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ru-kde3 (<< 4:14.0.0), kde-i18n-ru-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Russian (ru) internationalized (i18n) files for KDE
@@ -622,7 +622,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-rw-kde3 (<< 4:14.0.0), kde-i18n-rw-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-rw-kde3 (<< 4:14.0.0), kde-i18n-rw-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Kinyarwanda (rw) internationalized (i18n) files for KDE
@@ -634,7 +634,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-se-kde3 (<< 4:14.0.0), kde-i18n-se-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-se-kde3 (<< 4:14.0.0), kde-i18n-se-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Northern Sami (se) internationalized (i18n) files for KDE
@@ -646,7 +646,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-sk-kde3 (<< 4:14.0.0), kde-i18n-sk-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-sk-kde3 (<< 4:14.0.0), kde-i18n-sk-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Slovak (sk) internationalized (i18n) files for KDE
@@ -658,7 +658,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-sl-kde3 (<< 4:14.0.0), kde-i18n-sl-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-sl-kde3 (<< 4:14.0.0), kde-i18n-sl-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Slovenian (sl) internationalized (i18n) files for KDE
@@ -670,7 +670,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-sr-kde3 (<< 4:14.0.0), kde-i18n-sr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-sr-kde3 (<< 4:14.0.0), kde-i18n-sr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Serbian (sr) internationalized (i18n) files for KDE
@@ -682,7 +682,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ss-kde3 (<< 4:14.0.0), kde-i18n-ss-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ss-kde3 (<< 4:14.0.0), kde-i18n-ss-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Swati (ss) internationalized (i18n) files for KDE
@@ -694,7 +694,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-srlatin-kde3 (<< 4:14.0.0), kde-i18n-srlatin-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-srlatin-kde3 (<< 4:14.0.0), kde-i18n-srlatin-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Latin Serbian (sr@Latn) internationalized (i18n) files for KDE
@@ -706,7 +706,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-sv-kde3 (<< 4:14.0.0), kde-i18n-sv-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-sv-kde3 (<< 4:14.0.0), kde-i18n-sv-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Swedish (sv) internationalized (i18n) files for KDE
@@ -718,7 +718,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-ta-kde3 (<< 4:14.0.0), kde-i18n-ta-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-ta-kde3 (<< 4:14.0.0), kde-i18n-ta-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Tamil (ta) internationalized (i18n) files for KDE
@@ -730,7 +730,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-te-kde3 (<< 4:14.0.0), kde-i18n-te-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-te-kde3 (<< 4:14.0.0), kde-i18n-te-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Telugu (te) internationalized (i18n) files for KDE
@@ -742,7 +742,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-tg-kde3 (<< 4:14.0.0), kde-i18n-tg-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-tg-kde3 (<< 4:14.0.0), kde-i18n-tg-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Tajik (tg) internationalized (i18n) files for KDE
@@ -754,7 +754,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-th-kde3 (<< 4:14.0.0), kde-i18n-th-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-th-kde3 (<< 4:14.0.0), kde-i18n-th-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Thai (th) internationalized (i18n) files for KDE
@@ -766,7 +766,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-tr-kde3 (<< 4:14.0.0), kde-i18n-tr-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-tr-kde3 (<< 4:14.0.0), kde-i18n-tr-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Turkish (tr) internationalized (i18n) files for KDE
@@ -778,7 +778,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-uk-kde3 (<< 4:14.0.0), kde-i18n-uk-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-uk-kde3 (<< 4:14.0.0), kde-i18n-uk-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Ukrainian (uk) internationalized (i18n) files for KDE
@@ -790,7 +790,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-uz-kde3 (<< 4:14.0.0), kde-i18n-uz-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-uz-kde3 (<< 4:14.0.0), kde-i18n-uz-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Uzbek (uz) internationalized (i18n) files for KDE
@@ -803,7 +803,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-uzcyrillic-kde3 (<< 4:14.0.0), kde-i18n-uzcyrillic-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-uzcyrillic-kde3 (<< 4:14.0.0), kde-i18n-uzcyrillic-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Cyrillic Uzbek (uz@cyrillic) internationalized (i18n) files for KDE
@@ -815,7 +815,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-vi-kde3 (<< 4:14.0.0), kde-i18n-vi-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-vi-kde3 (<< 4:14.0.0), kde-i18n-vi-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Vietnamese (vi) internationalized (i18n) files for KDE
@@ -827,7 +827,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-wa-kde3 (<< 4:14.0.0), kde-i18n-wa-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-wa-kde3 (<< 4:14.0.0), kde-i18n-wa-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Walloon (wa) internationalized (i18n) files for KDE
@@ -839,7 +839,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-zhcn-kde3 (<< 4:14.0.0), kde-i18n-zhcn-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-zhcn-kde3 (<< 4:14.0.0), kde-i18n-zhcn-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Chinese Simplified (zh_CN) internationalized (i18n) files for KDE
@@ -851,7 +851,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-zhtw-kde3 (<< 4:14.0.0), kde-i18n-zhtw-trinity (<< 4:14.0.0)
 Breaks: kde-i18n-zhtw-kde3 (<< 4:14.0.0), kde-i18n-zhtw-trinity (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity
+Depends: tdelibs14-trinity
 Suggests: kde
 Provides: tde-i18n-trinity
 Description: Chinese Traditional (zh_TW) internationalized (i18n) files for KDE
diff --git a/ubuntu/raring/tdebase/debian/control b/ubuntu/raring/tdebase/debian/control
index 43c9f14aa..f4ff3113f 100644
--- a/ubuntu/raring/tdebase/debian/control
+++ b/ubuntu/raring/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 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>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, binutils-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, binutils-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
diff --git a/ubuntu/raring/tdebindings/debian/control b/ubuntu/raring/tdebindings/debian/control
index ad28b4291..a6f1eb5f3 100644
--- a/ubuntu/raring/tdebindings/debian/control
+++ b/ubuntu/raring/tdebindings/debian/control
@@ -1,6 +1,6 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
- python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk,
+ python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk,
  gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
  tdelibs4-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby-dev, flex, bison,
diff --git a/ubuntu/raring/tdebindings/debian/rules b/ubuntu/raring/tdebindings/debian/rules
index f6ae5709b..c31999f17 100755
--- a/ubuntu/raring/tdebindings/debian/rules
+++ b/ubuntu/raring/tdebindings/debian/rules
@@ -3,6 +3,9 @@
 DEB_QUILT_PATCHDIR_LINK :=
 export QUILT_PATCHES=debian/patches
 
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 override DEB_BUILDDIR := $(DEB_SRCDIR)
@@ -131,7 +134,7 @@ binary-install/libqt0-ruby1.8-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
 binary-install/python-dcop-trinity::
-	dh_pysupport -p$(cdbs_curpkg)
+	${DH_PYTHON2} -p$(cdbs_curpkg)
 
 ###
 
diff --git a/ubuntu/raring/tdelibs/debian/control b/ubuntu/raring/tdelibs/debian/control
index 8274ad36a..fd9246ac6 100644
--- a/ubuntu/raring/tdelibs/debian/control
+++ b/ubuntu/raring/tdelibs/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
 Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
- binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
+ binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 14.0.0), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev, libnm-util-dev,
@@ -27,7 +27,7 @@ Replaces: kdelibs-kde3 (<< 4:14.0.0), kdelibs-trinity (<< 4:14.0.0)
 Breaks: kdelibs-kde3 (<< 4:14.0.0), kdelibs-trinity (<< 4:14.0.0)
 Provides: tdelibs
 Conflicts: tdelibs
-Depends: tdelibs4c2a-trinity (>= ${Source-Version}),
+Depends: tdelibs14-trinity (>= ${Source-Version}),
  tdelibs-data-trinity (>= ${Source-Version})
 Description: core libraries from the official Trinity release
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@@ -55,11 +55,12 @@ Description: core shared data for all TDE applications
  This package is part of TDE, and a component of the TDE libraries module.
  See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
 
-Package: tdelibs4c2a-trinity
+Package: tdelibs14-trinity
 Section: libs
 Architecture: any
-Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0)
-Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0)
+Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0), tdelibs4c2a-trinity
+Provides: tdelibs4c2a-trinity
+Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0), tdelibs4c2a-trinity
 Depends: ${shlibs:Depends}, tdelibs-data-trinity,
  tdelibs-data-trinity, libart-2.0-2 (>= 14.0.0), perl, xbase-clients, sudo
 Recommends: xdg-user-dirs, upower
@@ -80,7 +81,7 @@ Section: libdevel
 Architecture: any
 Replaces: kdelibs4-kde3-dev (<< 4:14.0.0), kdelibs4-trinity-dev (<< 4:14.0.0)
 Breaks: kdelibs4-kde3-dev (<< 4:14.0.0), kdelibs4-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 14.0.0),
+Depends: tdelibs14-trinity (= ${Source-Version}), libart-2.0-dev (>= 14.0.0),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
@@ -118,8 +119,8 @@ Architecture: any
 Replaces: kdelibs-kde3-dbg (<< 4:14.0.0), kdelibs-trinity-dbg (<< 4:14.0.0)
 Breaks: kdelibs-kde3-dbg (<< 4:14.0.0), kdelibs-trinity-dbg (<< 4:14.0.0)
 Priority: extra
-Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg
-Depends: tdelibs4c2a-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64]
+Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs14-trinity-dbg
+Depends: tdelibs14-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64]
 Description: debugging symbols for tdelibs
  This package contains the debugging symbols associated with tdelibs.
  They will automatically be used by gdb for debugging tdelibs-related
diff --git a/ubuntu/raring/tdelibs/debian/control.in b/ubuntu/raring/tdelibs/debian/control.in
index e949855d8..43f0657aa 100644
--- a/ubuntu/raring/tdelibs/debian/control.in
+++ b/ubuntu/raring/tdelibs/debian/control.in
@@ -22,7 +22,7 @@ Standards-Version: 3.7.2
 Package: tdelibs
 Section: libs
 Architecture: all
-Depends: tdelibs4c2a (>= ${Source-Version}),
+Depends: tdelibs14 (>= ${Source-Version}),
  tdelibs-data (>= ${Source-Version})
 Description: core libraries from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -52,7 +52,7 @@ Description: core shared data for all KDE applications
  This package is part of KDE, and a component of the KDE libraries module.
  See the 'kde' and 'tdelibs' packages for more information.
 
-Package: tdelibs4c2a
+Package: tdelibs14
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, tdelibs-data (>> ${KDE-Version3}),
@@ -76,7 +76,7 @@ Description: core libraries and binaries for all KDE applications
 Package: tdelibs4-dev
 Section: libdevel
 Architecture: any
-Depends: tdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
+Depends: tdelibs14 (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
@@ -86,7 +86,7 @@ Depends: tdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4),
  gettext-kde, tdesdk-scripts
 Provides: tdelibs-dev
-Replaces: tdebase-dev (<< 4:3.4.0), tdelibs4c2a (<< 4:3.5.7.dfsg.1-5)
+Replaces: tdebase-dev (<< 4:3.4.0), tdelibs14 (<< 4:3.5.7.dfsg.1-5)
 Description: development files for the KDE core libraries
  This package contains all the headers and other related files needed
  to compile KDE applications, or develop applications which use the
@@ -111,9 +111,9 @@ Package: tdelibs-dbg
 Section: libdevel
 Architecture: any
 Priority: extra
-Conflicts: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs4c2a-dbg
-Replaces: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs4c2a-dbg
-Depends: tdelibs4c2a (= ${Source-Version}), qt-x11-free-dbg, libc6-dbg [amd64]
+Conflicts: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs14-dbg
+Replaces: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs14-dbg
+Depends: tdelibs14 (= ${Source-Version}), qt-x11-free-dbg, libc6-dbg [amd64]
 Description: debugging symbols for tdelibs
  This package contains the debugging symbols associated with tdelibs.
  They will automatically be used by gdb for debugging tdelibs-related
diff --git a/ubuntu/raring/tdelibs/debian/rules b/ubuntu/raring/tdelibs/debian/rules
index 8d56f7eb0..ff689557e 100755
--- a/ubuntu/raring/tdelibs/debian/rules
+++ b/ubuntu/raring/tdelibs/debian/rules
@@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes
 version=Debian Package $(DEB_VERSION)
 DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
 
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" -DWITH_LIBBFD="ON" \
 -DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" -DWITH_TDEHWLIB_DAEMONS="ON" -DWITH_UPOWER="ON" -DWITH_UDISKS="ON" -DWITH_UDISKS2="ON" -DWITH_CONSOLEKIT="ON" -DWITH_NETWORK_MANAGER_BACKEND="ON" -DWITH_LZMA="ON" \
 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
@@ -98,7 +98,7 @@ common-install-prehook-impl::
 	  rm -f LIST; \
 	fi
 
-binary-install/tdelibs4c2a-trinity::
+binary-install/tdelibs14-trinity::
 	mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs4c2a-trinity/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tdecmshell debian/tdelibs4c2a-trinity/opt/trinity/bin/tdecmshell
+	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell.real
+	install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell
diff --git a/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.links b/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.links
index a94119055..3b0f1cdf4 100644
--- a/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.links
+++ b/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.links
@@ -1 +1 @@
-/etc/ssl/certs/ca-certificates.crt	debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt
+/etc/ssl/certs/ca-certificates.crt	opt/trinity/share/apps/kssl/ca-bundle.crt
diff --git a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.docs b/ubuntu/raring/tdelibs/debian/tdelibs14-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.docs
+++ b/ubuntu/raring/tdelibs/debian/tdelibs14-trinity.docs
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/raring/tdelibs/debian/tdelibs14-trinity.install
index a6c084acd..c836b40b0 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/raring/tdelibs/debian/tdelibs14-trinity.install
@@ -218,8 +218,8 @@ debian/tmp/opt/trinity/lib/trinity/plugins/styles/plastik.la
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/plastik.so
 debian/tmp/opt/trinity/lib/libartskde.so.1
 debian/tmp/opt/trinity/lib/libartskde.so.1.2.0
-debian/tmp/opt/trinity/lib/libDCOP.so.4
-debian/tmp/opt/trinity/lib/libDCOP.so.4.2.0
+debian/tmp/opt/trinity/lib/libDCOP.so.14
+debian/tmp/opt/trinity/lib/libDCOP.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeabc_dir.so.1
 debian/tmp/opt/trinity/lib/libtdeabc_dir.so.1.0.0
 debian/tmp/opt/trinity/lib/libtdeabc_file.so.1
@@ -240,12 +240,12 @@ debian/tmp/opt/trinity/lib/libtdeabc.so.1
 debian/tmp/opt/trinity/lib/libtdeabc.so.1.2.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0.0.0
-debian/tmp/opt/trinity/lib/libtdecore.so.4
-debian/tmp/opt/trinity/lib/libtdecore.so.4.2.0
-debian/tmp/opt/trinity/lib/libtdefakes.so.4
-debian/tmp/opt/trinity/lib/libtdefakes.so.4.2.0
-debian/tmp/opt/trinity/lib/libtdefx.so.4
-debian/tmp/opt/trinity/lib/libtdefx.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdecore.so.14
+debian/tmp/opt/trinity/lib/libtdecore.so.14.0.0
+debian/tmp/opt/trinity/lib/libtdefakes.so.14
+debian/tmp/opt/trinity/lib/libtdefakes.so.14.0.0
+debian/tmp/opt/trinity/lib/libtdefx.so.14
+debian/tmp/opt/trinity/lib/libtdefx.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.so
 debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.so
@@ -257,24 +257,24 @@ debian/tmp/opt/trinity/lib/libtdeinit_kded.so
 debian/tmp/opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
 debian/tmp/opt/trinity/lib/libtdeinit_tdeio_uiserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_tdelauncher.so
-debian/tmp/opt/trinity/lib/libtdeprint_management.so.4
-debian/tmp/opt/trinity/lib/libtdeprint_management.so.4.2.0
-debian/tmp/opt/trinity/lib/libtdeprint.so.4
-debian/tmp/opt/trinity/lib/libtdeprint.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.14
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.14.0.0
+debian/tmp/opt/trinity/lib/libtdeprint.so.14
+debian/tmp/opt/trinity/lib/libtdeprint.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdesasl.so.1
 debian/tmp/opt/trinity/lib/libtdesasl.so.1.2.0
-debian/tmp/opt/trinity/lib/libtdesu.so.4
-debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0
-debian/tmp/opt/trinity/lib/libtdeui.so.4
-debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdesu.so.14
+debian/tmp/opt/trinity/lib/libtdesu.so.14.0.0
+debian/tmp/opt/trinity/lib/libtdeui.so.14
+debian/tmp/opt/trinity/lib/libtdeui.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdednssd.so.1
 debian/tmp/opt/trinity/lib/libtdednssd.so.1.0.0
-debian/tmp/opt/trinity/lib/libtdehtml.so.4
-debian/tmp/opt/trinity/lib/libtdehtml.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdehtml.so.14
+debian/tmp/opt/trinity/lib/libtdehtml.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeimproxy.so.0
 debian/tmp/opt/trinity/lib/libtdeimproxy.so.0.0.0
-debian/tmp/opt/trinity/lib/libtdeio.so.4
-debian/tmp/opt/trinity/lib/libtdeio.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeio.so.14
+debian/tmp/opt/trinity/lib/libtdeio.so.14.0.0
 debian/tmp/opt/trinity/lib/libkjava.so.1
 debian/tmp/opt/trinity/lib/libkjava.so.1.0.0
 debian/tmp/opt/trinity/lib/libkjs.so.1
@@ -299,14 +299,14 @@ debian/tmp/opt/trinity/lib/libtdersync.so.0
 debian/tmp/opt/trinity/lib/libtdersync.so.0.0.1
 debian/tmp/opt/trinity/lib/libtderesources.so.1
 debian/tmp/opt/trinity/lib/libtderesources.so.1.2.0
-debian/tmp/opt/trinity/lib/libtdescreensaver.so.4
-debian/tmp/opt/trinity/lib/libtdescreensaver.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdescreensaver.so.14
+debian/tmp/opt/trinity/lib/libtdescreensaver.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdescript.so.0
 debian/tmp/opt/trinity/lib/libtdescript.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdespell2.so.1
 debian/tmp/opt/trinity/lib/libtdespell2.so.1.0.0
-debian/tmp/opt/trinity/lib/libtdespell.so.4
-debian/tmp/opt/trinity/lib/libtdespell.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdespell.so.14
+debian/tmp/opt/trinity/lib/libtdespell.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdetexteditor.so.0
 debian/tmp/opt/trinity/lib/libtdetexteditor.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdeunittest.so.1
diff --git a/ubuntu/raring/tdelibs/debian/tdelibs14-trinity.lintian b/ubuntu/raring/tdelibs/debian/tdelibs14-trinity.lintian
new file mode 100644
index 000000000..6272877c3
--- /dev/null
+++ b/ubuntu/raring/tdelibs/debian/tdelibs14-trinity.lintian
@@ -0,0 +1,15 @@
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.manpages b/ubuntu/raring/tdelibs/debian/tdelibs14-trinity.manpages
index 7c2d23170..7c2d23170 100644
--- a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.manpages
+++ b/ubuntu/raring/tdelibs/debian/tdelibs14-trinity.manpages
diff --git a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.postinst b/ubuntu/raring/tdelibs/debian/tdelibs14-trinity.postinst
index 6dbf5d9e1..6dbf5d9e1 100644
--- a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.postinst
+++ b/ubuntu/raring/tdelibs/debian/tdelibs14-trinity.postinst
diff --git a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.presubj b/ubuntu/raring/tdelibs/debian/tdelibs14-trinity.presubj
index 0213d87a4..0213d87a4 100644
--- a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.presubj
+++ b/ubuntu/raring/tdelibs/debian/tdelibs14-trinity.presubj
diff --git a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.lintian b/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.lintian
deleted file mode 100644
index 4a5ad60ed..000000000
--- a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ /dev/null
@@ -1,15 +0,0 @@
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
author	François Andriot <albator78@libertysurf.fr>	2013-08-27 21:17:52 +0200
committer	François Andriot <albator78@libertysurf.fr>	2013-08-27 21:17:52 +0200
commit	1af57210e2e55d40eb39a274fcf48779c6b9e7d5 (patch)
tree	55c22bbd35462f1c940b24614af05ea07bcd7f35 /ubuntu
parent	af8c5ead9ac4c1ece3408b74224e5e273b6994ce (diff)
parent	2d0d0ba99b507cab093962cb910ddc7dd4755c94 (diff)
download	tde-packaging-1af57210e2e55d40eb39a274fcf48779c6b9e7d5.tar.gz tde-packaging-1af57210e2e55d40eb39a274fcf48779c6b9e7d5.zip