From d5d491ac48cd03bc58530750648cfd611440d011 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 4 Dec 2011 15:54:30 -0600 Subject: Fix python-trinity deps on Debian and Ubuntu --- ubuntu/maverick/libraries/python-trinity/debian/control | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ubuntu/maverick/libraries/python-trinity/debian') diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control index 38a85e452..52ca67c5c 100644 --- a/ubuntu/maverick/libraries/python-trinity/debian/control +++ b/ubuntu/maverick/libraries/python-trinity/debian/control @@ -4,14 +4,14 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina Uploaders: Torsten Marek , Debian Python Modules Team -Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), tdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev +Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-tqt-dev, tdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev Standards-Version: 3.8.4 Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php XS-Python-Version: all Package: python-trinity-trinity Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (>= 3.18) +Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt Replaces: python-kde3-kde3 (<< 4:3.5.13) Breaks: python-kde3-kde3 (<< 4:3.5.13) XB-Python-Version: ${python:Versions} @@ -27,7 +27,7 @@ Priority: extra Architecture: any Replaces: python-kde3-kde3-dbg (<< 4:3.5.13) Breaks: python-kde3-kde3-dbg (<< 4:3.5.13) -Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-qt3-dbg, ${shlibs:Depends} +Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-tqt-dbg, ${shlibs:Depends} XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, @@ -41,13 +41,13 @@ Section: python Architecture: all Replaces: python-kde3-kde3-dev (<< 4:3.5.13) Breaks: python-kde3-kde3-dev (<< 4:3.5.13) -Depends: pyqt-tools, ${python:Depends} +Depends: pytqt-tools, ${python:Depends} XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python - Development files and scripts [Trinity] Development .sip files with definitions of PyKDE classes. They are needed to build PyKDE, but also as building blocks of other packages based on them. - The package also contains kdepyuic, a wrapper script around PyQt's + The package also contains kdepyuic, a wrapper script around PyTQt's user interface compiler. Package: python-trinity-trinity-doc -- cgit v1.2.1 From de77ae6a46f8c680b280c3d2a65c40a8da4622cf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 4 Dec 2011 16:29:39 -0600 Subject: Rename pykde to pytde in Ubuntu and Debian --- ubuntu/maverick/libraries/python-trinity/debian/changelog | 2 +- ubuntu/maverick/libraries/python-trinity/debian/control | 2 +- .../maverick/libraries/python-trinity/debian/pykdeconfig.py | 11 ----------- .../maverick/libraries/python-trinity/debian/pytdeconfig.py | 11 +++++++++++ ubuntu/maverick/libraries/python-trinity/debian/rules | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 ubuntu/maverick/libraries/python-trinity/debian/pykdeconfig.py create mode 100644 ubuntu/maverick/libraries/python-trinity/debian/pytdeconfig.py (limited to 'ubuntu/maverick/libraries/python-trinity/debian') diff --git a/ubuntu/maverick/libraries/python-trinity/debian/changelog b/ubuntu/maverick/libraries/python-trinity/debian/changelog index 688f8d49c..0c28cec76 100644 --- 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) diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control index 52ca67c5c..f52038d27 100644 --- 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 Uploaders: Torsten Marek , Debian Python Modules Team 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 diff --git a/ubuntu/maverick/libraries/python-trinity/debian/pykdeconfig.py b/ubuntu/maverick/libraries/python-trinity/debian/pykdeconfig.py deleted file mode 100644 index 9e3840afe..000000000 --- a/ubuntu/maverick/libraries/python-trinity/debian/pykdeconfig.py +++ /dev/null @@ -1,11 +0,0 @@ -# import the sipconfig.py for the normal or the debug build - -import sys - -if getattr(sys, "pydebug", False): - try: - from pykdeconfig_d import * - except ImportError, msg: - raise ImportError, 'No module named pykdeconfig; package python-trinity-dbg not installed' -else: - from pykdeconfig_nd import * diff --git a/ubuntu/maverick/libraries/python-trinity/debian/pytdeconfig.py b/ubuntu/maverick/libraries/python-trinity/debian/pytdeconfig.py new file mode 100644 index 000000000..eac264752 --- /dev/null +++ b/ubuntu/maverick/libraries/python-trinity/debian/pytdeconfig.py @@ -0,0 +1,11 @@ +# import the sipconfig.py for the normal or the debug build + +import sys + +if getattr(sys, "pydebug", False): + try: + from pytdeconfig_d import * + except ImportError, msg: + raise ImportError, 'No module named pytdeconfig; package python-trinity-dbg not installed' +else: + from pytdeconfig_nd import * diff --git a/ubuntu/maverick/libraries/python-trinity/debian/rules b/ubuntu/maverick/libraries/python-trinity/debian/rules index 85c43a0fe..ffa56ad63 100755 --- 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: -- cgit v1.2.1