diff options
Diffstat (limited to 'debian')
6 files changed, 20 insertions, 10 deletions
diff --git a/debian/lenny/applications/fusion-icon/debian/python-distutils-custom.mk b/debian/lenny/applications/fusion-icon/debian/python-distutils-custom.mk index 00f1a3b1b..fbc70a624 100644 --- a/debian/lenny/applications/fusion-icon/debian/python-distutils-custom.mk +++ b/debian/lenny/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/lenny/applications/kde-guidance/debian/python-distutils-jaunty.mk b/debian/lenny/applications/kde-guidance/debian/python-distutils-jaunty.mk index 9c5e5211f..db329306c 100644 --- a/debian/lenny/applications/kde-guidance/debian/python-distutils-jaunty.mk +++ b/debian/lenny/applications/kde-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 diff --git a/debian/lenny/libraries/pykdeextensions/debian/python-distutils-jaunty.mk b/debian/lenny/libraries/pykdeextensions/debian/python-distutils-jaunty.mk index 9c5e5211f..db329306c 100644 --- a/debian/lenny/libraries/pykdeextensions/debian/python-distutils-jaunty.mk +++ b/debian/lenny/libraries/pykdeextensions/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 diff --git a/debian/squeeze/applications/fusion-icon/debian/python-distutils-custom.mk b/debian/squeeze/applications/fusion-icon/debian/python-distutils-custom.mk index 00f1a3b1b..fbc70a624 100644 --- a/debian/squeeze/applications/fusion-icon/debian/python-distutils-custom.mk +++ b/debian/squeeze/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/squeeze/applications/kde-guidance/debian/python-distutils-jaunty.mk b/debian/squeeze/applications/kde-guidance/debian/python-distutils-jaunty.mk index 9c5e5211f..db329306c 100644 --- a/debian/squeeze/applications/kde-guidance/debian/python-distutils-jaunty.mk +++ b/debian/squeeze/applications/kde-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 diff --git a/debian/squeeze/libraries/pykdeextensions/debian/python-distutils-jaunty.mk b/debian/squeeze/libraries/pykdeextensions/debian/python-distutils-jaunty.mk index 9c5e5211f..db329306c 100644 --- a/debian/squeeze/libraries/pykdeextensions/debian/python-distutils-jaunty.mk +++ b/debian/squeeze/libraries/pykdeextensions/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 |