Superseded former way of managing patches for kdetoys on Debian and Ubuntu

6 files changed, 10 insertions, 4 deletions

diff --git a/debian/squeeze/kdetoys/debian/control b/debian/squeeze/kdetoys/debian/control
index f45f650e9..63d4600e5 100644
--- a/debian/squeeze/kdetoys/debian/control
+++ b/debian/squeeze/kdetoys/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdetoys-trinity
diff --git a/debian/squeeze/kdetoys/debian/patches/series b/debian/squeeze/kdetoys/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/squeeze/kdetoys/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdetoys/debian/rules b/debian/squeeze/kdetoys/debian/rules
index db356ba14..f8acbaee6 100755
--- a/debian/squeeze/kdetoys/debian/rules
+++ b/debian/squeeze/kdetoys/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/ubuntu/maverick/kdetoys/debian/control b/ubuntu/maverick/kdetoys/debian/control
index c89bb7701..e4923cd1c 100644
--- a/ubuntu/maverick/kdetoys/debian/control
+++ b/ubuntu/maverick/kdetoys/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdetoys-trinity
diff --git a/ubuntu/maverick/kdetoys/debian/patches/series b/ubuntu/maverick/kdetoys/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/kdetoys/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdetoys/debian/rules b/ubuntu/maverick/kdetoys/debian/rules
index db356ba14..f8acbaee6 100755
--- a/ubuntu/maverick/kdetoys/debian/rules
+++ b/ubuntu/maverick/kdetoys/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde