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

4 files changed, 8 insertions, 8 deletions

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: