diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-08-27 04:57:39 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-07-14 00:55:05 +0200 |
| commit | 969208d92e57960ab67adf648474c3d8905ac0a6 (patch) | |
| tree | 8c30f887bb530d429e8c0e406bb86312bae8ca46 /ubuntu/maverick/applications | |
| parent | 0f086e717486c3aa5097a63d8ce3608d823a6f0c (diff) | |
| download | tde-packaging-969208d92e57960ab67adf648474c3d8905ac0a6.tar.gz tde-packaging-969208d92e57960ab67adf648474c3d8905ac0a6.zip | |
Switch to dh_python2 (or dh_pysupport as fallback) on Debian and Ubuntu
(cherry picked from commit 2d0d0ba99b507cab093962cb910ddc7dd4755c94)
Diffstat (limited to 'ubuntu/maverick/applications')
4 files changed, 8 insertions, 5 deletions
diff --git a/ubuntu/maverick/applications/desktop-effects-kde/debian/control b/ubuntu/maverick/applications/desktop-effects-kde/debian/control index d6572a130..741a16a35 100644 --- a/ubuntu/maverick/applications/desktop-effects-kde/debian/control +++ b/ubuntu/maverick/applications/desktop-effects-kde/debian/control @@ -2,7 +2,7 @@ Source: desktop-effects-kde-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), quilt, python-central (>= 0.5.6) +Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), quilt, python-support (>= 0.6) | python-dev (>= 2.6.6-3~) Standards-Version: 3.8.4 XS-Python-Version: all diff --git a/ubuntu/maverick/applications/desktop-effects-kde/debian/rules b/ubuntu/maverick/applications/desktop-effects-kde/debian/rules index 8eee42e6a..25fa64a44 100755 --- a/ubuntu/maverick/applications/desktop-effects-kde/debian/rules +++ b/ubuntu/maverick/applications/desktop-effects-kde/debian/rules @@ -1,5 +1,8 @@ #!/usr/bin/make -f +DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) + include /usr/share/cdbs/1/rules/debhelper.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde @@ -13,4 +16,4 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) binary-install/desktop-effects-kde-trinity:: - dh_pycentral -pdesktop-effects-kde-trinity + ${DH_PYTHON2} -pdesktop-effects-kde-trinity diff --git a/ubuntu/maverick/applications/fusion-icon/debian/control b/ubuntu/maverick/applications/fusion-icon/debian/control index a18c43475..e90061663 100644 --- a/ubuntu/maverick/applications/fusion-icon/debian/control +++ b/ubuntu/maverick/applications/fusion-icon/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org> XS-Python-Version: all Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), quilt, pkg-config, python-all-dev -Build-Depends-Indep: python-central (>= 0.6.0), intltool +Build-Depends-Indep: python-support (>= 0.6), intltool Standards-Version: 3.8.4 Package: fusion-icon-trinity diff --git a/ubuntu/maverick/applications/fusion-icon/debian/rules b/ubuntu/maverick/applications/fusion-icon/debian/rules index 572f6e270..207573dea 100755 --- a/ubuntu/maverick/applications/fusion-icon/debian/rules +++ b/ubuntu/maverick/applications/fusion-icon/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM=pycentral +DEB_PYTHON_SYSTEM=pysupport include /usr/share/cdbs/1/rules/debhelper.mk # include /usr/share/cdbs/1/class/python-distutils.mk @@ -17,5 +17,5 @@ binary-install/fusion-icon-trinity:: mkdir -p debian/fusion-icon-trinity/opt/trinity cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/ rm -rf debian/fusion-icon-trinity/usr - dh_pycentral -pfusion-icon-trinity + dh_pysupport -pfusion-icon-trinity dh_icons |