2 files changed, 8 insertions, 4 deletions
diff --git a/debian/squeeze/libraries/pytdeextensions/debian/control b/debian/squeeze/libraries/pytdeextensions/debian/control
index eb3f278dc..7942de445 100644
--- a/debian/squeeze/libraries/pytdeextensions/debian/control
+++ b/debian/squeeze/libraries/pytdeextensions/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool-bin | libtool (<< 2.4.2-1.11), libtool,
  libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
- python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6), python (>= 2.5), python-all-dev (>= 2.5)
+ python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6) | dh-python, python (>= 2.5), python-all-dev (>= 2.5)
 Standards-Version: 3.8.4
 
 Package: pytdeextensions-trinity
diff --git a/debian/squeeze/libraries/pytdeextensions/debian/rules b/debian/squeeze/libraries/pytdeextensions/debian/rules
index 308059b26..188238d79 100755
--- a/debian/squeeze/libraries/pytdeextensions/debian/rules
+++ b/debian/squeeze/libraries/pytdeextensions/debian/rules
@@ -1,10 +1,14 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM = pysupport
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_pysupport),pysupport)
+DEB_PYTHON2_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/class/python-distutils.mk
-include debian/python-distutils-jaunty.mk
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+  include debian/python-distutils-jaunty.mk
+else
+  include /usr/share/cdbs/1/class/python-distutils.mk
+endif
 #include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk