diff options
Diffstat (limited to 'debian')
9 files changed, 15 insertions, 36 deletions
diff --git a/debian/lenny/libraries/python-trinity/debian/control b/debian/lenny/libraries/python-trinity/debian/control index ef0d3115a..c69bdc5ea 100644 --- a/debian/lenny/libraries/python-trinity/debian/control +++ b/debian/lenny/libraries/python-trinity/debian/control @@ -4,17 +4,15 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 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> -Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-tqt-dev, tdelibs14-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-tqt-dev, tdelibs14-trinity-dev, python-sip4, python-sip4-dbg, python-sip4-dev Standards-Version: 3.8.4 Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php -XS-Python-Version: all Package: python-trinity-trinity Architecture: any Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt Replaces: python-trinity-trinity (<< 4:14.0.0) Breaks: python-trinity-trinity (<< 4:14.0.0) -XB-Python-Version: ${python:Versions} Provides: ${python:Provides} Conflicts: python-trinity-trinity Description: Trinity bindings for Python [Trinity] @@ -28,7 +26,6 @@ Architecture: any Replaces: python-trinity-trinity-dbg (<< 4:14.0.0) Breaks: python-trinity-trinity-dbg (<< 4:14.0.0) Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-tqt-dbg, ${shlibs:Depends} -XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes @@ -42,7 +39,6 @@ Architecture: all Replaces: python-trinity-trinity-dev (<< 4:14.0.0) Breaks: python-trinity-trinity-dev (<< 4:14.0.0) Depends: pytqt-tools, ${python:Depends} -XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python - Development files and scripts [Trinity] Development .sip files with definitions of PyKDE classes. They are needed to build PyKDE, but also as building blocks of other diff --git a/debian/lenny/libraries/python-trinity/debian/pycompat b/debian/lenny/libraries/python-trinity/debian/pycompat deleted file mode 100644 index 0cfbf0888..000000000 --- a/debian/lenny/libraries/python-trinity/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/debian/lenny/libraries/python-trinity/debian/rules b/debian/lenny/libraries/python-trinity/debian/rules index d4dac70f3..473caac7d 100755 --- a/debian/lenny/libraries/python-trinity/debian/rules +++ b/debian/lenny/libraries/python-trinity/debian/rules @@ -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[,.]" \ && echo xz || echo bzip2) -include /usr/share/dpatch/dpatch.make # This has to be exported to make some magic below work. export DH_OPTIONS export QTDIR=/usr/share/qt3 @@ -31,8 +30,7 @@ endif PYTHONS := $(shell pyversions -vr debian/control) 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_pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') ifneq (,$(filter $(GCCVER),4.2 4.3)) @@ -45,7 +43,7 @@ endif configure: $(PYTHONS:%=build-%/configure-stamp) $(DBG_PYTHONS:%=dbg-build-%/configure-stamp) -build-%/configure-stamp: patch-stamp +build-%/configure-stamp: dh_testdir mkdir -p build-$* cd build-$* && python$* ../configure.py \ @@ -53,7 +51,7 @@ build-%/configure-stamp: patch-stamp -v /opt/trinity/share/sip/trinity -j $(SPLIT) touch $@ -dbg-build-%/configure-stamp: patch-stamp +dbg-build-%/configure-stamp: dh_testdir mkdir -p dbg-build-$* cd dbg-build-$* && python$*-dbg ../configure.py \ @@ -73,7 +71,7 @@ dbg-build-%/build-stamp: dbg-build-%/configure-stamp $(MAKE) -C dbg-build-$* touch $@ -clean: unpatch +clean: dh_testdir dh_testroot rm -f *-stamp diff --git a/debian/squeeze/libraries/python-trinity/debian/control b/debian/squeeze/libraries/python-trinity/debian/control index ef0d3115a..c69bdc5ea 100644 --- a/debian/squeeze/libraries/python-trinity/debian/control +++ b/debian/squeeze/libraries/python-trinity/debian/control @@ -4,17 +4,15 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 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> -Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-tqt-dev, tdelibs14-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-tqt-dev, tdelibs14-trinity-dev, python-sip4, python-sip4-dbg, python-sip4-dev Standards-Version: 3.8.4 Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php -XS-Python-Version: all Package: python-trinity-trinity Architecture: any Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt Replaces: python-trinity-trinity (<< 4:14.0.0) Breaks: python-trinity-trinity (<< 4:14.0.0) -XB-Python-Version: ${python:Versions} Provides: ${python:Provides} Conflicts: python-trinity-trinity Description: Trinity bindings for Python [Trinity] @@ -28,7 +26,6 @@ Architecture: any Replaces: python-trinity-trinity-dbg (<< 4:14.0.0) Breaks: python-trinity-trinity-dbg (<< 4:14.0.0) Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-tqt-dbg, ${shlibs:Depends} -XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes @@ -42,7 +39,6 @@ Architecture: all Replaces: python-trinity-trinity-dev (<< 4:14.0.0) Breaks: python-trinity-trinity-dev (<< 4:14.0.0) Depends: pytqt-tools, ${python:Depends} -XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python - Development files and scripts [Trinity] Development .sip files with definitions of PyKDE classes. They are needed to build PyKDE, but also as building blocks of other diff --git a/debian/squeeze/libraries/python-trinity/debian/pycompat b/debian/squeeze/libraries/python-trinity/debian/pycompat deleted file mode 100644 index 0cfbf0888..000000000 --- a/debian/squeeze/libraries/python-trinity/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/debian/squeeze/libraries/python-trinity/debian/rules b/debian/squeeze/libraries/python-trinity/debian/rules index d4dac70f3..473caac7d 100755 --- a/debian/squeeze/libraries/python-trinity/debian/rules +++ b/debian/squeeze/libraries/python-trinity/debian/rules @@ -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[,.]" \ && echo xz || echo bzip2) -include /usr/share/dpatch/dpatch.make # This has to be exported to make some magic below work. export DH_OPTIONS export QTDIR=/usr/share/qt3 @@ -31,8 +30,7 @@ endif PYTHONS := $(shell pyversions -vr debian/control) 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_pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') ifneq (,$(filter $(GCCVER),4.2 4.3)) @@ -45,7 +43,7 @@ endif configure: $(PYTHONS:%=build-%/configure-stamp) $(DBG_PYTHONS:%=dbg-build-%/configure-stamp) -build-%/configure-stamp: patch-stamp +build-%/configure-stamp: dh_testdir mkdir -p build-$* cd build-$* && python$* ../configure.py \ @@ -53,7 +51,7 @@ build-%/configure-stamp: patch-stamp -v /opt/trinity/share/sip/trinity -j $(SPLIT) touch $@ -dbg-build-%/configure-stamp: patch-stamp +dbg-build-%/configure-stamp: dh_testdir mkdir -p dbg-build-$* cd dbg-build-$* && python$*-dbg ../configure.py \ @@ -73,7 +71,7 @@ dbg-build-%/build-stamp: dbg-build-%/configure-stamp $(MAKE) -C dbg-build-$* touch $@ -clean: unpatch +clean: dh_testdir dh_testroot rm -f *-stamp diff --git a/debian/wheezy/libraries/python-trinity/debian/control b/debian/wheezy/libraries/python-trinity/debian/control index ef0d3115a..c69bdc5ea 100644 --- a/debian/wheezy/libraries/python-trinity/debian/control +++ b/debian/wheezy/libraries/python-trinity/debian/control @@ -4,17 +4,15 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 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> -Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-tqt-dev, tdelibs14-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-tqt-dev, tdelibs14-trinity-dev, python-sip4, python-sip4-dbg, python-sip4-dev Standards-Version: 3.8.4 Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php -XS-Python-Version: all Package: python-trinity-trinity Architecture: any Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt Replaces: python-trinity-trinity (<< 4:14.0.0) Breaks: python-trinity-trinity (<< 4:14.0.0) -XB-Python-Version: ${python:Versions} Provides: ${python:Provides} Conflicts: python-trinity-trinity Description: Trinity bindings for Python [Trinity] @@ -28,7 +26,6 @@ Architecture: any Replaces: python-trinity-trinity-dbg (<< 4:14.0.0) Breaks: python-trinity-trinity-dbg (<< 4:14.0.0) Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-tqt-dbg, ${shlibs:Depends} -XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes @@ -42,7 +39,6 @@ Architecture: all Replaces: python-trinity-trinity-dev (<< 4:14.0.0) Breaks: python-trinity-trinity-dev (<< 4:14.0.0) Depends: pytqt-tools, ${python:Depends} -XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python - Development files and scripts [Trinity] Development .sip files with definitions of PyKDE classes. They are needed to build PyKDE, but also as building blocks of other diff --git a/debian/wheezy/libraries/python-trinity/debian/pycompat b/debian/wheezy/libraries/python-trinity/debian/pycompat deleted file mode 100644 index 0cfbf0888..000000000 --- a/debian/wheezy/libraries/python-trinity/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/debian/wheezy/libraries/python-trinity/debian/rules b/debian/wheezy/libraries/python-trinity/debian/rules index d4dac70f3..473caac7d 100755 --- a/debian/wheezy/libraries/python-trinity/debian/rules +++ b/debian/wheezy/libraries/python-trinity/debian/rules @@ -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[,.]" \ && echo xz || echo bzip2) -include /usr/share/dpatch/dpatch.make # This has to be exported to make some magic below work. export DH_OPTIONS export QTDIR=/usr/share/qt3 @@ -31,8 +30,7 @@ endif PYTHONS := $(shell pyversions -vr debian/control) 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_pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') ifneq (,$(filter $(GCCVER),4.2 4.3)) @@ -45,7 +43,7 @@ endif configure: $(PYTHONS:%=build-%/configure-stamp) $(DBG_PYTHONS:%=dbg-build-%/configure-stamp) -build-%/configure-stamp: patch-stamp +build-%/configure-stamp: dh_testdir mkdir -p build-$* cd build-$* && python$* ../configure.py \ @@ -53,7 +51,7 @@ build-%/configure-stamp: patch-stamp -v /opt/trinity/share/sip/trinity -j $(SPLIT) touch $@ -dbg-build-%/configure-stamp: patch-stamp +dbg-build-%/configure-stamp: dh_testdir mkdir -p dbg-build-$* cd dbg-build-$* && python$*-dbg ../configure.py \ @@ -73,7 +71,7 @@ dbg-build-%/build-stamp: dbg-build-%/configure-stamp $(MAKE) -C dbg-build-$* touch $@ -clean: unpatch +clean: dh_testdir dh_testroot rm -f *-stamp |