summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-07-16 13:43:59 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-07-23 23:19:24 +0200
commit90f1638a3ceb347f2b8a6c5629b3ee7fbb628178 (patch)
tree6f5da7f20ad1ddf28216475054064bf043a5e2ac
parent70e0bde7571ae74ab259642595ba9c8ae70308e1 (diff)
downloadtde-packaging-90f1638a3ceb347f2b8a6c5629b3ee7fbb628178.tar.gz
tde-packaging-90f1638a3ceb347f2b8a6c5629b3ee7fbb628178.zip
Superseded former way of managing patches for python-trinity on Debian and Ubuntu
-rw-r--r--debian/squeeze/libraries/python-trinity/debian/control2
-rwxr-xr-xdebian/squeeze/libraries/python-trinity/debian/rules8
-rw-r--r--ubuntu/maverick/libraries/python-trinity/debian/control2
-rwxr-xr-xubuntu/maverick/libraries/python-trinity/debian/rules8
4 files changed, 10 insertions, 10 deletions
diff --git a/debian/squeeze/libraries/python-trinity/debian/control b/debian/squeeze/libraries/python-trinity/debian/control
index 7f6e42bca..bcc228eb1 100644
--- a/debian/squeeze/libraries/python-trinity/debian/control
+++ b/debian/squeeze/libraries/python-trinity/debian/control
@@ -4,7 +4,7 @@ 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-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, 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-central (>= 0.6.11), python-sip4, python-sip4-dbg, python-sip4-dev
Standards-Version: 3.8.4
Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
XS-Python-Version: all
diff --git a/debian/squeeze/libraries/python-trinity/debian/rules b/debian/squeeze/libraries/python-trinity/debian/rules
index 85c43a0fe..98178d114 100755
--- a/debian/squeeze/libraries/python-trinity/debian/rules
+++ b/debian/squeeze/libraries/python-trinity/debian/rules
@@ -11,7 +11,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-include /usr/share/dpatch/dpatch.make
+#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
@@ -39,7 +39,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 \
@@ -47,7 +47,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 \
@@ -67,7 +67,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/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control
index 73729642b..2868ae41c 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/control
+++ b/ubuntu/maverick/libraries/python-trinity/debian/control
@@ -4,7 +4,7 @@ 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-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, 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-central (>= 0.6.11), python-sip4, python-sip4-dbg, python-sip4-dev
Standards-Version: 3.8.4
Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
XS-Python-Version: all
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/rules b/ubuntu/maverick/libraries/python-trinity/debian/rules
index 85c43a0fe..98178d114 100755
--- a/ubuntu/maverick/libraries/python-trinity/debian/rules
+++ b/ubuntu/maverick/libraries/python-trinity/debian/rules
@@ -11,7 +11,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-include /usr/share/dpatch/dpatch.make
+#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
@@ -39,7 +39,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 \
@@ -47,7 +47,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 \
@@ -67,7 +67,7 @@ dbg-build-%/build-stamp: dbg-build-%/configure-stamp
$(MAKE) -C dbg-build-$*
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f *-stamp