TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

Use dh_python as fallback in python-trinity on Debian and Ubuntu

Browse Source 
This fix tde-guidance FTBFS on Ubuntu Lucid
(cherry picked from commit 0cfa01db4d)
v3.5.13-sru
Slávek Banko 11 years ago
parent 89f6a3cada
commit 19db486180
9 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File

6
debian/lenny/libraries/python-trinity/debian/control vendored
Unescape View File

@ -4,15 +4,13 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org> XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-support (>= 0.6) | python-dev (>= 2.6.6-3~), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-sip4, python-sip4-dbg, python-sip4-dev
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
XS-Python-Version: all
Package: python-trinity-trinity Package: python-trinity-trinity
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (>= 3.18) Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (>= 3.18)
XB-Python-Version: ${python:Versions}
Provides: ${python:Provides} Provides: ${python:Provides}
Conflicts: python-trinity-trinity Conflicts: python-trinity-trinity
Description: Trinity bindings for Python [Trinity] Description: Trinity bindings for Python [Trinity]
@ -24,7 +22,6 @@ Package: python-trinity-trinity-dbg
Priority: extra Priority: extra
Architecture: any Architecture: any
Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-qt3-dbg, ${shlibs:Depends} Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-qt3-dbg, ${shlibs:Depends}
XB-Python-Version: ${python:Versions}
Description: Trinity bindings for Python (debug extensions) [Trinity] Description: Trinity bindings for Python (debug extensions) [Trinity]
Python binding module that provides wide access to the Trinity API, Python binding module that provides wide access to the Trinity API,
also known as PyKDE. Using this, you'll get (for example) classes also known as PyKDE. Using this, you'll get (for example) classes
@ -36,7 +33,6 @@ Package: python-trinity-trinity-dev
Section: python Section: python
Architecture: all Architecture: all
Depends: pyqt-tools, ${python:Depends} Depends: pyqt-tools, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Trinity bindings for Python - Development files and scripts [Trinity] Description: Trinity bindings for Python - Development files and scripts [Trinity]
Development .sip files with definitions of PyKDE classes. They Development .sip files with definitions of PyKDE classes. They
are needed to build PyKDE, but also as building blocks of other are needed to build PyKDE, but also as building blocks of other

1
debian/lenny/libraries/python-trinity/debian/pycompat vendored
Unescape View File

@ -1 +0,0 @@
2

10
debian/lenny/libraries/python-trinity/debian/rules vendored
Unescape View File

@ -14,7 +14,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
include /usr/share/dpatch/dpatch.make
# This has to be exported to make some magic below work. # This has to be exported to make some magic below work.
export DH_OPTIONS export DH_OPTIONS
export QTDIR=/usr/share/qt3 export QTDIR=/usr/share/qt3
@ -31,8 +30,7 @@ endif
PYTHONS := $(shell pyversions -vr debian/control) PYTHONS := $(shell pyversions -vr debian/control)
DBG_PYTHONS := $(shell pyversions -vd) DBG_PYTHONS := $(shell pyversions -vd)
DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
ifneq (,$(filter $(GCCVER),4.2 4.3)) ifneq (,$(filter $(GCCVER),4.2 4.3))
@ -45,7 +43,7 @@ endif
configure: $(PYTHONS:%=build-%/configure-stamp) $(DBG_PYTHONS:%=dbg-build-%/configure-stamp) configure: $(PYTHONS:%=build-%/configure-stamp) $(DBG_PYTHONS:%=dbg-build-%/configure-stamp)
build-%/configure-stamp: patch-stamp build-%/configure-stamp:
dh_testdir dh_testdir
mkdir -p build-$* mkdir -p build-$*
cd build-$* && python$* ../configure.py \ cd build-$* && python$* ../configure.py \
@ -53,7 +51,7 @@ build-%/configure-stamp: patch-stamp
-v /opt/trinity/share/sip/trinity -j $(SPLIT) -v /opt/trinity/share/sip/trinity -j $(SPLIT)
touch $@ touch $@
dbg-build-%/configure-stamp: patch-stamp dbg-build-%/configure-stamp:
dh_testdir dh_testdir
mkdir -p dbg-build-$* mkdir -p dbg-build-$*
cd dbg-build-$* && python$*-dbg ../configure.py \ cd dbg-build-$* && python$*-dbg ../configure.py \
@ -73,7 +71,7 @@ dbg-build-%/build-stamp: dbg-build-%/configure-stamp
$(MAKE) -C dbg-build-$* $(MAKE) -C dbg-build-$*
touch $@ touch $@
clean: unpatch clean:
dh_testdir dh_testdir
dh_testroot dh_testroot
rm -f *-stamp rm -f *-stamp

6
debian/squeeze/libraries/python-trinity/debian/control vendored
Unescape View File

@ -4,15 +4,13 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org> XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Build-Depends: debhelper (>= 5.0.38), quilt, libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-support (>= 0.6) | python-dev (>= 2.6.6-3~), python-sip4, python-sip4-dbg, python-sip4-dev Build-Depends: debhelper (>= 5.0.38), quilt, libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-sip4, python-sip4-dbg, python-sip4-dev
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
XS-Python-Version: all
Package: python-trinity-trinity Package: python-trinity-trinity
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (>= 3.18) Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (>= 3.18)
XB-Python-Version: ${python:Versions}
Provides: ${python:Provides} Provides: ${python:Provides}
Conflicts: python-trinity-trinity Conflicts: python-trinity-trinity
Description: Trinity bindings for Python [Trinity] Description: Trinity bindings for Python [Trinity]
@ -24,7 +22,6 @@ Package: python-trinity-trinity-dbg
Priority: extra Priority: extra
Architecture: any Architecture: any
Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-qt3-dbg, ${shlibs:Depends} Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-qt3-dbg, ${shlibs:Depends}
XB-Python-Version: ${python:Versions}
Description: Trinity bindings for Python (debug extensions) [Trinity] Description: Trinity bindings for Python (debug extensions) [Trinity]
Python binding module that provides wide access to the Trinity API, Python binding module that provides wide access to the Trinity API,
also known as PyKDE. Using this, you'll get (for example) classes also known as PyKDE. Using this, you'll get (for example) classes
@ -36,7 +33,6 @@ Package: python-trinity-trinity-dev
Section: python Section: python
Architecture: all Architecture: all
Depends: pyqt-tools, ${python:Depends} Depends: pyqt-tools, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Trinity bindings for Python - Development files and scripts [Trinity] Description: Trinity bindings for Python - Development files and scripts [Trinity]
Development .sip files with definitions of PyKDE classes. They Development .sip files with definitions of PyKDE classes. They
are needed to build PyKDE, but also as building blocks of other are needed to build PyKDE, but also as building blocks of other

1
debian/squeeze/libraries/python-trinity/debian/pycompat vendored
Unescape View File

@ -1 +0,0 @@
2

4
debian/squeeze/libraries/python-trinity/debian/rules vendored
Unescape View File

@ -14,7 +14,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
#include /usr/share/dpatch/dpatch.make
# This has to be exported to make some magic below work. # This has to be exported to make some magic below work.
export DH_OPTIONS export DH_OPTIONS
export QTDIR=/usr/share/qt3 export QTDIR=/usr/share/qt3
@ -31,8 +30,7 @@ endif
PYTHONS := $(shell pyversions -vr debian/control) PYTHONS := $(shell pyversions -vr debian/control)
DBG_PYTHONS := $(shell pyversions -vd) DBG_PYTHONS := $(shell pyversions -vd)
DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
ifneq (,$(filter $(GCCVER),4.2 4.3)) ifneq (,$(filter $(GCCVER),4.2 4.3))

6
ubuntu/maverick/libraries/python-trinity/debian/control
Unescape View File

@ -4,17 +4,15 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org> XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Build-Depends: debhelper (>= 5.0.38), quilt, libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-support (>= 0.6) | python-dev (>= 2.6.6-3~), python-sip4, python-sip4-dbg, python-sip4-dev Build-Depends: debhelper (>= 5.0.38), quilt, libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-sip4, python-sip4-dbg, python-sip4-dev
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
XS-Python-Version: all
Package: python-trinity-trinity Package: python-trinity-trinity
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (>= 3.18) Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (>= 3.18)
Replaces: python-kde3-kde3 (<< 4:3.5.13) Replaces: python-kde3-kde3 (<< 4:3.5.13)
Breaks: python-kde3-kde3 (<< 4:3.5.13) Breaks: python-kde3-kde3 (<< 4:3.5.13)
XB-Python-Version: ${python:Versions}
Provides: ${python:Provides} Provides: ${python:Provides}
Conflicts: python-trinity-trinity Conflicts: python-trinity-trinity
Description: Trinity bindings for Python [Trinity] Description: Trinity bindings for Python [Trinity]
@ -28,7 +26,6 @@ Architecture: any
Replaces: python-kde3-kde3-dbg (<< 4:3.5.13) Replaces: python-kde3-kde3-dbg (<< 4:3.5.13)
Breaks: python-kde3-kde3-dbg (<< 4:3.5.13) Breaks: python-kde3-kde3-dbg (<< 4:3.5.13)
Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-qt3-dbg, ${shlibs:Depends} Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-qt3-dbg, ${shlibs:Depends}
XB-Python-Version: ${python:Versions}
Description: Trinity bindings for Python (debug extensions) [Trinity] Description: Trinity bindings for Python (debug extensions) [Trinity]
Python binding module that provides wide access to the Trinity API, Python binding module that provides wide access to the Trinity API,
also known as PyKDE. Using this, you'll get (for example) classes also known as PyKDE. Using this, you'll get (for example) classes
@ -42,7 +39,6 @@ Architecture: all
Replaces: python-kde3-kde3-dev (<< 4:3.5.13) Replaces: python-kde3-kde3-dev (<< 4:3.5.13)
Breaks: python-kde3-kde3-dev (<< 4:3.5.13) Breaks: python-kde3-kde3-dev (<< 4:3.5.13)
Depends: pyqt-tools, ${python:Depends} Depends: pyqt-tools, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Trinity bindings for Python - Development files and scripts [Trinity] Description: Trinity bindings for Python - Development files and scripts [Trinity]
Development .sip files with definitions of PyKDE classes. They Development .sip files with definitions of PyKDE classes. They
are needed to build PyKDE, but also as building blocks of other are needed to build PyKDE, but also as building blocks of other

1
ubuntu/maverick/libraries/python-trinity/debian/pycompat
Unescape View File

@ -1 +0,0 @@
2

4
ubuntu/maverick/libraries/python-trinity/debian/rules
Unescape View File

@ -14,7 +14,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
#include /usr/share/dpatch/dpatch.make
# This has to be exported to make some magic below work. # This has to be exported to make some magic below work.
export DH_OPTIONS export DH_OPTIONS
export QTDIR=/usr/share/qt3 export QTDIR=/usr/share/qt3
@ -31,8 +30,7 @@ endif
PYTHONS := $(shell pyversions -vr debian/control) PYTHONS := $(shell pyversions -vr debian/control)
DBG_PYTHONS := $(shell pyversions -vd) DBG_PYTHONS := $(shell pyversions -vd)
DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
ifneq (,$(filter $(GCCVER),4.2 4.3)) ifneq (,$(filter $(GCCVER),4.2 4.3))

Write Preview
Loading…
Cancel
Save