diff options
| author | François Andriot <[email protected]> | 2013-08-27 21:17:52 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2013-08-27 21:17:52 +0200 |
| commit | 1af57210e2e55d40eb39a274fcf48779c6b9e7d5 (patch) | |
| tree | 55c22bbd35462f1c940b24614af05ea07bcd7f35 /ubuntu/maverick/tdebindings | |
| parent | af8c5ead9ac4c1ece3408b74224e5e273b6994ce (diff) | |
| parent | 2d0d0ba99b507cab093962cb910ddc7dd4755c94 (diff) | |
| download | tde-packaging-1af57210e2e55d40eb39a274fcf48779c6b9e7d5.tar.gz tde-packaging-1af57210e2e55d40eb39a274fcf48779c6b9e7d5.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdebindings')
| -rw-r--r-- | ubuntu/maverick/tdebindings/debian/control | 2 | ||||
| -rwxr-xr-x | ubuntu/maverick/tdebindings/debian/rules | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control index ad28b4291..a6f1eb5f3 100644 --- a/ubuntu/maverick/tdebindings/debian/control +++ b/ubuntu/maverick/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/maverick/tdebindings/debian/rules b/ubuntu/maverick/tdebindings/debian/rules index f6ae5709b..c31999f17 100755 --- a/ubuntu/maverick/tdebindings/debian/rules +++ b/ubuntu/maverick/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) ### |