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

21 files changed, 53 insertions, 53 deletions

diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.install b/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.install
deleted file mode 100644
index 7fa6e9508..000000000
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.install
+++ /dev/null
@@ -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
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.lintian-overrides b/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.lintian-overrides
deleted file mode 100644
index 06b60205b..000000000
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.lintian-overrides
+++ /dev/null
@@ -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
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/README.Debian b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/README.Debian
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/README.Debian
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/changelog b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/changelog
index 6e632ec6b..9a5d57c27 100644
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/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
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/compat b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/compat
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/compat
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/control b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/control
index 9adc365d1..14412fec1 100644
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/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
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/copyright b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/copyright
index a90a21587..9ed7bf6cd 100644
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/copyright
+++ b/ubuntu/maverick_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:
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/docs b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/docs
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/docs
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/libpythonize0-kde3-dev.install b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install
index fa6727d83..fa6727d83 100644
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/libpythonize0-kde3-dev.install
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/libpythonize0-kde3.install b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3.install
index 774c4fddf..774c4fddf 100644
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/libpythonize0-kde3.install
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3.install
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/patches/.gitignore b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/patches/.gitignore
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/patches/.gitignore
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pycompat b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pycompat
index 0cfbf0888..0cfbf0888 100644
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pycompat
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pycompat
diff --git a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.install b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.install
new file mode 100644
index 000000000..60b8f3085
--- /dev/null
+++ 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
diff --git a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.lintian-overrides b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.lintian-overrides
new file mode 100644
index 000000000..3b34d51a5
--- /dev/null
+++ 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
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/python-distutils-jaunty.mk b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
index 63fce07d5..63fce07d5 100644
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/python-distutils-jaunty.mk
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pyversions b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pyversions
index b3dc41ebc..b3dc41ebc 100644
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pyversions
+++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pyversions
diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/rules b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/rules
index 38e8bfc86..f6a1d85e6 100755
--- a/ubuntu/maverick_automake/libraries/pykdeextensions/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
diff --git a/ubuntu/maverick_automake/libraries/python-kde3/debian/changelog b/ubuntu/maverick_automake/libraries/python-kde3/debian/changelog
index 948b079e2..afeaa1689 100644
--- 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)
 
diff --git a/ubuntu/maverick_automake/libraries/python-kde3/debian/control b/ubuntu/maverick_automake/libraries/python-kde3/debian/control
index 617cc9a1b..da397514b 100644
--- 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
diff --git a/ubuntu/maverick_automake/libraries/python-kde3/debian/pykdeconfig.py b/ubuntu/maverick_automake/libraries/python-kde3/debian/pytdeconfig.py
index b6c29318e..baab0b1cf 100644
--- a/ubuntu/maverick_automake/libraries/python-kde3/debian/pykdeconfig.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 *
diff --git a/ubuntu/maverick_automake/libraries/python-kde3/debian/rules b/ubuntu/maverick_automake/libraries/python-kde3/debian/rules
index bc3dd4991..553c08f56 100755
--- 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: