summaryrefslogtreecommitdiffstats
path: root/ubuntu/raring/tdebindings/debian
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-08-27 04:57:39 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-08-27 05:00:17 +0200
commit2d0d0ba99b507cab093962cb910ddc7dd4755c94 (patch)
tree25732cac7c5450d1df2efe47d153253bec8a83be /ubuntu/raring/tdebindings/debian
parente59f9132f600c669c73885b0b58a715e6bfd03a6 (diff)
downloadtde-packaging-2d0d0ba99b507cab093962cb910ddc7dd4755c94.tar.gz
tde-packaging-2d0d0ba99b507cab093962cb910ddc7dd4755c94.zip
Switch to dh_python2 (or dh_pysupport as fallback) on Debian and Ubuntu
Diffstat (limited to 'ubuntu/raring/tdebindings/debian')
-rw-r--r--ubuntu/raring/tdebindings/debian/control2
-rwxr-xr-xubuntu/raring/tdebindings/debian/rules5
2 files changed, 5 insertions, 2 deletions
diff --git a/ubuntu/raring/tdebindings/debian/control b/ubuntu/raring/tdebindings/debian/control
index ad28b4291..a6f1eb5f3 100644
--- a/ubuntu/raring/tdebindings/debian/control
+++ b/ubuntu/raring/tdebindings/debian/control
@@ -1,6 +1,6 @@
Source: tdebindings-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],
tdelibs4-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
ruby, ruby-dev, flex, bison,
diff --git a/ubuntu/raring/tdebindings/debian/rules b/ubuntu/raring/tdebindings/debian/rules
index f6ae5709b..c31999f17 100755
--- a/ubuntu/raring/tdebindings/debian/rules
+++ b/ubuntu/raring/tdebindings/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)
###