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

32 files changed, 1401 insertions, 0 deletions

diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/README.Debian b/ubuntu/maverick/libraries/pykdeextensions/debian/README.Debian
new file mode 100644
index 000000000..b0302c211
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/README.Debian
@@ -0,0 +1,107 @@
+Debian kde-extras Team
+----------------------
+
+1. Contacts
+-----------
+
+General help requests
+	<debian-kde@lists.debian.org>	mailing list
+	#debian-kde			on irc
+
+Packaging queries
+	<debian-qt-kde@lists.debian.org>  mailing list
+	#debian-qt-kde			  on irc
+
+Maintainers
+	<pkg-kde-extras@lists.alioth.debian.org>	mailing list
+
+
+2. Subversion repository
+------------------------
+  
+You can browse it only at:
+
+http://svn.debian.org/wsvn/pkg-kde/kde-extras/
+
+To "checkout" the repository use these commands:
+
+	$ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
+
+Authorized SSH keys are controlled at https://alioth.debian.org/account/
+
+The repository layout is:
+
+- packagename/
+    - trunk/
+    - branches/
+    - tags/
+        - 0.7.2-1/
+        - 0.7.2-2/
+        - 0.7.2-2ubuntu1/
+        - 0.7.2-2ubuntu2/
+        - 0.7.2-2ubuntu3/
+        - 0.8.0/
+        ...
+
+If only one version of the package is available at the time, development must 
+be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new 
+release is made.
+
+When, at some point, the need to have two different versions at the same time 
+arises (for example, if we need a version to be in unstable and a different one
+to be in experimental), experimental development will be made in trunk/ and 
+if a new unstable package needs to be cooked, copying 
+tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the
+trick.
+
+3. Using svn-buildpackage
+--------------------------
+
+Packages with an upstream tarball will require you to set the mergeWithUpstream
+property first (from the package root) so that svn-buildpackage will look for
+the .orig.tar.gz in the ../tarballs directory.
+	
+	% svn propset mergeWithUpstream 1 debian
+
+Please note that this only works for packages which have only the debian/
+directory committed. Consequently, you must use CDBS's simple-patchsys.mk or
+dpatch to modify the upstream sources.
+
+After you have finished and committed your Debian patches via
+	
+	% svn commit [PACKAGE]
+
+as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build
+your package with the following commands:
+
+	% svn-buildpackage --svn-ignore-new -rfakeroot
+
+Please, don't commit tarballs/ or build-area/ directories to SVN.
+
+4. Tarballs and Build-area directories
+------------------------------------
+
+During pkg development before uploaded to debian the tarballs can be found at:
+
+	http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/
+
+You need to place those dirs in the parent directory of the one from which you're 
+running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs 
+in 'pkgname'/ dir, at the same level as trunk/
+
+If you want to compile inside one version in tags/ dir, you'll need to place those
+dirs inside that dir. Of course the easiest and cleanest way of doing it is 
+by making a symlink of those dirs inside tags/ dir.
+
+5. Using svn-inject
+-------------------
+
+To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1)
+as follows:
+
+        svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
+
+Type in your alioth password a few hundred times :-) and your package should be
+uploaded to the archive.  Note you will also need to manually copy the
+package.orig.tar.gz to your tarballs directory.  The -o option is important as
+this ensures that we 'Only keep modified files under SVN control'
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/changelog b/ubuntu/maverick/libraries/pykdeextensions/debian/changelog
new file mode 100644
index 000000000..3c1ed6acf
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/changelog
@@ -0,0 +1,134 @@
+pykdeextensions-trinity (0.4.0-6ubuntu6) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
+
+pykdeextensions-trinity (0.4.0-5ubuntu5) intrepid; urgency=low
+
+  * Added -trinity suffix
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 Dec 2008 21:38:00 -0600
+
+pykdeextensions (0.4.0-5ubuntu3) hardy; urgency=low
+
+  * Re-add libpythoniz0 dependency on python-dev to work around
+    libpythonize0 dlopening libpython2.5.so and not ...so.1 (LP: #179668)
+
+ -- Scott Kitterman <scott@kitterman.com>  Sat, 01 Mar 2008 11:15:08 -0500
+
+pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low
+
+  * debian/control:
+    - remove the python-all-dev dependency in libpythonize0
+    - remove python2.5-dev dependency in libpythonize0-dev, this
+      gets pulled in via libpythonize0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 17 Dec 2007 12:38:49 +0100
+
+pykdeextensions (0.4.0-5ubuntu1) hardy; urgency=low
+
+  * Merge with Debian, remaining changes:
+   - libpythonize0 depends on python2.5-dev, it tries to load .so file
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 29 Nov 2007 17:59:47 +0000
+
+pykdeextensions (0.4.0-5) unstable; urgency=low
+
+  * Add python-qt-dev build dependency.
+    pyqtconfig moved from python-qt3 to python-qt-dev. (Closes: #439504)
+  * Build with python 2.4/2.5. (Closes: #424505, #445292)
+    * Revert previous pyversions. 
+    * Revert python-all-dev build dependency.
+    * Replace 12_force_python2.4_script patch.
+  * Remove *.py[co] files.
+  * lintian cleanup: substvar-source-version-is-deprecated.
+    Use ${binary:Version}.
+  * Make pykdeextensions package arch all.
+
+ -- Fathi Boudra <fboudra@free.fr>  Sun, 07 Oct 2007 12:06:15 +0200
+
+pykdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low
+
+  * Fix depends to python2.5-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Sep 2007 18:48:45 +0100
+
+pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low
+
+  * Add libpython2.5-dev as a depends for libpythonize0, it wants to
+    load libpython2.5.so, reverts change from previous upload, LP: #84689, 
+    LP: #144815
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Sep 2007 16:32:17 +0100
+
+pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low
+
+  * Fix build failure, build-depend on python-qt-dev.
+  * Use the unversioned python interpreter for scripts.
+  * Don't include byte-compiled files. LP: #36733.
+  * libpythonize0: Remove dependency on python2.5-dev. LP: #84689.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 29 Aug 2007 20:48:25 +0000
+
+pykdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian, remaining changes:
+   - build on python 2.5
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 03 Jun 2007 13:51:42 +0100
+
+pykdeextensions (0.4.0-4) unstable; urgency=low
+
+  * Update pyversions. Force to build with python2.4 only. (Closes: #424505)
+  * Remove python-all-dev build dependency. Replaced by python-dev.
+  * Remove pycompat. Deprecated.
+
+ -- Fathi Boudra <fboudra@free.fr>  Wed, 16 May 2007 11:02:06 +0200
+
+pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low
+
+  * Force to build with python2.5.
+  * FIXME: The package is unlikely to work with python2.4; maybe
+    just drop the build dependency on python-all-dev.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 14 Jan 2007 16:42:27 +0000
+
+pykdeextensions (0.4.0-3) unstable; urgency=low
+
+  * Converted package to python-support
+  * Added pycompat and pyversions
+  * Force to use python2.4 (Closes: #375618)
+  * Added to Build-Depends: python-support, python-all-dev,
+    kdelibs4c2a (for kde-config)
+  * Updated libpythonize0-dev, libpythonize0, and pykdextensions install files
+  * Cleaned up rules
+  * Added 12_force_python2.4_script.diff to force python2.4 in scripts
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 29 Jun 2006 15:41:39 +0200
+
+pykdeextensions (0.4.0-2) unstable; urgency=low
+
+  * Converted package to cdbs
+  * Added 2 patches (thanks to Jonathan Riddell)
+    * 10_qt_candidate_paths.diff
+    * 11_fix_get_libdir_name.diff (Closes: #357775)
+  * Updated control file
+  * Bumped debian policy version
+
+ -- Fathi Boudra <fboudra@free.fr>  Tue,  6 Jun 2006 08:56:40 +0200
+
+pykdeextensions (0.4.0-1) unstable; urgency=low
+
+  [ Fathi Boudra ]
+  * Initial Debian release Closes: #340141
+
+  [ Jonathan Riddell ]
+  * Add depends on python2.x-dev to libpythonize0 to bring in libpython2.x.so
+
+  [ Mark Purcell ]
+  * Maintainer: Debian KDE Extras Team <pkg-kde-
+    extras@lists.alioth.debian.org>
+
+ -- Mark Purcell <msp@debian.org>  Tue, 28 Feb 2006 19:24:38 +0000
+
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/compat b/ubuntu/maverick/libraries/pykdeextensions/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/control b/ubuntu/maverick/libraries/pykdeextensions/debian/control
new file mode 100644
index 000000000..958752553
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/control
@@ -0,0 +1,45 @@
+Source: pykdeextensions-trinity
+Section: kde
+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, kdelibs4c2a-trinity, libtool,
+ libxml2-utils, libxrandr-dev, libxxf86vm-dev, pyqt-tools, python-trinity-trinity,
+ python-qt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5)
+Standards-Version: 3.8.4
+
+Package: pykdeextensions-trinity
+Architecture: all
+Depends: ${python:Depends}
+Conflicts: pykdeextensions
+Provides: ${python:Provides}
+Description: Python packages to support KDE applications (scripts) [Trinity]
+ PyKDE Extensions is a collection of software and Python packages
+ to support the creation and installation of KDE applications.
+ .
+  Homepage: http://www.simonzone.com/software/pykdeextensions
+
+Package: libpythonize0-trinity-dev
+Architecture: any
+Section: libdevel
+Depends: libpythonize0-trinity (= ${binary:Version}), python-dev
+Description: Python packages to support KDE applications (development) [Trinity]
+ PyKDE Extensions is a collection of software and Python packages
+ to support the creation and installation of KDE applications.
+ .
+ This package contains the libpythonize development files.
+ .
+  Homepage: http://www.simonzone.com/software/pykdeextensions
+
+Package: libpythonize0-trinity
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libpythonize0
+Description: Python packages to support KDE applications (library) [Trinity]
+ PyKDE Extensions is a collection of software and Python packages
+ to support the creation and installation of KDE applications.
+ .
+ This package contains the libpythonize library files.
+ .
+  Homepage: http://www.simonzone.com/software/pykdeextensions
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/copyright b/ubuntu/maverick/libraries/pykdeextensions/debian/copyright
new file mode 100644
index 000000000..a90a21587
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/copyright
@@ -0,0 +1,48 @@
+This package was debianized by Fathi Boudra <fboudra@free.fr> on
+Wed, 27 Jul 2005 20:19:26 +0200.
+
+It was downloaded from <http://www.simonzone.com/software/pykdeextensions>
+
+Application templates and pykde helper modules copyright:
+   Simon Edwards <simon@simonzone.com>
+
+License:
+
+   This program is free software; you can redistribute it and/or modify  
+   it under the terms of the GNU Library General Public License as       
+   published by the Free Software Foundation; either version 2 of the    
+   License, or (at your option) any later version.                       
+
+   This package 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 package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+
+libpythonize: Copyright 2003 Jim Bublitz <jbublitz@nwinternet.com>
+
+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.
+
+   This package 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 package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+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/libraries/pykdeextensions/debian/docs b/ubuntu/maverick/libraries/pykdeextensions/debian/docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install b/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install
new file mode 100644
index 000000000..f50fc4e15
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install
@@ -0,0 +1,4 @@
+opt/trinity/include/kde/pythonize.h
+opt/trinity/lib/libpythonize.a
+opt/trinity/lib/libpythonize.la
+opt/trinity/lib/libpythonize.so
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity.install b/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity.install
new file mode 100644
index 000000000..48601d2d0
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity.install
@@ -0,0 +1 @@
+opt/trinity/lib/libpythonize.so.*
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/patches/.gitignore b/ubuntu/maverick/libraries/pykdeextensions/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/patches/.gitignore
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pycompat b/ubuntu/maverick/libraries/pykdeextensions/debian/pycompat
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.install b/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
new file mode 100644
index 000000000..694850908
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
@@ -0,0 +1,7 @@
+usr/lib/python*/dist-packages
+opt/trinity/share/apps/pykdeextensions/AUTHORS
+opt/trinity/share/apps/pykdeextensions/ChangeLog
+opt/trinity/share/apps/pykdeextensions/INSTALL
+opt/trinity/share/apps/pykdeextensions/NEWS
+opt/trinity/share/apps/pykdeextensions/app_templates
+opt/trinity/share/doc/kde/HTML/en/pykdeextensions
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides b/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
new file mode 100644
index 000000000..06b60205b
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
@@ -0,0 +1,10 @@
+pykdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
+pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell
+pykdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pykdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pykdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
+pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
+
+pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py
+pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/python-distutils-jaunty.mk b/ubuntu/maverick/libraries/pykdeextensions/debian/python-distutils-jaunty.mk
new file mode 100644
index 000000000..9c5e5211f
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/python-distutils-jaunty.mk
@@ -0,0 +1,295 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Colin Walters <walters@debian.org>
+# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org>
+#
+# Description: manage Python public modules build
+#   This class is designed to work with Python packages using the
+#   'distutils' build system and comply to the new policy established
+#   during summer 2006.  Use of the debhelper class to make use of the
+#   new dh_python is strongly advised.  (This is still left as optional
+#   in line with CDBS' flexible behavior.)
+#
+# 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., 51 Franklin St, Fifth Floor, Boston, MA
+# 02111-1307 USA.
+#
+
+# This class provides rules for old and new Python policy.  Leaving
+# DEB_PYTHON_SYSTEM unset selects the old behavior.  The pysupport and
+# pycentral methods are available to comply with new policy.  Don't forget
+# to update your 'debian/control'.  (Build-Depends are correctly generated
+# if you are using the auto control generation feature.)
+
+# Once all old-style packages are removed before etch, some of the old
+# can be refactored or removed.
+
+
+_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_python_distutils
+_cdbs_class_python_distutils = 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
+
+
+# check python system
+cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes)
+cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi)
+cdbs_pycompat = $(cdbs_selected_pycompat)
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+  cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE)
+  ifeq (, $(cdbs_selected_pycompat))
+    cdbs_pycompat = 2
+  endif # use pycompat
+  # warning pysupport compatibility mode
+  ifneq (, $(cdbs_use_xs_field))
+    $(warning WARNING:  Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.)
+  endif # use XS field (compat)
+else
+  ifeq (pycentral, $(DEB_PYTHON_SYSTEM))
+    ifeq (, $(cdbs_selected_pycompat))
+      cdbs_pycompat = 2
+    endif # use pycompat
+  else
+    ifneq (, $(DEB_PYTHON_SYSTEM))
+      $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral))
+    else
+      ifneq (, $(cdbs_use_xs_field))
+        $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
+      endif
+      ifneq (, $(cdbs_selected_pycompat))
+        ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes))
+          $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
+        endif
+      endif # use pycompat
+    endif # unknown method
+  endif # pycentral
+endif # pysupport
+
+
+ifndef DEB_PYTHON_SYSTEM
+DEB_PYTHON_COMPILE_VERSION = 
+DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6
+else
+# default package is the first one declared in 'debian/control'
+# (override if necessary)
+DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES)))
+DEB_PYTHON_PRIVATE_MODULES_DIRS =
+endif
+
+# common variables
+DEB_PYTHON_SETUP_CMD = setup.py
+DEB_PYTHON_CLEAN_ARGS = -a
+DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build"
+DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0 --prefix=/usr 
+
+
+ifndef DEB_PYTHON_SYSTEM
+########################### old policy method ###########################
+
+$(warning =======================================================)
+$(warning Your package does not conform to the new Python policy.)
+$(warning Please consider updating.  Here is some documentation:)
+$(warning   http://wiki.debian.org/DebianPython/NewPolicy)
+$(warning   http://wiki.debian.org/DebianPythonFAQ)
+$(warning =======================================================)
+
+# make: *** No rule to make target `voodoo'.  Stop.
+DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
+# If no versioned python library packages found, grab all simpler ones
+ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
+DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
+endif
+
+cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg))))
+
+common-build-arch common-build-indep:: common-build-impl
+common-build-impl::
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
+
+
+# See if this package doesn't appear to need to be compiled by multiple
+# Python versions.
+ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
+common-install-arch common-install-indep:: common-install-impl
+common-install-impl::
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
+	for ddir in $(DEB_DESTDIR)/usr/lib/python?.?/dist-packages; do \
+	  sdir=$$(dirname $$ddir)/site-packages; \
+	  mkdir -p $$sdir; \
+	  tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
+	  rm -rf $$ddir; \
+	done
+else
+$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
+	for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \
+	  sdir=$$(dirname $$ddir)/site-packages; \
+	  mkdir -p $$sdir; \
+	  tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
+	  rm -rf $$ddir; \
+	done
+endif
+
+$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+	for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \
+	  sdir=$$(dirname $$ddir)/site-packages; \
+	  mkdir -p $$sdir; \
+	  tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
+	  rm -rf $$ddir; \
+	done
+endif
+
+# This class can optionally utilize debhelper's "dh_python" command.  Just
+# be sure you include debhelper.mk before including this file.
+ifdef _cdbs_rules_debhelper
+
+DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
+endif
+
+
+# Ignore errors from this rule.  In a tarball build, the file may not
+# exist.
+ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
+clean::
+	-python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
+else
+clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES))
+
+$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% : 
+	-python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
+endif
+
+else
+########################## new policy methods ###########################
+
+# Calculate cdbs_python_build_versions
+cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control))
+cdbs_python_current_version := $(shell pyversions -vd)
+ifeq (all, $(cdbs_python_module_arch))
+  # check if current is in build versions
+  ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr)))
+    cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr))))
+    cdbs_python_build_versions := $(cdbs_python_compile_version)
+  else
+    cdbs_python_build_versions := $(cdbs_python_current_version)
+  endif
+else
+cdbs_python_build_versions := $(shell pyversions -vr)
+endif # archall
+
+# check if build is possible
+ifeq (, $(cdbs_python_build_versions))
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+$(error invalid setting in debian/pyversions)
+else
+$(error invalid setting for XS-Python-Version)
+endif # system selected
+endif # build versions empty
+
+
+# Declare Build-Deps for packages using this file
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43)
+ifeq (all, $(cdbs_python_module_arch))
+  ifneq (, $(cdbs_python_compile_version))
+    CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11)
+  else
+    CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11)
+  endif
+else
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11)
+endif
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2)
+else
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6)
+endif
+
+
+cdbs_python_current_binary := $(shell pyversions -d)
+cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1))
+
+# build stage
+common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions))
+python-build-stamp-%:
+ifeq (all, $(cdbs_python_module_arch))
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
+else
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
+endif # archall detection
+	touch $@
+
+
+# install stage
+ifeq (all, $(cdbs_python_module_arch))
+common-install-arch common-install-indep:: python-install-py
+python-install-py:
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
+else
+common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions))
+python-install-%:
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
+endif # archall detection
+
+
+# This class can optionally use debhelper's commands.  Just
+# be sure you include debhelper.mk before including this file.
+ifdef _cdbs_rules_debhelper
+
+DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+	dh_pysupport -p$(cdbs_curpkg) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
+else
+	dh_pycentral -p$(cdbs_curpkg)
+endif
+	dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
+endif
+
+
+# clean stage
+clean:: $(addprefix python-clean-, $(cdbs_python_build_versions))
+python-clean-%:
+ifeq (all, $(cdbs_python_module_arch))
+	-cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
+else
+	-cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
+endif # archall detection
+
+clean::
+ifeq (, $(cdbs_selected_pycompat))
+	echo "$(cdbs_pycompat)" >debian/pycompat
+endif # use pycompat
+	rm -f python-build-stamp-*
+
+endif
+
+
+########################## all policy methods ###########################
+
+# Calling setup.py clean may create .pyc files, so we need a final cleanup
+# pass here.
+clean::
+	find . -name '*.pyc' -exec rm '{}' ';'
+
+endif
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pyversions b/ubuntu/maverick/libraries/pykdeextensions/debian/pyversions
new file mode 100644
index 000000000..b3dc41ebc
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/pyversions
@@ -0,0 +1 @@
+2.5-
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/rules b/ubuntu/maverick/libraries/pykdeextensions/debian/rules
new file mode 100755
index 000000000..49c03b6ab
--- /dev/null
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/rules
@@ -0,0 +1,63 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM = pysupport
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+#include /usr/share/cdbs/1/class/python-distutils.mk
+include debian/python-distutils-jaunty.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+
+install/pykdeextensions-trinity::
+	# We have no idea if the built product is site-packages or dist-packages
+	cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages"
+	rm -rf debian/tmp/usr/lib/python*/site-packages/
+
+	# install lintian overrides
+	install -D -p -m0644 debian/pykdeextensions-trinity.lintian-overrides \
+	  debian/pykdeextensions-trinity/usr/share/lintian/overrides/pykdeextensions-trinity
+
+	# fix script-not-executable
+	find debian -type f -name '*.py' | xargs chmod 0755
+
+	# remove extra-license-file
+	find debian -type f -name 'COPYING' | xargs rm -f
+
+	# remove  byte-compiled file
+	find . -type f -name '*.py[co]' | xargs rm -f
+
+install/libpythonize0-trinity::
+	# Move the files where they belong
+	mkdir -p debian/tmp/opt/trinity/lib
+	mv debian/tmp/usr/lib/libpythonize* debian/tmp/opt/trinity/lib/ || echo "moving files 1/2"
+	mv debian/tmp/usr/include debian/tmp/opt/trinity/ || echo "moving files 2/2"
+
+	# fix binary-or-shlib-defines-rpath
+	chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.*
+	# fix include directory location
+	mkdir -p debian/tmp/opt/trinity/include/kde
+	mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/kde
+
+clean::
+	rm -rf build
+	rm -f doc/en/*html doc/en/*bz2
+	rm -f install_log.txt
+
+	# remove  byte-compiled file
+	find . -type f -name '*.py[co]' | xargs rm -f
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]
+	@@dpatch-get-origtargz ../tarballs
+
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/NEWS.Debian b/ubuntu/maverick/libraries/python-trinity/debian/NEWS.Debian
new file mode 100644
index 000000000..367c6950d
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/NEWS.Debian
@@ -0,0 +1,10 @@
+python-trinity (3.16.0-3) unstable; urgency=low
+
+   python-trinity-dbg contains modules built for a debug Python interpreter.
+   However, it contains modules only for the default Python version. Also,
+   the debug symbols from python-trinity are not stored inside python-trinity-dbg,
+   in order to keep the package size sane. If you need those debug symbols,
+   locate the dh_strip command in debian/rules and uncomment the "--dbg-package"
+   options.
+
+ -- Torsten Marek <shlomme@debian.org>  Sun, 16 Sep 2007 13:57:44 +0200
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/changelog b/ubuntu/maverick/libraries/python-trinity/debian/changelog
new file mode 100644
index 000000000..48f8d4dae
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/changelog
@@ -0,0 +1,386 @@
+python-trinity-trinity (3.16.3-0ubuntu4) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 16 Oct 2009 14:47:00 -0600
+
+python-trinity-trinity (3.16.3-0ubuntu1) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
+
+python-trinity-trinity (3.16.2-0ubuntu1) jaunty; urgency=low
+
+  * Jaunty rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 23 April 2009 13:02:00 -0600
+
+python-trinity (3.16.2-0ubuntu1) jaunty; urgency=low
+
+  [ Matthias Klose ]
+  * Build for python2.6.
+
+  [ William Grant ]
+  * New upstream version. Fixes FTBFS. (LP: #333457)
+
+ -- William Grant <wgrant@ubuntu.com>  Mon, 09 Mar 2009 09:04:22 +1100
+
+python-trinity (3.16.1-1ubuntu2) intrepid; urgency=low
+
+  * Actually include the fix for (LP: #229845) I claimed was in the last
+    upload
+
+ -- Scott Kitterman <scott@kitterman.com>  Sat, 13 Sep 2008 16:23:41 -0400
+
+python-trinity (3.16.1-1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Add kubuntu_04_kdepyuic_i18n.dpatch:
+      - kdepyuic now has a useKDEi18n cmdline option, set
+        to TRUE by default, so that .py files generated from
+        .ui files are using i18n by default.
+      - fixes long options parsing, using a list of string
+        instead of a long string
+      - Patch by Stephan Hermann <sh@sourcecode.de>
+    - Build-dep on python-sip4
+  * Update debian/rules to move kdeconfig files from
+    /usr/lib/python-2.*/site-packages to /usr/lib/python2.4/site-packages so it
+    is in the normal path (LP: #229845)
+  * Dropped kubuntu_03_konsole_setpty and konsole depends since the new
+    version no longer needs them
+
+ -- Scott Kitterman <scott@kitterman.com>  Wed, 18 Jun 2008 22:11:32 -0400
+
+python-trinity (3.16.1-1) unstable; urgency=low
+
+  [ Piotr Ożarowski ]
+  * Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now)
+
+  [ Sandro Tosi ]
+  * debian/watch
+    - added missing file
+  * debian/control
+    - uniforming Vcs-Browser field
+    - bump Standard-Version to 3.7.3
+    - capitalized Python in -dbg package description
+    - removed Debian revision from versioned build-dep on libqt3-mt-dev,
+      qt3-apps-dev, qt3-dev-tools
+  * debian/rules
+    - fixed destination dir for -dev package (Closes: #446904)
+  * debian/copyright
+    - clear separation of copyright and license notice
+    - copyright and license indented with 4 spaces
+    - added upstream authors notice
+
+  [ Torsten Marek ]
+  * New upstream release 3.16.1.
+  * Included patch to dcopext.py handling 
+    DCOPObj.objmethods being None (Closes: #468248).
+  * Patched dcopext.py to handle strings with non-ASCII 
+    characters (Closes: #452443).
+  * Dropped 03-sip-4.7.dpatch, is now included upstream.
+  * debian/control
+    - removed dependency on konsole, because the bindings
+      for the konsole KPart have been removed.
+  * debian/rules
+    - compress debs using bzip2 to reduce the size
+      of the debug packages.
+
+ -- Torsten Marek <shlomme@debian.org>  Tue, 11 Mar 2008 01:42:08 +0100
+
+python-trinity (3.16.0-4ubuntu3) hardy; urgency=low
+
+  * Remove build-dep on python-qt3 - No longer needed because pyqtconfig is
+    back in python-qt-dev (LP: #197867)
+
+ -- Scott Kitterman <scott@kitterman.com>  Wed, 12 Mar 2008 16:46:05 -0400
+
+python-trinity (3.16.0-4ubuntu2) hardy; urgency=low
+
+  * Add kubuntu_04_kdepyuic_i18n.dpatch:
+    - kdepyuic now has a useKDEi18n cmdline option, set
+      to TRUE by default, so that .py files generated from
+      .ui files are using i18n by default.
+    - fixes long options parsing, using a list of string
+      instead of a long string
+    - Patch by Stephan Hermann <sh@sourcecode.de>
+
+ -- Anthony Mercatante <tonio@kubuntu>  Thu, 03 Jan 2008 22:40:39 +0100
+
+python-trinity (3.16.0-4ubuntu1) hardy; urgency=low
+
+  * Merge with debian, remaining change:
+   - kubuntu_03_konsole_setpty.dpatch patch for setpty() support
+  * Build-dep on python-sip4
+  * Build-dep on python-qt3
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 29 Nov 2007 18:24:06 +0000
+
+python-trinity (3.16.0-4) unstable; urgency=low
+
+  [ Piotr Ożarowski ]
+  * XS-Vcs-Svn, XS-Vcs-Browser and Homepage fields added
+
+  [ Torsten Marek ]
+  * Added dependency on konsole (Closes: #443819)
+
+ -- Torsten Marek <shlomme@debian.org>  Mon, 01 Oct 2007 01:37:23 +0200
+
+python-trinity (3.16.0-3) unstable; urgency=low
+
+  * Merge with Ubuntu:
+  * Unable Konsole bindings.
+  * Build debug modules, but only for the default Python version 
+    to keep the size sane. Debug symbols are left out as well.
+  * Adopt DCOP patch from Ubuntu.
+  * Better debian/rules file.
+
+ -- Torsten Marek <shlomme@debian.org>  Sun, 16 Sep 2007 13:57:44 +0200
+
+python-trinity (3.16.0-2) unstable; urgency=low
+
+  * Include dcopext.py and dcopexport.py. (Closes: #440633)
+  * Add DPMT to uploaders field.
+
+ -- Torsten Marek <shlomme@debian.org>  Mon, 03 Sep 2007 21:27:42 +0200
+
+python-trinity (3.16.0-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #427285, #440028)
+  * Rename method that is also a Python keyword. (Closes: #407894)
+
+ -- Torsten Marek <shlomme@debian.org>  Sun, 12 Aug 2007 13:03:11 +0200
+
+python-trinity (3.15.2+20060422-4) unstable; urgency=low
+
+  * Build with sip 4.5 / PyQt 3.17
+
+ -- Torsten Marek <shlomme@debian.org>  Wed,  6 Dec 2006 19:18:30 +0100
+
+python-trinity (3.16.0-0ubuntu14) gutsy; urgency=low
+
+  * Split C++ sources in more parts when building with GCC-4.[23].
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 29 Aug 2007 22:12:01 +0200
+
+python-trinity (3.16.0-0ubuntu13) gutsy; urgency=low
+
+  * debian/control: changed the python-trinity-dev depends;
+    python-trinity-dev depends on python-trinity now.
+
+ -- Martin Böhm <martin.bohm@kubuntu.org>  Mon, 06 Aug 2007 13:56:05 +0200
+
+python-trinity (3.16.0-0ubuntu12) gutsy; urgency=low
+
+  * Add patch kubuntu_00_sip-4.7.dpatch, make it compile with
+    sip 4.7 and build-dep on pyqt 3.17.3-1ubuntu1
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 03 Aug 2007 17:00:07 +0100
+
+python-trinity (3.16.0-0ubuntu11) feisty; urgency=low
+
+  * Fix copy and paste error, resulting in unusable extensions for
+    the -dbg build.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 21 Feb 2007 18:16:52 +0100
+
+python-trinity (3.16.0-0ubuntu10) feisty; urgency=low
+
+  * Don't call ldconfig in the installation target.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 20 Feb 2007 21:19:44 +0100
+
+python-trinity (3.16.0-0ubuntu9) feisty; urgency=low
+
+  * Build a python-trinity-dbg package.
+  * Use the dpatch patch system.
+  * Use single targets instead of loops inside a target.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 20 Feb 2007 02:09:12 +0100
+
+python-trinity (3.16.0-0ubuntu8) feisty; urgency=low
+
+  [ Michael Vogt ]
+  * Add kubuntu_03_konsole_setpty.diff,
+    adds setPtyFd() to sip/kpart/konsole_kpart.sip
+
+  [ Jonathan Riddell ]
+  * Update build-dep version to kdelibs and konsole 3.5.6
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 19 Jan 2007 10:43:29 +0100
+
+python-trinity (3.16.0-0ubuntu7) feisty; urgency=low
+
+  * Fix build failures on 64bit archs with python2.5.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 14 Jan 2007 17:05:04 +0100
+
+python-trinity (3.16.0-0ubuntu6) feisty; urgency=low
+
+  * Rebuild for python2.5 as the default python version.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Jan 2007 13:18:13 +0000
+
+python-trinity (3.16.0-0ubuntu5) feisty; urgency=low
+
+  * Tighen build-dep on python-qt3 to ensure it builds
+    without visibility=hidden
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Dec 2006 11:13:43 +0000
+
+python-trinity (3.16.0-0ubuntu4) feisty; urgency=low
+
+  * Rebuild against Qt without visibility=hidden
+  * Ensure patches are not applied in source package
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  4 Dec 2006 13:53:06 +0000
+
+python-trinity (3.16.0-0ubuntu3) feisty; urgency=low
+
+  * Make python-trinity depend on konsole
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 24 Nov 2006 14:32:43 +0000
+
+python-trinity (3.16.0-0ubuntu2) feisty; urgency=low
+
+  * Add kubuntu_02_no_konsole_symlink.diff, don't create a symlink from
+    /usr/lib when running make install
+  * Create symlink from debian/rules instead
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 24 Nov 2006 00:49:46 +0000
+
+python-trinity (3.16.0-0ubuntu1) feisty; urgency=low
+
+  * New upstream release
+  * Build-depend on pyqt 3.17 and sip 4.5
+  * Add build-depends on /usr/lib/trinity/libkonsolepart.so
+  * Don't build for python 2.5, it fails to build
+  * Merge with Debian, remaining change:
+    - kubuntu_01_dcop.diff patch
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 22 Nov 2006 19:03:34 +0000
+
+python-trinity (3.15.2+20060422-3) unstable; urgency=medium
+
+  * Include shlib dependencies (Closes: #378815)
+
+ -- Torsten Marek <shlomme@debian.org>  Thu, 28 Sep 2006 20:25:29 +0200
+
+python-trinity (3.15.2+20060422-2) unstable; urgency=low
+
+  * Python policy transition (Closes: #373321)
+
+ -- Torsten Marek <shlomme@debian.org>  Wed, 21 Jun 2006 20:44:58 +0200
+
+python-trinity (3.15.2+20060422-1) unstable; urgency=low
+
+  * New upstream release
+    * KConfigSkeleton works now (Closes: #310919)
+    * KABC is included (Closes: #362443)
+  * Depend on python2.x-sip4 instead of python2.x-sip4-qt3
+  * Bump build-depends on sip4 to 4.4.2 and dependencies on PyQt to 3.16
+  * Raised debhelper compat level to 5
+  * Changed my email address to shlomme@debian.org
+  * Builds fine in pbuilder now, probably a missed build dependency
+    elsewhere (Closes: #351711)
+  * Remove build dependency no c++abi2-dev
+  * Put kdepyuic into python-trinity-dev. Thanks, Stephan Hermann
+
+ -- Torsten Marek <shlomme@debian.org>  Tue,  2 May 2006 11:57:51 +0200
+
+python-trinity (3.11.3+20051013-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Torsten Marek <shlomme@gmx.net>  Sun, 16 Oct 2005 11:55:45 +0200
+
+python-trinity (3.11.3+20050829-2) unstable; urgency=low
+
+  * Applied patch to klibloader.sip to fix an issue with KParts,
+    thanks to David & Paul Boddie.
+
+ -- Torsten Marek <shlomme@gmx.net>  Mon, 10 Oct 2005 22:52:57 +0200
+
+python-trinity (3.11.3+20050829-1) unstable; urgency=low
+
+  * New upstream release (Closes: #304407)
+  * g++ ABI transition,
+    add c++abi2-dev to Build-Depends (Closes: #327949)
+  * Built with sip 4.3 (Closes: #327314)
+  * Built against KDE 3.4.2
+  * Added myself to Uploaders
+  * Bumped all Build-Depends and Depends on sip to
+    be >= 4.3 and << 4.4
+  * Bumped standards version to 3.6.2, no changes involved
+  * Fixed FSF address in copyright file
+  * Include upstream changelog
+  * Added package for Python 2.4
+  * Added the homepage of PyKDE to the package descriptions
+  * HTML documentations is now installed into 
+    /usr/share/doc/python-trinity-doc/html
+  * pykdeconfig.py now also knows that the sip files
+    are in /usr/share/sip/trinity, not in /usr/share/sip/kde
+    (Closes: #312708)
+
+ -- Torsten Marek <shlomme@gmx.net>  Tue, 20 Sep 2005 01:21:33 +0200
+
+python-trinity (3.11.3-4) unstable; urgency=high
+
+  * Added a direct dependency on the right version of sip
+  * Added python-trinity-dev (Closes: #294076)
+  * Added extra/332 so it builds with KDE 3.3.2 (Closes: #294079)
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org>  Fri,  1 Apr 2005 16:07:33 +0100
+
+python-trinity (3.11.3-3) unstable; urgency=low
+
+  * Changed depend on PyQt >= 3.13-2 to >= 3.13 (I don't know what
+    I was thinking on)
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org>  Thu,  9 Dec 2004 09:36:34 +0000
+
+python-trinity (3.11.3-2) unstable; urgency=low
+
+  * Rebuilt against PyQt 3.13 (bumped debian/control depends too)
+  * Applied a simple patch to build with KDE 3.3.1
+  * Adapted Thiemo Seufer's patch to make it build on mips/mipsel.
+    Closes: Bug#274469
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org>  Mon,  4 Oct 2004 12:28:17 +0100
+
+python-trinity (3.11.3-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org>  Mon, 30 Aug 2004 15:40:40 +0100
+
+python-trinity (3.11.1+3.11.2-2) unstable; urgency=low
+
+  * Split the number of generated object files during the building
+    process on some arches, because of hardware limitations (scarce
+    resources, or things like hitting the exported table size limit
+    on Alpha).
+    Closes: Bug#266733
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org>  Thu, 19 Aug 2004 00:41:08 +0100
+
+python-trinity (3.11.1+3.11.2-1) unstable; urgency=low
+
+  * Applied some changes from 3.11.2-snapshot-040816 to make it
+    build with KDE 3.3.
+  * Rebuilt the against KDE 3.3 due to ABI incompatibility.
+    Closes: Bug#266506
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org>  Wed, 18 Aug 2004 19:25:53 +0100
+
+python-trinity (3.11.1a-1) unstable; urgency=low
+
+  * Initial release of this package.
+    Closes: Bug#147965
+  * Added "pyParts.rc" from 3.7 that have been missing on the
+    examples since 3.8 (thanks Patrick McFarland for notifying it)
+  * Includes some patches from development version.
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org>  Sat, 19 Jun 2004 23:07:05 +0100
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/compat b/ubuntu/maverick/libraries/python-trinity/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control
new file mode 100644
index 000000000..c384f66d6
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/control
@@ -0,0 +1,52 @@
+Source: python-trinity-trinity
+Section: python
+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-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
+Standards-Version: 3.8.4
+Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
+XS-Python-Version: all
+
+Package: python-trinity-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (>= 3.18)
+XB-Python-Version: ${python:Versions}
+Provides: ${python:Provides}
+Conflicts: python-trinity-trinity
+Description: KDE3 bindings for Python [Trinity]
+ Python binding module that provides wide access to the KDE3 API,
+ also known as PyKDE. Using this, you'll get (for example) classes
+ from kio, kjs, khtml and kprint.
+
+Package: python-trinity-trinity-dbg
+Priority: extra
+Architecture: any
+Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-qt3-dbg, ${shlibs:Depends}
+XB-Python-Version: ${python:Versions}
+Description: KDE3 bindings for Python (debug extensions) [Trinity]
+ Python binding module that provides wide access to the KDE3 API,
+ also known as PyKDE. Using this, you'll get (for example) classes
+ from kio, kjs, khtml and kprint.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-trinity-trinity-dev
+Section: python
+Architecture: all
+Depends: pyqt-tools, ${python:Depends}
+XB-Python-Version: ${python:Versions}
+Description: KDE3 bindings for Python - Development files and scripts [Trinity]
+ Development .sip files with definitions of PyKDE classes. They
+ are needed to build PyKDE, but also as building blocks of other
+ packages based on them. 
+ The package also contains kdepyuic, a wrapper script around PyQt's 
+ user interface compiler.
+
+Package: python-trinity-trinity-doc
+Section: doc
+Architecture: all
+Description: Documentation and examples for PyKDE [Trinity]
+ General documentation and examples for PyKDE providing programming
+ tips and working code you can use to learn from.
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/copyright b/ubuntu/maverick/libraries/python-trinity/debian/copyright
new file mode 100644
index 000000000..d67316545
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/copyright
@@ -0,0 +1,30 @@
+This package was debianized by Ricardo Javier Cardenes Medina <rcardenes@debian.org> on
+Sat, 19 Jun 2004 23:31:46 +0100.
+
+It was downloaded from http://www.riverbankcomputing.co.uk
+
+Upstream Authors:
+
+    Jim Bublitz <jbublitz@nwinternet.com>
+      PyKDE(KDE2, KDE3) 
+    Phil Thompson <phil@river-bank.demon.co.uk>
+      sip, PyQt, original PyKDE (KDE1) and loads of good advice and help
+
+Copyright:
+
+    Copyright 2004 Jim Bublitz <jbublitz@nwinternet.com>
+    Copyright 1998-2002 Jim Bublitz and/or Phil Thompson
+
+License:
+
+    This software 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.
+
+    A copy of the GNU General Public License is available as
+    /usr/share/common-licenses/GPL in the Debian GNU/Linux
+    distribution or on the World Wide Web at
+    http://www.gnu.org/copyleft/gpl.html.  You can also obtain it by
+    writing to the Free Software Foundation, Inc., 51 Franklin St,
+    Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/patches/.gitignore b/ubuntu/maverick/libraries/python-trinity/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/patches/.gitignore
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/pycompat b/ubuntu/maverick/libraries/python-trinity/debian/pycompat
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/pykdeconfig.py b/ubuntu/maverick/libraries/python-trinity/debian/pykdeconfig.py
new file mode 100644
index 000000000..9e3840afe
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/pykdeconfig.py
@@ -0,0 +1,11 @@
+# import the sipconfig.py for the normal or the debug build
+
+import sys
+
+if getattr(sys, "pydebug", False):
+    try:
+        from pykdeconfig_d import *
+    except ImportError, msg:
+        raise ImportError, 'No module named pykdeconfig; package python-trinity-dbg not installed'
+else:
+    from pykdeconfig_nd import *
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.dirs b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.dirs
new file mode 100644
index 000000000..8c23689f0
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.dirs
@@ -0,0 +1,4 @@
+usr/share/doc/python-trinity-doc
+usr/share/doc/python-trinity-doc/examples
+usr/share/doc/python-trinity-doc/html
+
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.doc-base b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.doc-base
new file mode 100644
index 000000000..58c6a2651
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.doc-base
@@ -0,0 +1,12 @@
+Document: PyKDE
+Title: PyKDE developer documentation
+Author: Jim Bublitz
+Abstract: This documentation describes the PyKDE API
+ PyKDE contains the Python bindings to the KDE core library.
+ This manual contains general handling instructions and 
+ a class reference.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/python-trinity-doc/html/index.html
+Files: /usr/share/doc/python-trinity-doc/html/*.html
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.examples b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.examples
new file mode 100644
index 000000000..e39721e20
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.examples
@@ -0,0 +1 @@
+examples/*
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.install b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.install
new file mode 100644
index 000000000..146aeabc5
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.install
@@ -0,0 +1 @@
+doc/* usr/share/doc/python-trinity-doc/html
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
new file mode 100644
index 000000000..c395de89f
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
@@ -0,0 +1 @@
+opt/trinity/share/sip/trinity
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-dev.install
new file mode 100644
index 000000000..7b0c03e54
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-dev.install
@@ -0,0 +1,2 @@
+sip/* opt/trinity/share/sip/trinity
+contrib/kdepyuic opt/trinity/bin/
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity.install b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity.install
new file mode 100644
index 000000000..facee2907
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity.install
@@ -0,0 +1,3 @@
+usr/lib/python*/*-packages/*.so
+usr/lib/python*/*-packages/dcop*.py
+
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/rules b/ubuntu/maverick/libraries/python-trinity/debian/rules
new file mode 100755
index 000000000..5745a4451
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/rules
@@ -0,0 +1,165 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+include /usr/share/dpatch/dpatch.make
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+export QTDIR=/usr/share/qt3
+export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++
+
+CXXFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CXXFLAGS += -O0
+else
+	CXXFLAGS += -O2
+endif
+
+PYTHONS := $(shell pyversions -vr debian/control)
+DBG_PYTHONS := $(shell pyversions -vd)
+
+GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
+ifneq (,$(filter $(GCCVER),4.2 4.3))
+        SPLIT=20
+else
+        SPLIT=4
+endif
+
+.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
+
+configure: $(PYTHONS:%=build-%/configure-stamp) $(DBG_PYTHONS:%=dbg-build-%/configure-stamp)
+
+build-%/configure-stamp: patch-stamp
+	dh_testdir
+	mkdir -p build-$*
+	cd build-$* && python$* ../configure.py \
+		-c -u -k /opt/trinity -o /opt/trinity/include/kde -n /opt/trinity/lib \
+		-v /opt/trinity/share/sip/trinity -j $(SPLIT)
+	touch $@
+
+dbg-build-%/configure-stamp: patch-stamp
+	dh_testdir
+	mkdir -p dbg-build-$*
+	cd dbg-build-$* && python$*-dbg ../configure.py \
+		-c -u -k /opt/trinity -o /opt/trinity/include/kde -n /opt/trinity/lib \
+		-v /opt/trinity/share/sip/trinity -j $(SPLIT)
+	touch $@
+
+build: $(PYTHONS:%=build-%/build-stamp) $(DBG_PYTHONS:%=dbg-build-%/build-stamp)
+
+build-%/build-stamp: build-%/configure-stamp
+	dh_testdir
+	$(MAKE) -C build-$*
+	touch $@
+
+dbg-build-%/build-stamp: dbg-build-%/configure-stamp
+	dh_testdir
+	$(MAKE) -C dbg-build-$*
+	touch $@
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f *-stamp
+	rm -rf $(PYTHONS:%=build-%) $(DBG_PYTHONS:%=dbg-build-%)
+
+#	remove autogenerated *mod.sip files and clean up sources
+	for moddir in sip/*;\
+	do\
+		if [ -d $$moddir ]; then\
+			rm -f $$moddir/` basename $${moddir}`mod.sip;\
+		fi;\
+	done
+	dh_clean
+
+install: install-indep install-arch
+
+install-indep:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -i 
+	dh_installdirs -i
+	dh_install -i -X'\.diff$$' -X'\.in$$' -X'\.html$$'
+	for version in ${PYTHONS};\
+	do\
+		mkdir -p debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages;\
+		cp debian/pykdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/;\
+		cp build-$$version/pykdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pykdeconfig_nd.py;\
+	done
+	for version in ${DBG_PYTHONS};\
+	do\
+		cp dbg-build-$$version/pykdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pykdeconfig_d.py;\
+	done
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -a 
+	dh_installdirs -a
+	set -e; \
+	for version in ${PYTHONS};\
+	do\
+		$(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
+	done
+
+	set -e; \
+        for version in ${DBG_PYTHONS}; do \
+		$(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-trinity-trinity-dbg;\
+        done
+
+	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
+
+	mkdir -p $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/
+	ln -s /opt/trinity/lib/kde3/libkonsolepart.so $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/
+	for i in $$(find debian/python-*-dbg -name '*.so'); do \
+	  b=$$(basename $$i .so); \
+	  mv $$i $$(dirname $$i)/$${b}_d.so; \
+	done
+	find debian/python-*-dbg ! -type d \
+		! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+
+	find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
+
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs -A THANKS
+	dh_installexamples
+	dh_link
+ifeq (,$(findstring -i, $(DH_OPTIONS)))
+	DH_OPTIONS= dh_strip -ppython-trinity-trinity #--dbg-package=python-trinity-trinity-dbg
+endif
+	dh_compress -X.py -X.ui -X.dtd
+	dh_fixperms
+	DH_PYCENTRAL=nomove dh_pycentral
+	dh_installdeb
+	dh_shlibdeps -l /opt/trinity/lib
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/watch b/ubuntu/maverick/libraries/python-trinity/debian/watch
new file mode 100644
index 000000000..26518db46
--- /dev/null
+++ b/ubuntu/maverick/libraries/python-trinity/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+http://www.riverbankcomputing.com/Downloads/PyKDE3/PyKDE-(.*)\.tar\.bz2