summaryrefslogtreecommitdiffstats
path: root/ubuntu/raring/applications
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-04 18:05:28 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-04 18:05:28 +0200
commit424e979d8a2e10edd215b055c3fcbf89369e4c4e (patch)
tree5324646f3348f26d3509159ed6467718307a5915 /ubuntu/raring/applications
parent392136250fbb93d5cc7084a404497de71b446983 (diff)
downloadtde-packaging-424e979d8a2e10edd215b055c3fcbf89369e4c4e.tar.gz
tde-packaging-424e979d8a2e10edd215b055c3fcbf89369e4c4e.zip
Switch remaining packages to dh_python2 on Debian and Ubuntu
Diffstat (limited to 'ubuntu/raring/applications')
-rw-r--r--ubuntu/raring/applications/fusion-icon/debian/python-distutils-custom.mk3
-rw-r--r--ubuntu/raring/applications/tde-guidance/debian/python-distutils-jaunty.mk6
2 files changed, 6 insertions, 3 deletions
diff --git a/ubuntu/raring/applications/fusion-icon/debian/python-distutils-custom.mk b/ubuntu/raring/applications/fusion-icon/debian/python-distutils-custom.mk
index 00f1a3b1b..fbc70a624 100644
--- a/ubuntu/raring/applications/fusion-icon/debian/python-distutils-custom.mk
+++ b/ubuntu/raring/applications/fusion-icon/debian/python-distutils-custom.mk
@@ -141,9 +141,10 @@ $(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
+ ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif
diff --git a/ubuntu/raring/applications/tde-guidance/debian/python-distutils-jaunty.mk b/ubuntu/raring/applications/tde-guidance/debian/python-distutils-jaunty.mk
index 72efb646f..1a1ec9a8e 100644
--- a/ubuntu/raring/applications/tde-guidance/debian/python-distutils-jaunty.mk
+++ b/ubuntu/raring/applications/tde-guidance/debian/python-distutils-jaunty.mk
@@ -161,9 +161,10 @@ endif
ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
+ ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif
@@ -256,6 +257,7 @@ endif # archall detection
ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
@@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
else
dh_pycentral -p$(cdbs_curpkg)
endif
- dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
+ ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif