Rename pykde to pytde in Ubuntu and Debian

13 years ago · de77ae6a46
parent 32e556c5c8
commit de77ae6a46
129 changed files with 351 additions and 351 deletions
--- a/debian/lenny/applications/tde-guidance/debian/changelog
+++ b/debian/lenny/applications/tde-guidance/debian/changelog
@ -229,7 +229,7 @@ tde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low
 tde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low

  * Add Add kubuntu_09_mountconfig_no_extensions.patch to remove uneeded call
-    to pykdeextensions in mountconfig so that pyqt3 no longer needs to be
+    to pytdeextensions in mountconfig so that pyqt3 no longer needs to be
    patched to provide -dev files in the regular package (LP: #197867)
  * Add kubuntu_10_displayconfig_tryagain.patch so that if displayconfig
    thinks a proprietary driver is installed, but it can't find it, it 
@ -618,7 +618,7 @@ tde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low

 tde-guidance (0.7.1~svn20061124-0ubuntu2) feisty; urgency=low

-  * Rebuilt against new pykde.
+  * Rebuilt against new pytde.

 -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 06 Dec 2006 23:40:32 +0100

@ -1029,7 +1029,7 @@ tde-guidance (0.6.2-0ubuntu1) dapper; urgency=low
 tde-guidance (0.6.1-0ubuntu0) dapper; urgency=low

  * New release, sets a fixed DPI for Xft
-  * Add run time dependency on pykdeextensions
+  * Add run time dependency on pytdeextensions
  * Add kubuntu_03_userconfig_shebang.diff fix extra space
  * Change init script to run at S35, Malone No. 32268

--- a/debian/lenny/applications/tde-guidance/debian/control
+++ b/debian/lenny/applications/tde-guidance/debian/control
@ -6,13 +6,13 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), chrpath, tdelibs4-trinity-dev,
 libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
- pykdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
+ pytdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
 python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata
 Standards-Version: 3.8.4

 Package: tde-guidance-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Conflicts: guidance-power-manager, tde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of KDE system administration tools for GNU/Linux [Trinity]
--- a/debian/lenny/applications/tde-guidance/debian/rules
+++ b/debian/lenny/applications/tde-guidance/debian/rules
@ -175,7 +175,7 @@ clean::
 	fi

 common-install-prehook-impl::
-	# generate form implementation using pykde user interface compiler
+	# generate form implementation using pytde user interface compiler
 	(cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui)
 	(cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n tooltip.ui)
 	(cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n notify.ui)
--- a/debian/lenny/dependencies/qt3/debian/changelog
+++ b/debian/lenny/dependencies/qt3/debian/changelog
@ -499,7 +499,7 @@ qt-x11-free (3:3.3.7-1ubuntu3) feisty; urgency=low
 qt-x11-free (3:3.3.7-1ubuntu2) feisty; urgency=low

  * Remove kubuntu_05_gcc_hidden_visibility.dpatch from 00list
-    of patches, it caused pyqt and pykde to hide init methods which
+    of patches, it caused pyqt and pytde to hide init methods which
    are needed to load modules and it broke skim.

 -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  4 Dec 2006 13:48:56 +0000
--- a/debian/lenny/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
+++ b/debian/lenny/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
@ -1,7 +0,0 @@
-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
--- a/debian/lenny/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
+++ b/debian/lenny/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
@ -1,10 +0,0 @@
-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
--- a/debian/lenny/libraries/pytdeextensions/debian/README.Debian
+++ b/debian/lenny/libraries/pytdeextensions/debian/README.Debian
--- a/debian/lenny/libraries/pytdeextensions/debian/changelog
+++ b/debian/lenny/libraries/pytdeextensions/debian/changelog
@ -1,23 +1,23 @@
-pykdeextensions-trinity (0.4.0-6ubuntu6) karmic; urgency=low
+pytdeextensions-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
+pytdeextensions-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
+pytdeextensions (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
+pytdeextensions (0.4.0-5ubuntu2) hardy; urgency=low

  * debian/control:
    - remove the python-all-dev dependency in libpythonize0
@ -26,14 +26,14 @@ pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low

 -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 17 Dec 2007 12:38:49 +0100

-pykdeextensions (0.4.0-5ubuntu1) hardy; urgency=low
+pytdeextensions (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
+pytdeextensions (0.4.0-5) unstable; urgency=low

  * Add python-qt-dev build dependency.
    pyqtconfig moved from python-qt3 to python-qt-dev. (Closes: #439504)
@ -44,17 +44,17 @@ pykdeextensions (0.4.0-5) unstable; urgency=low
  * Remove *.py[co] files.
  * lintian cleanup: substvar-source-version-is-deprecated.
    Use ${binary:Version}.
-  * Make pykdeextensions package arch all.
+  * Make pytdeextensions package arch all.

 -- Fathi Boudra <fboudra@free.fr>  Sun, 07 Oct 2007 12:06:15 +0200

-pykdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low
+pytdeextensions (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
+pytdeextensions (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, 
@ -62,7 +62,7 @@ pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low

 -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Sep 2007 16:32:17 +0100

-pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low
+pytdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low

  * Fix build failure, build-depend on python-qt-dev.
  * Use the unversioned python interpreter for scripts.
@ -71,14 +71,14 @@ pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low

 -- Matthias Klose <doko@ubuntu.com>  Wed, 29 Aug 2007 20:48:25 +0000

-pykdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low
+pytdeextensions (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
+pytdeextensions (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.
@ -86,7 +86,7 @@ pykdeextensions (0.4.0-4) unstable; urgency=low

 -- Fathi Boudra <fboudra@free.fr>  Wed, 16 May 2007 11:02:06 +0200

-pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low
+pytdeextensions (0.4.0-3ubuntu1) feisty; urgency=low

  * Force to build with python2.5.
  * FIXME: The package is unlikely to work with python2.4; maybe
@ -94,20 +94,20 @@ pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low

 -- Matthias Klose <doko@ubuntu.com>  Sun, 14 Jan 2007 16:42:27 +0000

-pykdeextensions (0.4.0-3) unstable; urgency=low
+pytdeextensions (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,
    tdelibs4c2a (for kde-config)
-  * Updated libpythonize0-dev, libpythonize0, and pykdextensions install files
+  * Updated libpythonize0-dev, libpythonize0, and pytdextensions 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
+pytdeextensions (0.4.0-2) unstable; urgency=low

  * Converted package to cdbs
  * Added 2 patches (thanks to Jonathan Riddell)
@ -118,7 +118,7 @@ pykdeextensions (0.4.0-2) unstable; urgency=low

 -- Fathi Boudra <fboudra@free.fr>  Tue,  6 Jun 2006 08:56:40 +0200

-pykdeextensions (0.4.0-1) unstable; urgency=low
+pytdeextensions (0.4.0-1) unstable; urgency=low

  [ Fathi Boudra ]
  * Initial Debian release Closes: #340141
--- a/debian/lenny/libraries/pytdeextensions/debian/compat
+++ b/debian/lenny/libraries/pytdeextensions/debian/compat
--- a/debian/squeeze/libraries/pykdeextensions/debian/control
+++ b/debian/squeeze/libraries/pykdeextensions/debian/control
@ -1,4 +1,4 @@
-Source: pykdeextensions-trinity
+Source: pytdeextensions-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@ -8,16 +8,16 @@ Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libt
 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
+Package: pytdeextensions-trinity
 Architecture: all
 Depends: ${python:Depends}
-Conflicts: pykdeextensions
+Conflicts: pytdeextensions
 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
+  Homepage: http://www.simonzone.com/software/pytdeextensions

 Package: libpythonize0-trinity-dev
 Architecture: any
@ -29,7 +29,7 @@ Description: Python packages to support KDE applications (development) [Trinity]
 .
 This package contains the libpythonize development files.
 .
-  Homepage: http://www.simonzone.com/software/pykdeextensions
+  Homepage: http://www.simonzone.com/software/pytdeextensions

 Package: libpythonize0-trinity
 Architecture: any
@ -42,4 +42,4 @@ Description: Python packages to support KDE applications (library) [Trinity]
 .
 This package contains the libpythonize library files.
 .
-  Homepage: http://www.simonzone.com/software/pykdeextensions
+  Homepage: http://www.simonzone.com/software/pytdeextensions
--- a/debian/squeeze/libraries/pykdeextensions/debian/copyright
+++ b/debian/squeeze/libraries/pykdeextensions/debian/copyright
@ -1,9 +1,9 @@
 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>
+It was downloaded from <http://www.simonzone.com/software/pytdeextensions>

-Application templates and pykde helper modules copyright:
+Application templates and pytde helper modules copyright:
   Simon Edwards <simon@simonzone.com>

 License:
--- a/debian/lenny/libraries/pytdeextensions/debian/docs
+++ b/debian/lenny/libraries/pytdeextensions/debian/docs
--- a/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
--- a/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity.install
+++ b/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity.install
--- a/debian/lenny/libraries/pytdeextensions/debian/patches/.gitignore
+++ b/debian/lenny/libraries/pytdeextensions/debian/patches/.gitignore
--- a/debian/lenny/libraries/pytdeextensions/debian/pycompat
+++ b/debian/lenny/libraries/pytdeextensions/debian/pycompat
--- a/debian/lenny/libraries/pytdeextensions/debian/pytdeextensions-trinity.install
+++ b/debian/lenny/libraries/pytdeextensions/debian/pytdeextensions-trinity.install
@ -0,0 +1,7 @@
+usr/lib/python*/dist-packages
+opt/trinity/share/apps/pytdeextensions/AUTHORS
+opt/trinity/share/apps/pytdeextensions/ChangeLog
+opt/trinity/share/apps/pytdeextensions/INSTALL
+opt/trinity/share/apps/pytdeextensions/NEWS
+opt/trinity/share/apps/pytdeextensions/app_templates
+opt/trinity/share/doc/kde/HTML/en/pytdeextensions
--- a/debian/lenny/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
+++ b/debian/lenny/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
@ -0,0 +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 kcmshell
+pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions: desktop-entry-invalid-category X-KDE-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: 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
--- a/debian/lenny/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ b/debian/lenny/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
--- a/debian/lenny/libraries/pytdeextensions/debian/pyversions
+++ b/debian/lenny/libraries/pytdeextensions/debian/pyversions
--- a/debian/squeeze/libraries/pykdeextensions/debian/rules
+++ b/debian/squeeze/libraries/pykdeextensions/debian/rules
@ -18,14 +18,14 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 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::
+install/pytdeextensions-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
+	install -D -p -m0644 debian/pytdeextensions-trinity.lintian-overrides \
+	  debian/pytdeextensions-trinity/usr/share/lintian/overrides/pytdeextensions-trinity

 	# fix script-not-executable
 	find debian -type f -name '*.py' | xargs chmod 0755
--- a/debian/lenny/libraries/python-trinity/debian/changelog
+++ b/debian/lenny/libraries/python-trinity/debian/changelog
@ -320,7 +320,7 @@ python-trinity (3.11.3+20050829-1) unstable; urgency=low
  * 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
+  * pytdeconfig.py now also knows that the sip files
    are in /usr/share/sip/trinity, not in /usr/share/sip/kde
    (Closes: #312708)

--- a/debian/lenny/libraries/python-trinity/debian/control
+++ b/debian/lenny/libraries/python-trinity/debian/control
@ -6,7 +6,7 @@ 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
 Standards-Version: 3.8.4
-Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
+Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
 XS-Python-Version: all

 Package: python-trinity-trinity
--- a/debian/lenny/libraries/python-trinity/debian/pytdeconfig.py
+++ b/debian/lenny/libraries/python-trinity/debian/pytdeconfig.py
@ -4,8 +4,8 @@ import sys

 if getattr(sys, "pydebug", False):
    try:
-        from pykdeconfig_d import *
+        from pytdeconfig_d import *
    except ImportError, msg:
-        raise ImportError, 'No module named pykdeconfig; package python-trinity-dbg not installed'
+        raise ImportError, 'No module named pytdeconfig; package python-trinity-dbg not installed'
 else:
-    from pykdeconfig_nd import *
+    from pytdeconfig_nd import *
--- a/debian/lenny/libraries/python-trinity/debian/rules
+++ b/debian/lenny/libraries/python-trinity/debian/rules
@ -93,12 +93,12 @@ install-indep:
 	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;\
+		cp debian/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/;\
+		cp build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_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;\
+		cp dbg-build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_d.py;\
 	done

 install-arch:
--- a/debian/lenny/tdebindings/debian/changelog
+++ b/debian/lenny/tdebindings/debian/changelog
@ -483,7 +483,7 @@ tdebindings (4:3.2.92-1) unstable; urgency=low
    was accepted upstream.
  * debian/libkjsembed1.install: install the qprocess kjsembed plugin.
  * debian/rules: disable the python directory, as sip, pyqt and
-    pykde are all packaged in Debian already.
+    pytde are all packaged in Debian already.
  * debian/control: added the libsmokekde1, libsmokekde-dev,
    libkorundum-ruby1.8 and libqtruby-ruby1.8 packages because of upstream
    additions.
--- a/debian/squeeze/applications/tde-guidance/debian/changelog
+++ b/debian/squeeze/applications/tde-guidance/debian/changelog
@ -229,7 +229,7 @@ tde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low
 tde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low

  * Add Add kubuntu_09_mountconfig_no_extensions.patch to remove uneeded call
-    to pykdeextensions in mountconfig so that pyqt3 no longer needs to be
+    to pytdeextensions in mountconfig so that pyqt3 no longer needs to be
    patched to provide -dev files in the regular package (LP: #197867)
  * Add kubuntu_10_displayconfig_tryagain.patch so that if displayconfig
    thinks a proprietary driver is installed, but it can't find it, it 
@ -618,7 +618,7 @@ tde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low

 tde-guidance (0.7.1~svn20061124-0ubuntu2) feisty; urgency=low

-  * Rebuilt against new pykde.
+  * Rebuilt against new pytde.

 -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 06 Dec 2006 23:40:32 +0100

@ -1029,7 +1029,7 @@ tde-guidance (0.6.2-0ubuntu1) dapper; urgency=low
 tde-guidance (0.6.1-0ubuntu0) dapper; urgency=low

  * New release, sets a fixed DPI for Xft
-  * Add run time dependency on pykdeextensions
+  * Add run time dependency on pytdeextensions
  * Add kubuntu_03_userconfig_shebang.diff fix extra space
  * Change init script to run at S35, Malone No. 32268

--- a/debian/squeeze/applications/tde-guidance/debian/control
+++ b/debian/squeeze/applications/tde-guidance/debian/control
@ -6,13 +6,13 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), chrpath, tdelibs4-trinity-dev,
 libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
- pykdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
+ pytdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
 python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata
 Standards-Version: 3.8.4

 Package: tde-guidance-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Conflicts: guidance-power-manager, tde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of KDE system administration tools for GNU/Linux [Trinity]
--- a/debian/squeeze/applications/tde-guidance/debian/rules
+++ b/debian/squeeze/applications/tde-guidance/debian/rules
@ -175,7 +175,7 @@ clean::
 	fi

 common-install-prehook-impl::
-	# generate form implementation using pykde user interface compiler
+	# generate form implementation using pytde user interface compiler
 	(cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui)
 	(cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n tooltip.ui)
 	(cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n notify.ui)
--- a/debian/squeeze/dependencies/qt3/debian/changelog
+++ b/debian/squeeze/dependencies/qt3/debian/changelog
@ -499,7 +499,7 @@ qt-x11-free (3:3.3.7-1ubuntu3) feisty; urgency=low
 qt-x11-free (3:3.3.7-1ubuntu2) feisty; urgency=low

  * Remove kubuntu_05_gcc_hidden_visibility.dpatch from 00list
-    of patches, it caused pyqt and pykde to hide init methods which
+    of patches, it caused pyqt and pytde to hide init methods which
    are needed to load modules and it broke skim.

 -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  4 Dec 2006 13:48:56 +0000
--- a/debian/squeeze/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
+++ b/debian/squeeze/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
@ -1,7 +0,0 @@
-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
--- a/debian/squeeze/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
+++ b/debian/squeeze/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
@ -1,10 +0,0 @@
-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
--- a/debian/squeeze/libraries/pytdeextensions/debian/README.Debian
+++ b/debian/squeeze/libraries/pytdeextensions/debian/README.Debian
--- a/debian/squeeze/libraries/pytdeextensions/debian/changelog
+++ b/debian/squeeze/libraries/pytdeextensions/debian/changelog
@ -1,23 +1,23 @@
-pykdeextensions-trinity (0.4.0-6ubuntu6) karmic; urgency=low
+pytdeextensions-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
+pytdeextensions-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
+pytdeextensions (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
+pytdeextensions (0.4.0-5ubuntu2) hardy; urgency=low

  * debian/control:
    - remove the python-all-dev dependency in libpythonize0
@ -26,14 +26,14 @@ pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low

 -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 17 Dec 2007 12:38:49 +0100

-pykdeextensions (0.4.0-5ubuntu1) hardy; urgency=low
+pytdeextensions (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
+pytdeextensions (0.4.0-5) unstable; urgency=low

  * Add python-qt-dev build dependency.
    pyqtconfig moved from python-qt3 to python-qt-dev. (Closes: #439504)
@ -44,17 +44,17 @@ pykdeextensions (0.4.0-5) unstable; urgency=low
  * Remove *.py[co] files.
  * lintian cleanup: substvar-source-version-is-deprecated.
    Use ${binary:Version}.
-  * Make pykdeextensions package arch all.
+  * Make pytdeextensions package arch all.

 -- Fathi Boudra <fboudra@free.fr>  Sun, 07 Oct 2007 12:06:15 +0200

-pykdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low
+pytdeextensions (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
+pytdeextensions (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, 
@ -62,7 +62,7 @@ pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low

 -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Sep 2007 16:32:17 +0100

-pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low
+pytdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low

  * Fix build failure, build-depend on python-qt-dev.
  * Use the unversioned python interpreter for scripts.
@ -71,14 +71,14 @@ pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low

 -- Matthias Klose <doko@ubuntu.com>  Wed, 29 Aug 2007 20:48:25 +0000

-pykdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low
+pytdeextensions (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
+pytdeextensions (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.
@ -86,7 +86,7 @@ pykdeextensions (0.4.0-4) unstable; urgency=low

 -- Fathi Boudra <fboudra@free.fr>  Wed, 16 May 2007 11:02:06 +0200

-pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low
+pytdeextensions (0.4.0-3ubuntu1) feisty; urgency=low

  * Force to build with python2.5.
  * FIXME: The package is unlikely to work with python2.4; maybe
@ -94,20 +94,20 @@ pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low

 -- Matthias Klose <doko@ubuntu.com>  Sun, 14 Jan 2007 16:42:27 +0000

-pykdeextensions (0.4.0-3) unstable; urgency=low
+pytdeextensions (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,
    tdelibs4c2a (for kde-config)
-  * Updated libpythonize0-dev, libpythonize0, and pykdextensions install files
+  * Updated libpythonize0-dev, libpythonize0, and pytdextensions 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
+pytdeextensions (0.4.0-2) unstable; urgency=low

  * Converted package to cdbs
  * Added 2 patches (thanks to Jonathan Riddell)
@ -118,7 +118,7 @@ pykdeextensions (0.4.0-2) unstable; urgency=low

 -- Fathi Boudra <fboudra@free.fr>  Tue,  6 Jun 2006 08:56:40 +0200

-pykdeextensions (0.4.0-1) unstable; urgency=low
+pytdeextensions (0.4.0-1) unstable; urgency=low

  [ Fathi Boudra ]
  * Initial Debian release Closes: #340141
--- a/debian/squeeze/libraries/pytdeextensions/debian/compat
+++ b/debian/squeeze/libraries/pytdeextensions/debian/compat
--- a/debian/squeeze/libraries/pytdeextensions/debian/control
+++ b/debian/squeeze/libraries/pytdeextensions/debian/control
@ -1,4 +1,4 @@
-Source: pykdeextensions-trinity
+Source: pytdeextensions-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@ -8,16 +8,16 @@ Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libt
 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
+Package: pytdeextensions-trinity
 Architecture: all
 Depends: ${python:Depends}
-Conflicts: pykdeextensions
+Conflicts: pytdeextensions
 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
+  Homepage: http://www.simonzone.com/software/pytdeextensions

 Package: libpythonize0-trinity-dev
 Architecture: any
@ -29,7 +29,7 @@ Description: Python packages to support KDE applications (development) [Trinity]
 .
 This package contains the libpythonize development files.
 .
-  Homepage: http://www.simonzone.com/software/pykdeextensions
+  Homepage: http://www.simonzone.com/software/pytdeextensions

 Package: libpythonize0-trinity
 Architecture: any
@ -42,4 +42,4 @@ Description: Python packages to support KDE applications (library) [Trinity]
 .
 This package contains the libpythonize library files.
 .
-  Homepage: http://www.simonzone.com/software/pykdeextensions
+  Homepage: http://www.simonzone.com/software/pytdeextensions
--- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/copyright
+++ b/ubuntu/lucid_automake/libraries/pykdeextensions/debian/copyright
@ -1,9 +1,9 @@
 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>
+It was downloaded from <http://www.simonzone.com/software/pytdeextensions>

-Application templates and pykde helper modules copyright:
+Application templates and pytde helper modules copyright:
   Simon Edwards <simon@simonzone.com>

 License:
--- a/debian/squeeze/libraries/pytdeextensions/debian/docs
+++ b/debian/squeeze/libraries/pytdeextensions/debian/docs
--- a/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
--- a/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity.install
+++ b/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity.install
--- a/debian/squeeze/libraries/pytdeextensions/debian/patches/.gitignore
+++ b/debian/squeeze/libraries/pytdeextensions/debian/patches/.gitignore
--- a/debian/squeeze/libraries/pytdeextensions/debian/pycompat
+++ b/debian/squeeze/libraries/pytdeextensions/debian/pycompat
--- a/debian/squeeze/libraries/pytdeextensions/debian/pytdeextensions-trinity.install
+++ b/debian/squeeze/libraries/pytdeextensions/debian/pytdeextensions-trinity.install
@ -0,0 +1,7 @@
+usr/lib/python*/dist-packages
+opt/trinity/share/apps/pytdeextensions/AUTHORS
+opt/trinity/share/apps/pytdeextensions/ChangeLog
+opt/trinity/share/apps/pytdeextensions/INSTALL
+opt/trinity/share/apps/pytdeextensions/NEWS
+opt/trinity/share/apps/pytdeextensions/app_templates
+opt/trinity/share/doc/kde/HTML/en/pytdeextensions
--- a/debian/squeeze/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
+++ b/debian/squeeze/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
@ -0,0 +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 kcmshell
+pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions: desktop-entry-invalid-category X-KDE-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: 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
--- a/debian/squeeze/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ b/debian/squeeze/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
--- a/debian/squeeze/libraries/pytdeextensions/debian/pyversions
+++ b/debian/squeeze/libraries/pytdeextensions/debian/pyversions
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/rules
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/rules
@ -18,14 +18,14 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 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::
+install/pytdeextensions-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
+	install -D -p -m0644 debian/pytdeextensions-trinity.lintian-overrides \
+	  debian/pytdeextensions-trinity/usr/share/lintian/overrides/pytdeextensions-trinity

 	# fix script-not-executable
 	find debian -type f -name '*.py' | xargs chmod 0755
--- a/debian/squeeze/libraries/python-trinity/debian/changelog
+++ b/debian/squeeze/libraries/python-trinity/debian/changelog
@ -320,7 +320,7 @@ python-trinity (3.11.3+20050829-1) unstable; urgency=low
  * 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
+  * pytdeconfig.py now also knows that the sip files
    are in /usr/share/sip/trinity, not in /usr/share/sip/kde
    (Closes: #312708)

--- a/debian/squeeze/libraries/python-trinity/debian/control
+++ b/debian/squeeze/libraries/python-trinity/debian/control
@ -6,7 +6,7 @@ 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
 Standards-Version: 3.8.4
-Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
+Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
 XS-Python-Version: all

 Package: python-trinity-trinity
--- a/debian/squeeze/libraries/python-trinity/debian/pytdeconfig.py
+++ b/debian/squeeze/libraries/python-trinity/debian/pytdeconfig.py
@ -4,8 +4,8 @@ import sys

 if getattr(sys, "pydebug", False):
    try:
-        from pykdeconfig_d import *
+        from pytdeconfig_d import *
    except ImportError, msg:
-        raise ImportError, 'No module named pykdeconfig; package python-trinity-dbg not installed'
+        raise ImportError, 'No module named pytdeconfig; package python-trinity-dbg not installed'
 else:
-    from pykdeconfig_nd import *
+    from pytdeconfig_nd import *
--- a/debian/squeeze/libraries/python-trinity/debian/rules
+++ b/debian/squeeze/libraries/python-trinity/debian/rules
@ -93,12 +93,12 @@ install-indep:
 	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;\
+		cp debian/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/;\
+		cp build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_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;\
+		cp dbg-build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_d.py;\
 	done

 install-arch:
--- a/debian/squeeze/tdebindings/debian/changelog
+++ b/debian/squeeze/tdebindings/debian/changelog
@ -483,7 +483,7 @@ tdebindings (4:3.2.92-1) unstable; urgency=low
    was accepted upstream.
  * debian/libkjsembed1.install: install the qprocess kjsembed plugin.
  * debian/rules: disable the python directory, as sip, pyqt and
-    pykde are all packaged in Debian already.
+    pytde are all packaged in Debian already.
  * debian/control: added the libsmokekde1, libsmokekde-dev,
    libkorundum-ruby1.8 and libqtruby-ruby1.8 packages because of upstream
    additions.
--- a/ubuntu/lucid_automake/applications/kde-guidance/debian/changelog
+++ b/ubuntu/lucid_automake/applications/kde-guidance/debian/changelog
@ -229,7 +229,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low
 kde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low

  * Add Add kubuntu_09_mountconfig_no_extensions.patch to remove uneeded call
-    to pykdeextensions in mountconfig so that pyqt3 no longer needs to be
+    to pytdeextensions in mountconfig so that pyqt3 no longer needs to be
    patched to provide -dev files in the regular package (LP: #197867)
  * Add kubuntu_10_displayconfig_tryagain.patch so that if displayconfig
    thinks a proprietary driver is installed, but it can't find it, it 
@ -618,7 +618,7 @@ kde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low

 kde-guidance (0.7.1~svn20061124-0ubuntu2) feisty; urgency=low

-  * Rebuilt against new pykde.
+  * Rebuilt against new pytde.

 -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 06 Dec 2006 23:40:32 +0100

@ -1029,7 +1029,7 @@ kde-guidance (0.6.2-0ubuntu1) dapper; urgency=low
 kde-guidance (0.6.1-0ubuntu0) dapper; urgency=low

  * New release, sets a fixed DPI for Xft
-  * Add run time dependency on pykdeextensions
+  * Add run time dependency on pytdeextensions
  * Add kubuntu_03_userconfig_shebang.diff fix extra space
  * Change init script to run at S35, Malone No. 32268

--- a/ubuntu/lucid_automake/applications/kde-guidance/debian/control
+++ b/ubuntu/lucid_automake/applications/kde-guidance/debian/control
@ -6,13 +6,13 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), chrpath, kdelibs4-kde3-dev,
 libpythonize0-kde3-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
- pykdeextensions-kde3, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-kde3-kde3, python-kde3-kde3-dev, python-sip4-dev,
+ pytdeextensions-kde3, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-kde3-kde3, python-kde3-kde3-dev, python-sip4-dev,
 python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata
 Standards-Version: 3.8.3

 Package: kde-guidance-kde3
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions-kde3, python-kde3-kde3, sysv-rc, guidance-backends-kde3, hwdata, python (>= 2.5), python-dev (>= 2.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-kde3, python-kde3-kde3, sysv-rc, guidance-backends-kde3, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of KDE system administration tools for GNU/Linux [KDE3]
--- a/ubuntu/lucid_automake/applications/kde-guidance/debian/rules
+++ b/ubuntu/lucid_automake/applications/kde-guidance/debian/rules
@ -175,7 +175,7 @@ clean::
 	fi

 common-install-prehook-impl::
-	# generate form implementation using pykde user interface compiler
+	# generate form implementation using pytde user interface compiler
 	(cd powermanager; /opt/kde3/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui)
 	(cd powermanager; /opt/kde3/bin/kdepyuic --usekdei18n tooltip.ui)
 	(cd powermanager; /opt/kde3/bin/kdepyuic --usekdei18n notify.ui)
--- a/ubuntu/lucid_automake/kdebindings/debian/changelog
+++ b/ubuntu/lucid_automake/kdebindings/debian/changelog
@ -483,7 +483,7 @@ kdebindings (4:3.2.92-1) unstable; urgency=low
    was accepted upstream.
  * debian/libkjsembed1.install: install the qprocess kjsembed plugin.
  * debian/rules: disable the python directory, as sip, pyqt and
-    pykde are all packaged in Debian already.
+    pytde are all packaged in Debian already.
  * debian/control: added the libsmokekde1, libsmokekde-dev,
    libkorundum-ruby1.8 and libqtruby-ruby1.8 packages because of upstream
    additions.
--- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.install
+++ b/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.install
@ -1,7 +0,0 @@
-usr/lib/python*/dist-packages
-opt/kde3/share/apps/pykdeextensions/AUTHORS
-opt/kde3/share/apps/pykdeextensions/ChangeLog
-opt/kde3/share/apps/pykdeextensions/INSTALL
-opt/kde3/share/apps/pykdeextensions/NEWS
-opt/kde3/share/apps/pykdeextensions/app_templates
-opt/kde3/share/doc/kde/HTML/en/pykdeextensions
--- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.lintian-overrides
+++ b/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.lintian-overrides
@ -1,10 +0,0 @@
-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
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/README.Debian
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/README.Debian
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/changelog
+++ b/ubuntu/maverick_automake/libraries/pykdeextensions/debian/changelog
@ -1,23 +1,23 @@
-pykdeextensions-kde3 (0.4.0-6ubuntu6) karmic; urgency=low
+pytdeextensions-kde3 (0.4.0-6ubuntu6) karmic; urgency=low

  * Karmic rebuild

 -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600

-pykdeextensions-kde3 (0.4.0-5ubuntu5) intrepid; urgency=low
+pytdeextensions-kde3 (0.4.0-5ubuntu5) intrepid; urgency=low

  * Added -kde3 suffix

 -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 Dec 2008 21:38:00 -0600

-pykdeextensions (0.4.0-5ubuntu3) hardy; urgency=low
+pytdeextensions (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
+pytdeextensions (0.4.0-5ubuntu2) hardy; urgency=low

  * debian/control:
    - remove the python-all-dev dependency in libpythonize0
@ -26,14 +26,14 @@ pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low

 -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 17 Dec 2007 12:38:49 +0100

-pykdeextensions (0.4.0-5ubuntu1) hardy; urgency=low
+pytdeextensions (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
+pytdeextensions (0.4.0-5) unstable; urgency=low

  * Add python-qt-dev build dependency.
    pyqtconfig moved from python-qt3 to python-qt-dev. (Closes: #439504)
@ -44,17 +44,17 @@ pykdeextensions (0.4.0-5) unstable; urgency=low
  * Remove *.py[co] files.
  * lintian cleanup: substvar-source-version-is-deprecated.
    Use ${binary:Version}.
-  * Make pykdeextensions package arch all.
+  * Make pytdeextensions package arch all.

 -- Fathi Boudra <fboudra@free.fr>  Sun, 07 Oct 2007 12:06:15 +0200

-pykdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low
+pytdeextensions (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
+pytdeextensions (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, 
@ -62,7 +62,7 @@ pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low

 -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Sep 2007 16:32:17 +0100

-pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low
+pytdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low

  * Fix build failure, build-depend on python-qt-dev.
  * Use the unversioned python interpreter for scripts.
@ -71,14 +71,14 @@ pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low

 -- Matthias Klose <doko@ubuntu.com>  Wed, 29 Aug 2007 20:48:25 +0000

-pykdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low
+pytdeextensions (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
+pytdeextensions (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.
@ -86,7 +86,7 @@ pykdeextensions (0.4.0-4) unstable; urgency=low

 -- Fathi Boudra <fboudra@free.fr>  Wed, 16 May 2007 11:02:06 +0200

-pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low
+pytdeextensions (0.4.0-3ubuntu1) feisty; urgency=low

  * Force to build with python2.5.
  * FIXME: The package is unlikely to work with python2.4; maybe
@ -94,20 +94,20 @@ pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low

 -- Matthias Klose <doko@ubuntu.com>  Sun, 14 Jan 2007 16:42:27 +0000

-pykdeextensions (0.4.0-3) unstable; urgency=low
+pytdeextensions (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
+  * Updated libpythonize0-dev, libpythonize0, and pytdextensions 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
+pytdeextensions (0.4.0-2) unstable; urgency=low

  * Converted package to cdbs
  * Added 2 patches (thanks to Jonathan Riddell)
@ -118,7 +118,7 @@ pykdeextensions (0.4.0-2) unstable; urgency=low

 -- Fathi Boudra <fboudra@free.fr>  Tue,  6 Jun 2006 08:56:40 +0200

-pykdeextensions (0.4.0-1) unstable; urgency=low
+pytdeextensions (0.4.0-1) unstable; urgency=low

  [ Fathi Boudra ]
  * Initial Debian release Closes: #340141
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/compat
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/compat
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/control
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/control
@ -1,4 +1,4 @@
-Source: pykdeextensions-kde3
+Source: pytdeextensions-kde3
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@ -8,16 +8,16 @@ Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, kdelibs4c2a-kde3, libtool
 python-qt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5)
 Standards-Version: 3.8.3

-Package: pykdeextensions-kde3
+Package: pytdeextensions-kde3
 Architecture: all
 Depends: ${python:Depends}
-Conflicts: pykdeextensions
+Conflicts: pytdeextensions
 Provides: ${python:Provides}
 Description: Python packages to support KDE applications (scripts) [KDE3]
 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
+  Homepage: http://www.simonzone.com/software/pytdeextensions

 Package: libpythonize0-kde3-dev
 Architecture: any
@ -29,7 +29,7 @@ Description: Python packages to support KDE applications (development) [KDE3]
 .
 This package contains the libpythonize development files.
 .
-  Homepage: http://www.simonzone.com/software/pykdeextensions
+  Homepage: http://www.simonzone.com/software/pytdeextensions

 Package: libpythonize0-kde3
 Architecture: any
@ -42,4 +42,4 @@ Description: Python packages to support KDE applications (library) [KDE3]
 .
 This package contains the libpythonize library files.
 .
-  Homepage: http://www.simonzone.com/software/pykdeextensions
+  Homepage: http://www.simonzone.com/software/pytdeextensions
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/copyright
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/copyright
@ -1,9 +1,9 @@
 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>
+It was downloaded from <http://www.simonzone.com/software/pytdeextensions>

-Application templates and pykde helper modules copyright:
+Application templates and pytde helper modules copyright:
   Simon Edwards <simon@simonzone.com>

 License:
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/docs
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/docs
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3.install
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3.install
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/patches/.gitignore
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/patches/.gitignore
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pycompat
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pycompat
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.install
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.install
@ -0,0 +1,7 @@
+usr/lib/python*/dist-packages
+opt/kde3/share/apps/pytdeextensions/AUTHORS
+opt/kde3/share/apps/pytdeextensions/ChangeLog
+opt/kde3/share/apps/pytdeextensions/INSTALL
+opt/kde3/share/apps/pytdeextensions/NEWS
+opt/kde3/share/apps/pytdeextensions/app_templates
+opt/kde3/share/doc/kde/HTML/en/pytdeextensions
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.lintian-overrides
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.lintian-overrides
@ -0,0 +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 kcmshell
+pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions: desktop-entry-invalid-category X-KDE-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: 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
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pyversions
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pyversions
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/rules
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/rules
@ -18,14 +18,14 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde

-install/pykdeextensions-kde3::
+install/pytdeextensions-kde3::
 	# 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-kde3.lintian-overrides \
-	  debian/pykdeextensions-kde3/usr/share/lintian/overrides/pykdeextensions-kde3
+	install -D -p -m0644 debian/pytdeextensions-kde3.lintian-overrides \
+	  debian/pytdeextensions-kde3/usr/share/lintian/overrides/pytdeextensions-kde3

 	# fix script-not-executable
 	find debian -type f -name '*.py' | xargs chmod 0755
--- a/ubuntu/lucid_automake/libraries/python-kde3/debian/changelog
+++ b/ubuntu/lucid_automake/libraries/python-kde3/debian/changelog
@ -320,7 +320,7 @@ python-kde3 (3.11.3+20050829-1) unstable; urgency=low
  * Added the homepage of PyKDE to the package descriptions
  * HTML documentations is now installed into 
    /usr/share/doc/python-kde3-doc/html
-  * pykdeconfig.py now also knows that the sip files
+  * pytdeconfig.py now also knows that the sip files
    are in /usr/share/sip/kde3, not in /usr/share/sip/kde
    (Closes: #312708)

--- a/ubuntu/lucid_automake/libraries/python-kde3/debian/control
+++ b/ubuntu/lucid_automake/libraries/python-kde3/debian/control
@ -6,7 +6,7 @@ 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), libqt3-mt-dev (>= 3:3.3.7), qt3-dev-tools (>= 3:3.3.7), qt3-apps-dev (>= 3:3.3.7), python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-kde3-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
 Standards-Version: 3.8.3
-Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
+Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
 XS-Python-Version: all

 Package: python-kde3-kde3
--- a/ubuntu/maverick_automake/libraries/python-kde3/debian/pykdeconfig.py
+++ b/ubuntu/maverick_automake/libraries/python-kde3/debian/pykdeconfig.py
@ -4,8 +4,8 @@ import sys

 if getattr(sys, "pydebug", False):
    try:
-        from pykdeconfig_d import *
+        from pytdeconfig_d import *
    except ImportError, msg:
-        raise ImportError, 'No module named pykdeconfig; package python-kde3-dbg not installed'
+        raise ImportError, 'No module named pytdeconfig; package python-kde3-dbg not installed'
 else:
-    from pykdeconfig_nd import *
+    from pytdeconfig_nd import *
--- a/ubuntu/lucid_automake/libraries/python-kde3/debian/rules
+++ b/ubuntu/lucid_automake/libraries/python-kde3/debian/rules
@ -93,12 +93,12 @@ install-indep:
 	for version in ${PYTHONS};\
 	do\
 		mkdir -p debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages;\
-		cp debian/pykdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/;\
-		cp build-$$version/pykdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pykdeconfig_nd.py;\
+		cp debian/pytdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/;\
+		cp build-$$version/pytdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pytdeconfig_nd.py;\
 	done
 	for version in ${DBG_PYTHONS};\
 	do\
-		cp dbg-build-$$version/pykdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pykdeconfig_d.py;\
+		cp dbg-build-$$version/pytdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pytdeconfig_d.py;\
 	done

 install-arch:
--- a/ubuntu/maverick/applications/tde-guidance/debian/changelog
+++ b/ubuntu/maverick/applications/tde-guidance/debian/changelog
@ -229,7 +229,7 @@ tde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low
 tde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low

  * Add Add kubuntu_09_mountconfig_no_extensions.patch to remove uneeded call
-    to pykdeextensions in mountconfig so that pyqt3 no longer needs to be
+    to pytdeextensions in mountconfig so that pyqt3 no longer needs to be
    patched to provide -dev files in the regular package (LP: #197867)
  * Add kubuntu_10_displayconfig_tryagain.patch so that if displayconfig
    thinks a proprietary driver is installed, but it can't find it, it 
@ -618,7 +618,7 @@ tde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low

 tde-guidance (0.7.1~svn20061124-0ubuntu2) feisty; urgency=low

-  * Rebuilt against new pykde.
+  * Rebuilt against new pytde.

 -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 06 Dec 2006 23:40:32 +0100

@ -1029,7 +1029,7 @@ tde-guidance (0.6.2-0ubuntu1) dapper; urgency=low
 tde-guidance (0.6.1-0ubuntu0) dapper; urgency=low

  * New release, sets a fixed DPI for Xft
-  * Add run time dependency on pykdeextensions
+  * Add run time dependency on pytdeextensions
  * Add kubuntu_03_userconfig_shebang.diff fix extra space
  * Change init script to run at S35, Malone No. 32268

--- a/ubuntu/maverick/applications/tde-guidance/debian/control
+++ b/ubuntu/maverick/applications/tde-guidance/debian/control
@ -6,13 +6,13 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), chrpath, tdelibs4-trinity-dev,
 libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
- pykdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
+ pytdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
 python-support (>= 0.6), python2.6 (>= 2.5), python2.6-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata
 Standards-Version: 3.8.4

 Package: tde-guidance-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: tde-guidance-kde3 (<< 4:3.5.13)
 Breaks: tde-guidance-kde3 (<< 4:3.5.13)
 Conflicts: guidance-power-manager, tde-guidance-powermanager
--- a/ubuntu/maverick/applications/tde-guidance/debian/rules
+++ b/ubuntu/maverick/applications/tde-guidance/debian/rules
@ -175,7 +175,7 @@ clean::
 	fi

 common-install-prehook-impl::
-	# generate form implementation using pykde user interface compiler
+	# generate form implementation using pytde user interface compiler
 	(cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui)
 	(cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n tooltip.ui)
 	(cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n notify.ui)
--- a/ubuntu/maverick/dependencies/qt3/debian/changelog
+++ b/ubuntu/maverick/dependencies/qt3/debian/changelog
@ -499,7 +499,7 @@ qt-x11-free (3:3.3.7-1ubuntu3) feisty; urgency=low
 qt-x11-free (3:3.3.7-1ubuntu2) feisty; urgency=low

  * Remove kubuntu_05_gcc_hidden_visibility.dpatch from 00list
-    of patches, it caused pyqt and pykde to hide init methods which
+    of patches, it caused pyqt and pytde to hide init methods which
    are needed to load modules and it broke skim.

 -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  4 Dec 2006 13:48:56 +0000
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
@ -1,7 +0,0 @@
-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
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
@ -1,10 +0,0 @@
-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
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/README.Debian
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/README.Debian
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/changelog
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/changelog
@ -1,23 +1,23 @@
-pykdeextensions-trinity (0.4.0-6ubuntu6) karmic; urgency=low
+pytdeextensions-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
+pytdeextensions-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
+pytdeextensions (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
+pytdeextensions (0.4.0-5ubuntu2) hardy; urgency=low

  * debian/control:
    - remove the python-all-dev dependency in libpythonize0
@ -26,14 +26,14 @@ pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low

 -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 17 Dec 2007 12:38:49 +0100

-pykdeextensions (0.4.0-5ubuntu1) hardy; urgency=low
+pytdeextensions (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
+pytdeextensions (0.4.0-5) unstable; urgency=low

  * Add python-qt-dev build dependency.
    pyqtconfig moved from python-qt3 to python-qt-dev. (Closes: #439504)
@ -44,17 +44,17 @@ pykdeextensions (0.4.0-5) unstable; urgency=low
  * Remove *.py[co] files.
  * lintian cleanup: substvar-source-version-is-deprecated.
    Use ${binary:Version}.
-  * Make pykdeextensions package arch all.
+  * Make pytdeextensions package arch all.

 -- Fathi Boudra <fboudra@free.fr>  Sun, 07 Oct 2007 12:06:15 +0200

-pykdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low
+pytdeextensions (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
+pytdeextensions (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, 
@ -62,7 +62,7 @@ pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low

 -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Sep 2007 16:32:17 +0100

-pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low
+pytdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low

  * Fix build failure, build-depend on python-qt-dev.
  * Use the unversioned python interpreter for scripts.
@ -71,14 +71,14 @@ pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low

 -- Matthias Klose <doko@ubuntu.com>  Wed, 29 Aug 2007 20:48:25 +0000

-pykdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low
+pytdeextensions (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
+pytdeextensions (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.
@ -86,7 +86,7 @@ pykdeextensions (0.4.0-4) unstable; urgency=low

 -- Fathi Boudra <fboudra@free.fr>  Wed, 16 May 2007 11:02:06 +0200

-pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low
+pytdeextensions (0.4.0-3ubuntu1) feisty; urgency=low

  * Force to build with python2.5.
  * FIXME: The package is unlikely to work with python2.4; maybe
@ -94,20 +94,20 @@ pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low

 -- Matthias Klose <doko@ubuntu.com>  Sun, 14 Jan 2007 16:42:27 +0000

-pykdeextensions (0.4.0-3) unstable; urgency=low
+pytdeextensions (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,
    tdelibs4c2a (for kde-config)
-  * Updated libpythonize0-dev, libpythonize0, and pykdextensions install files
+  * Updated libpythonize0-dev, libpythonize0, and pytdextensions 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
+pytdeextensions (0.4.0-2) unstable; urgency=low

  * Converted package to cdbs
  * Added 2 patches (thanks to Jonathan Riddell)
@ -118,7 +118,7 @@ pykdeextensions (0.4.0-2) unstable; urgency=low

 -- Fathi Boudra <fboudra@free.fr>  Tue,  6 Jun 2006 08:56:40 +0200

-pykdeextensions (0.4.0-1) unstable; urgency=low
+pytdeextensions (0.4.0-1) unstable; urgency=low

  [ Fathi Boudra ]
  * Initial Debian release Closes: #340141
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/compat
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/compat
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/control
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/control
@ -1,4 +1,4 @@
-Source: pykdeextensions-trinity
+Source: pytdeextensions-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@ -8,18 +8,18 @@ Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libt
 python-qt-dev, python-sip4-dev, python-support (>= 0.6), python2.6, python2.6-dev
 Standards-Version: 3.8.4

-Package: pykdeextensions-trinity
+Package: pytdeextensions-trinity
 Architecture: all
 Depends: ${python:Depends}
-Replaces: pykdeextensions-kde3 (<< 4:3.5.13)
-Breaks: pykdeextensions-kde3 (<< 4:3.5.13)
-Conflicts: pykdeextensions
+Replaces: pytdeextensions-kde3 (<< 4:3.5.13)
+Breaks: pytdeextensions-kde3 (<< 4:3.5.13)
+Conflicts: pytdeextensions
 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
+  Homepage: http://www.simonzone.com/software/pytdeextensions

 Package: libpythonize0-trinity-dev
 Architecture: any
@ -33,7 +33,7 @@ Description: Python packages to support KDE applications (development) [Trinity]
 .
 This package contains the libpythonize development files.
 .
-  Homepage: http://www.simonzone.com/software/pykdeextensions
+  Homepage: http://www.simonzone.com/software/pytdeextensions

 Package: libpythonize0-trinity
 Architecture: any
@ -48,4 +48,4 @@ Description: Python packages to support KDE applications (library) [Trinity]
 .
 This package contains the libpythonize library files.
 .
-  Homepage: http://www.simonzone.com/software/pykdeextensions
+  Homepage: http://www.simonzone.com/software/pytdeextensions
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/copyright
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/copyright
@ -1,9 +1,9 @@
 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>
+It was downloaded from <http://www.simonzone.com/software/pytdeextensions>

-Application templates and pykde helper modules copyright:
+Application templates and pytde helper modules copyright:
   Simon Edwards <simon@simonzone.com>

 License:
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/docs
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/docs
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity.install
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity.install
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/patches/.gitignore
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/patches/.gitignore
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/pycompat
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pycompat
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install
@ -0,0 +1,7 @@
+usr/lib/python*/dist-packages
+opt/trinity/share/apps/pytdeextensions/AUTHORS
+opt/trinity/share/apps/pytdeextensions/ChangeLog
+opt/trinity/share/apps/pytdeextensions/INSTALL
+opt/trinity/share/apps/pytdeextensions/NEWS
+opt/trinity/share/apps/pytdeextensions/app_templates
+opt/trinity/share/doc/kde/HTML/en/pytdeextensions
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
@ -0,0 +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 kcmshell
+pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions: desktop-entry-invalid-category X-KDE-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: 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
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/pyversions
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pyversions
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/rules
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/rules
@ -18,14 +18,14 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 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::
+install/pytdeextensions-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
+	install -D -p -m0644 debian/pytdeextensions-trinity.lintian-overrides \
+	  debian/pytdeextensions-trinity/usr/share/lintian/overrides/pytdeextensions-trinity

 	# fix script-not-executable
 	find debian -type f -name '*.py' | xargs chmod 0755
--- a/ubuntu/maverick/libraries/python-trinity/debian/changelog
+++ b/ubuntu/maverick/libraries/python-trinity/debian/changelog
@ -320,7 +320,7 @@ python-trinity (3.11.3+20050829-1) unstable; urgency=low
  * 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
+  * pytdeconfig.py now also knows that the sip files
    are in /usr/share/sip/trinity, not in /usr/share/sip/kde
    (Closes: #312708)

--- a/ubuntu/maverick/libraries/python-trinity/debian/control
+++ b/ubuntu/maverick/libraries/python-trinity/debian/control
@ -6,7 +6,7 @@ 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
 Standards-Version: 3.8.4
-Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
+Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
 XS-Python-Version: all

 Package: python-trinity-trinity
--- a/ubuntu/maverick/libraries/python-trinity/debian/pytdeconfig.py
+++ b/ubuntu/maverick/libraries/python-trinity/debian/pytdeconfig.py
@ -4,8 +4,8 @@ import sys

 if getattr(sys, "pydebug", False):
    try:
-        from pykdeconfig_d import *
+        from pytdeconfig_d import *
    except ImportError, msg:
-        raise ImportError, 'No module named pykdeconfig; package python-trinity-dbg not installed'
+        raise ImportError, 'No module named pytdeconfig; package python-trinity-dbg not installed'
 else:
-    from pykdeconfig_nd import *
+    from pytdeconfig_nd import *
--- a/ubuntu/maverick/libraries/python-trinity/debian/rules
+++ b/ubuntu/maverick/libraries/python-trinity/debian/rules
@ -93,12 +93,12 @@ install-indep:
 	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;\
+		cp debian/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/;\
+		cp build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_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;\
+		cp dbg-build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_d.py;\
 	done

 install-arch:
--- a/ubuntu/maverick/tdebindings/debian/changelog
+++ b/ubuntu/maverick/tdebindings/debian/changelog
@ -483,7 +483,7 @@ tdebindings (4:3.2.92-1) unstable; urgency=low
    was accepted upstream.
  * debian/libkjsembed1.install: install the qprocess kjsembed plugin.
  * debian/rules: disable the python directory, as sip, pyqt and
-    pykde are all packaged in Debian already.
+    pytde are all packaged in Debian already.
  * debian/control: added the libsmokekde1, libsmokekde-dev,
    libkorundum-ruby1.8 and libqtruby-ruby1.8 packages because of upstream
    additions.
--- a/ubuntu/maverick_automake/applications/kde-guidance/debian/changelog
+++ b/ubuntu/maverick_automake/applications/kde-guidance/debian/changelog
@ -229,7 +229,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low
 kde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low

  * Add Add kubuntu_09_mountconfig_no_extensions.patch to remove uneeded call
-    to pykdeextensions in mountconfig so that pyqt3 no longer needs to be
+    to pytdeextensions in mountconfig so that pyqt3 no longer needs to be
    patched to provide -dev files in the regular package (LP: #197867)
  * Add kubuntu_10_displayconfig_tryagain.patch so that if displayconfig
    thinks a proprietary driver is installed, but it can't find it, it 
@ -618,7 +618,7 @@ kde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low

 kde-guidance (0.7.1~svn20061124-0ubuntu2) feisty; urgency=low

-  * Rebuilt against new pykde.
+  * Rebuilt against new pytde.

 -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 06 Dec 2006 23:40:32 +0100

@ -1029,7 +1029,7 @@ kde-guidance (0.6.2-0ubuntu1) dapper; urgency=low
 kde-guidance (0.6.1-0ubuntu0) dapper; urgency=low

  * New release, sets a fixed DPI for Xft
-  * Add run time dependency on pykdeextensions
+  * Add run time dependency on pytdeextensions
  * Add kubuntu_03_userconfig_shebang.diff fix extra space
  * Change init script to run at S35, Malone No. 32268

--- a/ubuntu/maverick_automake/applications/kde-guidance/debian/control
+++ b/ubuntu/maverick_automake/applications/kde-guidance/debian/control
@ -6,13 +6,13 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), chrpath, kdelibs4-kde3-dev,
 libpythonize0-kde3-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
- pykdeextensions-kde3, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-kde3-kde3, python-kde3-kde3-dev, python-sip4-dev,
+ pytdeextensions-kde3, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-kde3-kde3, python-kde3-kde3-dev, python-sip4-dev,
 python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata
 Standards-Version: 3.8.3

 Package: kde-guidance-kde3
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions-kde3, python-kde3-kde3, sysv-rc, guidance-backends-kde3, hwdata, python (>= 2.5), python-dev (>= 2.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-kde3, python-kde3-kde3, sysv-rc, guidance-backends-kde3, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of KDE system administration tools for GNU/Linux [KDE3]
--- a/ubuntu/maverick_automake/applications/kde-guidance/debian/rules
+++ b/ubuntu/maverick_automake/applications/kde-guidance/debian/rules
@ -175,7 +175,7 @@ clean::
 	fi

 common-install-prehook-impl::
-	# generate form implementation using pykde user interface compiler
+	# generate form implementation using pytde user interface compiler
 	(cd powermanager; /opt/kde3/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui)
 	(cd powermanager; /opt/kde3/bin/kdepyuic --usekdei18n tooltip.ui)
 	(cd powermanager; /opt/kde3/bin/kdepyuic --usekdei18n notify.ui)
--- a/ubuntu/maverick_automake/kdebindings/debian/changelog
+++ b/ubuntu/maverick_automake/kdebindings/debian/changelog
@ -483,7 +483,7 @@ kdebindings (4:3.2.92-1) unstable; urgency=low
    was accepted upstream.
  * debian/libkjsembed1.install: install the qprocess kjsembed plugin.
  * debian/rules: disable the python directory, as sip, pyqt and
-    pykde are all packaged in Debian already.
+    pytde are all packaged in Debian already.
  * debian/control: added the libsmokekde1, libsmokekde-dev,
    libkorundum-ruby1.8 and libqtruby-ruby1.8 packages because of upstream
    additions.
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/copyright
+++ b/ubuntu/maverick_automake/libraries/pykdeextensions/debian/copyright
@ -1,48 +0,0 @@
-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'.
-
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.install
+++ b/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.install
@ -1,7 +0,0 @@
-usr/lib/python*/dist-packages
-opt/kde3/share/apps/pykdeextensions/AUTHORS
-opt/kde3/share/apps/pykdeextensions/ChangeLog
-opt/kde3/share/apps/pykdeextensions/INSTALL
-opt/kde3/share/apps/pykdeextensions/NEWS
-opt/kde3/share/apps/pykdeextensions/app_templates
-opt/kde3/share/doc/kde/HTML/en/pykdeextensions
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.lintian-overrides
+++ b/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.lintian-overrides
@ -1,10 +0,0 @@
-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
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/README.Debian
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/README.Debian
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/changelog
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/changelog
@ -1,23 +1,23 @@
-pykdeextensions-kde3 (0.4.0-6ubuntu6) karmic; urgency=low
+pytdeextensions-kde3 (0.4.0-6ubuntu6) karmic; urgency=low

  * Karmic rebuild

 -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600

-pykdeextensions-kde3 (0.4.0-5ubuntu5) intrepid; urgency=low
+pytdeextensions-kde3 (0.4.0-5ubuntu5) intrepid; urgency=low

  * Added -kde3 suffix

 -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 Dec 2008 21:38:00 -0600

-pykdeextensions (0.4.0-5ubuntu3) hardy; urgency=low
+pytdeextensions (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
+pytdeextensions (0.4.0-5ubuntu2) hardy; urgency=low

  * debian/control:
    - remove the python-all-dev dependency in libpythonize0
@ -26,14 +26,14 @@ pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low

 -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 17 Dec 2007 12:38:49 +0100

-pykdeextensions (0.4.0-5ubuntu1) hardy; urgency=low
+pytdeextensions (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
+pytdeextensions (0.4.0-5) unstable; urgency=low

  * Add python-qt-dev build dependency.
    pyqtconfig moved from python-qt3 to python-qt-dev. (Closes: #439504)
@ -44,17 +44,17 @@ pykdeextensions (0.4.0-5) unstable; urgency=low
  * Remove *.py[co] files.
  * lintian cleanup: substvar-source-version-is-deprecated.
    Use ${binary:Version}.
-  * Make pykdeextensions package arch all.
+  * Make pytdeextensions package arch all.

 -- Fathi Boudra <fboudra@free.fr>  Sun, 07 Oct 2007 12:06:15 +0200

-pykdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low
+pytdeextensions (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
+pytdeextensions (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, 
@ -62,7 +62,7 @@ pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low

 -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Sep 2007 16:32:17 +0100

-pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low
+pytdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low

  * Fix build failure, build-depend on python-qt-dev.
  * Use the unversioned python interpreter for scripts.
@ -71,14 +71,14 @@ pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low

 -- Matthias Klose <doko@ubuntu.com>  Wed, 29 Aug 2007 20:48:25 +0000

-pykdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low
+pytdeextensions (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
+pytdeextensions (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.
@ -86,7 +86,7 @@ pykdeextensions (0.4.0-4) unstable; urgency=low

 -- Fathi Boudra <fboudra@free.fr>  Wed, 16 May 2007 11:02:06 +0200

-pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low
+pytdeextensions (0.4.0-3ubuntu1) feisty; urgency=low

  * Force to build with python2.5.
  * FIXME: The package is unlikely to work with python2.4; maybe
@ -94,20 +94,20 @@ pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low

 -- Matthias Klose <doko@ubuntu.com>  Sun, 14 Jan 2007 16:42:27 +0000

-pykdeextensions (0.4.0-3) unstable; urgency=low
+pytdeextensions (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
+  * Updated libpythonize0-dev, libpythonize0, and pytdextensions 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
+pytdeextensions (0.4.0-2) unstable; urgency=low

  * Converted package to cdbs
  * Added 2 patches (thanks to Jonathan Riddell)
@ -118,7 +118,7 @@ pykdeextensions (0.4.0-2) unstable; urgency=low

 -- Fathi Boudra <fboudra@free.fr>  Tue,  6 Jun 2006 08:56:40 +0200

-pykdeextensions (0.4.0-1) unstable; urgency=low
+pytdeextensions (0.4.0-1) unstable; urgency=low

  [ Fathi Boudra ]
  * Initial Debian release Closes: #340141
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/compat
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/compat
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/control
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/control
@ -1,4 +1,4 @@
-Source: pykdeextensions-kde3
+Source: pytdeextensions-kde3
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@ -8,16 +8,16 @@ Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, kdelibs4c2a-kde3, libtool
 python-qt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5)
 Standards-Version: 3.8.3

-Package: pykdeextensions-kde3
+Package: pytdeextensions-kde3
 Architecture: all
 Depends: ${python:Depends}
-Conflicts: pykdeextensions
+Conflicts: pytdeextensions
 Provides: ${python:Provides}
 Description: Python packages to support KDE applications (scripts) [KDE3]
 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
+  Homepage: http://www.simonzone.com/software/pytdeextensions

 Package: libpythonize0-kde3-dev
 Architecture: any
@ -29,7 +29,7 @@ Description: Python packages to support KDE applications (development) [KDE3]
 .
 This package contains the libpythonize development files.
 .
-  Homepage: http://www.simonzone.com/software/pykdeextensions
+  Homepage: http://www.simonzone.com/software/pytdeextensions

 Package: libpythonize0-kde3
 Architecture: any
@ -42,4 +42,4 @@ Description: Python packages to support KDE applications (library) [KDE3]
 .
 This package contains the libpythonize library files.
 .
-  Homepage: http://www.simonzone.com/software/pykdeextensions
+  Homepage: http://www.simonzone.com/software/pytdeextensions
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/copyright
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/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/pytdeextensions>
+
+Application templates and pytde 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'.
+
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/docs
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/docs
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3.install
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3.install
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/patches/.gitignore
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/patches/.gitignore
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pycompat
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pycompat
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.install
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.install
@ -0,0 +1,7 @@
+usr/lib/python*/dist-packages
+opt/kde3/share/apps/pytdeextensions/AUTHORS
+opt/kde3/share/apps/pytdeextensions/ChangeLog
+opt/kde3/share/apps/pytdeextensions/INSTALL
+opt/kde3/share/apps/pytdeextensions/NEWS
+opt/kde3/share/apps/pytdeextensions/app_templates
+opt/kde3/share/doc/kde/HTML/en/pytdeextensions
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.lintian-overrides
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.lintian-overrides
@ -0,0 +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 kcmshell
+pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions: desktop-entry-invalid-category X-KDE-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: 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
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pyversions
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pyversions
--- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/rules
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/rules
@ -18,14 +18,14 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde

-install/pykdeextensions-kde3::
+install/pytdeextensions-kde3::
 	# 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-kde3.lintian-overrides \
-	  debian/pykdeextensions-kde3/usr/share/lintian/overrides/pykdeextensions-kde3
+	install -D -p -m0644 debian/pytdeextensions-kde3.lintian-overrides \
+	  debian/pytdeextensions-kde3/usr/share/lintian/overrides/pytdeextensions-kde3

 	# fix script-not-executable
 	find debian -type f -name '*.py' | xargs chmod 0755
--- a/ubuntu/maverick_automake/libraries/python-kde3/debian/changelog
+++ b/ubuntu/maverick_automake/libraries/python-kde3/debian/changelog
@ -320,7 +320,7 @@ python-kde3 (3.11.3+20050829-1) unstable; urgency=low
  * Added the homepage of PyKDE to the package descriptions
  * HTML documentations is now installed into 
    /usr/share/doc/python-kde3-doc/html
-  * pykdeconfig.py now also knows that the sip files
+  * pytdeconfig.py now also knows that the sip files
    are in /usr/share/sip/kde3, not in /usr/share/sip/kde
    (Closes: #312708)

--- a/ubuntu/maverick_automake/libraries/python-kde3/debian/control
+++ b/ubuntu/maverick_automake/libraries/python-kde3/debian/control
@ -6,7 +6,7 @@ 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), libqt3-mt-dev (>= 3:3.3.7), qt3-dev-tools (>= 3:3.3.7), qt3-apps-dev (>= 3:3.3.7), python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-kde3-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
 Standards-Version: 3.8.3
-Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
+Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
 XS-Python-Version: all

 Package: python-kde3-kde3
--- a/ubuntu/maverick_automake/libraries/python-kde3/debian/pytdeconfig.py
+++ b/ubuntu/maverick_automake/libraries/python-kde3/debian/pytdeconfig.py
@ -4,8 +4,8 @@ import sys

 if getattr(sys, "pydebug", False):
    try:
-        from pykdeconfig_d import *
+        from pytdeconfig_d import *
    except ImportError, msg:
-        raise ImportError, 'No module named pykdeconfig; package python-kde3-dbg not installed'
+        raise ImportError, 'No module named pytdeconfig; package python-kde3-dbg not installed'
 else:
-    from pykdeconfig_nd import *
+    from pytdeconfig_nd import *
--- a/ubuntu/maverick_automake/libraries/python-kde3/debian/rules
+++ b/ubuntu/maverick_automake/libraries/python-kde3/debian/rules
@ -93,12 +93,12 @@ install-indep:
 	for version in ${PYTHONS};\
 	do\
 		mkdir -p debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages;\
-		cp debian/pykdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/;\
-		cp build-$$version/pykdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pykdeconfig_nd.py;\
+		cp debian/pytdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/;\
+		cp build-$$version/pytdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pytdeconfig_nd.py;\
 	done
 	for version in ${DBG_PYTHONS};\
 	do\
-		cp dbg-build-$$version/pykdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pykdeconfig_d.py;\
+		cp dbg-build-$$version/pytdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pytdeconfig_d.py;\
 	done

 install-arch: