diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-04 18:05:28 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-04 18:05:28 +0200 |
| commit | 424e979d8a2e10edd215b055c3fcbf89369e4c4e (patch) | |
| tree | 5324646f3348f26d3509159ed6467718307a5915 /debian/wheezy/applications | |
| parent | 392136250fbb93d5cc7084a404497de71b446983 (diff) | |
| download | tde-packaging-424e979d8a2e10edd215b055c3fcbf89369e4c4e.tar.gz tde-packaging-424e979d8a2e10edd215b055c3fcbf89369e4c4e.zip | |
Switch remaining packages to dh_python2 on Debian and Ubuntu
Diffstat (limited to 'debian/wheezy/applications')
| -rw-r--r-- | debian/wheezy/applications/fusion-icon/debian/python-distutils-custom.mk | 3 | ||||
| -rw-r--r-- | debian/wheezy/applications/tde-guidance/debian/python-distutils-jaunty.mk | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/wheezy/applications/fusion-icon/debian/python-distutils-custom.mk b/debian/wheezy/applications/fusion-icon/debian/python-distutils-custom.mk index 00f1a3b1b..fbc70a624 100644 --- a/debian/wheezy/applications/fusion-icon/debian/python-distutils-custom.mk +++ b/debian/wheezy/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/debian/wheezy/applications/tde-guidance/debian/python-distutils-jaunty.mk b/debian/wheezy/applications/tde-guidance/debian/python-distutils-jaunty.mk index 9c5e5211f..db329306c 100644 --- a/debian/wheezy/applications/tde-guidance/debian/python-distutils-jaunty.mk +++ b/debian/wheezy/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 |