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/kdebindings | |
| 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/kdebindings')
| -rw-r--r-- | ubuntu/maverick/kdebindings/debian/control | 2 | ||||
| -rwxr-xr-x | ubuntu/maverick/kdebindings/debian/rules | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ubuntu/maverick/kdebindings/debian/control b/ubuntu/maverick/kdebindings/debian/control index 35567eec0..343f7aa47 100644 --- a/ubuntu/maverick/kdebindings/debian/control +++ b/ubuntu/maverick/kdebindings/debian/control @@ -1,6 +1,6 @@ Source: kdebindings-trinity Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), - python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk, + python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk, gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc], kdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5), ruby, ruby-dev, flex, bison, diff --git a/ubuntu/maverick/kdebindings/debian/rules b/ubuntu/maverick/kdebindings/debian/rules index 002b7f5f9..2a96323d3 100755 --- a/ubuntu/maverick/kdebindings/debian/rules +++ b/ubuntu/maverick/kdebindings/debian/rules @@ -3,6 +3,9 @@ DEB_QUILT_PATCHDIR_LINK := export QUILT_PATCHES=debian/patches +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 override DEB_BUILDDIR := $(DEB_SRCDIR) @@ -131,7 +134,7 @@ binary-install/libqt0-ruby1.8-trinity:: mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ binary-install/python-dcop-trinity:: - dh_pysupport -p$(cdbs_curpkg) + ${DH_PYTHON2} -p$(cdbs_curpkg) ### |