Build python-tqt as python module on Debian and Ubuntu

5 files changed, 19 insertions, 17 deletions

diff --git a/ubuntu/precise/dependencies/python-tqt/debian/control b/ubuntu/precise/dependencies/python-tqt/debian/control
index 8d4493d94..a79fd9c26 100644
--- a/ubuntu/precise/dependencies/python-tqt/debian/control
+++ b/ubuntu/precise/dependencies/python-tqt/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), python-sip-dbg, python-all-dbg
+Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-tqt-dev, python-sip-tqt-dbg, libtqscintilla-dev, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), python-all-dbg
 Standards-Version: 3.8.4
 
 Package: python-tqt
@@ -30,7 +30,7 @@ Priority: extra
 Replaces: python-tqt-dbg (<< 4:14.0.0~)
 Breaks: python-tqt-dbg (<< 4:14.0.0~)
 Section: debug
-Depends: ${shlibs:Depends}, python-dbg, python-tqt (= ${binary:Version}), python-sip-dbg, ${misc:Depends}
+Depends: ${shlibs:Depends}, python-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends}
 Description: TQt bindings for Python (debug extension)
  Python binding module that allows use of TQt X Window toolkit v3.
  You can use it to create portable graphics-capable scripts (there
@@ -105,7 +105,7 @@ Description: pyuic and pylupdate for TQt
 
 Package: python-tqt-dev
 Depends: ${python:Depends}, ${misc:Depends}
-Suggests: python-sip-dev
+Suggests: python-sip-tqt-dev
 Replaces: python-tqt-dev (<< 4:14.0.0~)
 Breaks: python-tqt-dev (<< 4:14.0.0~)
 Architecture: all
diff --git a/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-gl.install b/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-gl.install
index 65781e2d6..288f3cb88 100644
--- a/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-gl.install
+++ b/ubuntu/precise/dependencies/python-tqt/debian/python-tqt-gl.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/qtgl.so
+usr/lib/python*/*-packages/python_tqt/qtgl.so
diff --git a/ubuntu/precise/dependencies/python-tqt/debian/python-tqt.install b/ubuntu/precise/dependencies/python-tqt/debian/python-tqt.install
index b22fce2ea..61a9363d0 100644
--- a/ubuntu/precise/dependencies/python-tqt/debian/python-tqt.install
+++ b/ubuntu/precise/dependencies/python-tqt/debian/python-tqt.install
@@ -1,7 +1,7 @@
-usr/lib/python*/*-packages/qtcanvas.so
-usr/lib/python*/*-packages/qtnetwork.so
-usr/lib/python*/*-packages/qtsql.so
-usr/lib/python*/*-packages/qttable.so
-usr/lib/python*/*-packages/qtui.so
-usr/lib/python*/*-packages/qtxml.so
-usr/lib/python*/*-packages/qt.so
+usr/lib/python*/*-packages/python_tqt/qtcanvas.so
+usr/lib/python*/*-packages/python_tqt/qtnetwork.so
+usr/lib/python*/*-packages/python_tqt/qtsql.so
+usr/lib/python*/*-packages/python_tqt/qttable.so
+usr/lib/python*/*-packages/python_tqt/qtui.so
+usr/lib/python*/*-packages/python_tqt/qtxml.so
+usr/lib/python*/*-packages/python_tqt/qt.so
diff --git a/ubuntu/precise/dependencies/python-tqt/debian/python-tqtext.install b/ubuntu/precise/dependencies/python-tqt/debian/python-tqtext.install
index 5c80c3369..582be1bb1 100644
--- a/ubuntu/precise/dependencies/python-tqt/debian/python-tqtext.install
+++ b/ubuntu/precise/dependencies/python-tqt/debian/python-tqtext.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/qtext.so
+usr/lib/python*/*-packages/python_tqt/qtext.so
diff --git a/ubuntu/precise/dependencies/python-tqt/debian/rules b/ubuntu/precise/dependencies/python-tqt/debian/rules
index b0acb35f6..b8b687940 100755
--- a/ubuntu/precise/dependencies/python-tqt/debian/rules
+++ b/ubuntu/precise/dependencies/python-tqt/debian/rules
@@ -53,7 +53,7 @@ build-%/configure-stamp:
                 | python$* ../configure.py \
                         -c -n /usr/include/tqscintilla \
                         -o /usr/lib -u -j $(SPLIT) \
-                        -d /usr/lib/python$*/$(call py_sitename,$*) \
+                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
                         -l /usr/include/python$* \
                         -v /usr/share/sip/tqt \
                         -m /usr/lib/python$*/config \
@@ -67,7 +67,7 @@ dbg-build-%/configure-stamp:
                 | python$*-dbg ../configure.py \
                         -c -n /usr/include/tqscintilla \
                         -o /usr/lib -u -j $(SPLIT) \
-                        -d /usr/lib/python$*/$(call py_sitename,$*) \
+                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
                         -l /usr/include/python$*_d \
                         -v /usr/share/sip/tqt \
                         -m /usr/lib/python$*/config_d \
@@ -92,7 +92,7 @@ install-indep: configure
 	dh_clean -k -i
 	dh_installdirs -i
 	for version in ${PYTHONS}; do\
-		pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
+		pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
 		mkdir -p debian/python-tqt-dev/$$pylib;\
 		install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
 	done
@@ -107,8 +107,10 @@ install-arch: build
 	  $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
 	done
 	for version in ${PYTHONS}; do \
-	  pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
+	  pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
 	  $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-tqt-dbg;\
+	  mkdir -p debian/python-tqt/$$pylib;\
+	  touch debian/python-tqt/$$pylib/__init__.py;\
 	  mkdir -p debian/python-tqt-gl-dbg/$$pylib;\
 	  mv debian/python-tqt-dbg/$$pylib/qtgl.so \
              debian/python-tqt-gl-dbg/$$pylib/;\
@@ -158,7 +160,7 @@ endif
 	dh_compress -X.py -X.bmp -X.ui -X.sql
 	dh_fixperms
 	${DH_PYTHON2}
-	dh_sip
+	dh_sip_tqt
 	dh_lintian
 	dh_installdeb
 	dh_shlibdeps