diff options
Diffstat (limited to 'ubuntu/maverick/applications')
4 files changed, 9 insertions, 6 deletions
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/python-distutils-custom.mk b/ubuntu/maverick/applications/fusion-icon/debian/python-distutils-custom.mk index 00f1a3b1b..fbc70a624 100644 --- a/ubuntu/maverick/applications/fusion-icon/debian/python-distutils-custom.mk +++ b/ubuntu/maverick/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/maverick/applications/koffice/debian/kword-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install index 7c702418e..2d273a850 100644 --- a/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install +++ b/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install @@ -10,7 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png -debian/tmp/opt/trinity/share/services/kwmailmerge_kabc.desktop +debian/tmp/opt/trinity/share/services/kwmailmerge_tdeabc.desktop debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.install b/ubuntu/maverick/applications/koffice/debian/kword-trinity.install index 7f3f2f954..dfeb77b97 100644 --- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.install +++ b/ubuntu/maverick/applications/koffice/debian/kword-trinity.install @@ -1,8 +1,8 @@ debian/tmp/opt/trinity/bin/kword debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so -debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.la -debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.so +debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.la +debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la diff --git a/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk b/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk index 72efb646f..1a1ec9a8e 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk +++ b/ubuntu/maverick/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 |