diff options
author | François Andriot <albator78@libertysurf.fr> | 2013-09-08 12:18:40 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2013-09-08 12:18:40 +0200 |
commit | 22bcb2f1bd4f894ab82aec3201bdd672a9cedb45 (patch) | |
tree | 89a4599019f91cb2981352ebd1d1f02e1e95bf50 /ubuntu/raring/applications/fusion-icon | |
parent | 442b14b852d6c156a43d2ecb88e304a514800960 (diff) | |
parent | 424e979d8a2e10edd215b055c3fcbf89369e4c4e (diff) | |
download | tde-packaging-22bcb2f1bd4f894ab82aec3201bdd672a9cedb45.tar.gz tde-packaging-22bcb2f1bd4f894ab82aec3201bdd672a9cedb45.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/raring/applications/fusion-icon')
-rw-r--r-- | ubuntu/raring/applications/fusion-icon/debian/python-distutils-custom.mk | 3 |
1 files changed, 2 insertions, 1 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 |