diff options
| author | Slávek Banko <[email protected]> | 2016-01-30 20:19:21 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2016-01-30 20:19:43 +0100 |
| commit | 41241c98d3255e62d21969821c5fa86754a46127 (patch) | |
| tree | e0117ba2562be48fd6079099236464e3cb0477dd /ubuntu/maverick/applications/tde-guidance/debian | |
| parent | 9c05367ac4909dd6e7e6eeaaa7b70f7fda514265 (diff) | |
| download | tde-packaging-41241c98d3255e62d21969821c5fa86754a46127.tar.gz tde-packaging-41241c98d3255e62d21969821c5fa86754a46127.zip | |
Switch remaining packages to dh_python2 on Debian and Ubuntu
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 1e2672ad64a3a6bee8e12dd2496a85ddc80768a6)
Diffstat (limited to 'ubuntu/maverick/applications/tde-guidance/debian')
| -rw-r--r-- | ubuntu/maverick/applications/tde-guidance/debian/control | 2 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/tde-guidance/debian/rules | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control index 3398429dc..66b008863 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/control +++ b/ubuntu/maverick/applications/tde-guidance/debian/control @@ -7,7 +7,7 @@ Uploaders: Fathi Boudra <[email protected]>, Mark Purcell <[email protected]> Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, tdelibs14-trinity-dev, libpythonize0-trinity-dev, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev, - python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata + python-support (>= 0.6) | dh-python, python-all (>= 2.5), python-all-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata Standards-Version: 3.8.4 Package: tde-guidance-trinity diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules index 217eea9ed..656eac6d4 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/rules +++ b/ubuntu/maverick/applications/tde-guidance/debian/rules @@ -1,13 +1,17 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM = pysupport +DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_pysupport),pysupport) +DEB_PYTHON2_MODULE_PACKAGES=tde-guidance-trinity guidance-backends-trinity PYSUPPORT_INST_PATH = /opt/trinity/share/python-support GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH) 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 |