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

13 years ago · aab9375038
parent ab7a30e191
commit aab9375038
6 changed files with 10 additions and 4 deletions
--- a/debian/squeeze/kdeadmin/debian/control
+++ b/debian/squeeze/kdeadmin/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>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), quilt, docbook-to-man, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Package: kdeadmin-trinity
--- a/debian/squeeze/kdeadmin/debian/patches/series
+++ b/debian/squeeze/kdeadmin/debian/patches/series
@ -0,0 +1,3 @@
 common/04_am_maintainer_mode.diff
 common/06_disable_no_undefined.diff
 common/kubuntu_01_kdepot.diff
--- a/debian/squeeze/kdeadmin/debian/rules
+++ b/debian/squeeze/kdeadmin/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
--- a/ubuntu/maverick/kdeadmin/debian/control
+++ b/ubuntu/maverick/kdeadmin/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>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), quilt, docbook-to-man, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Package: kdeadmin-trinity
--- a/ubuntu/maverick/kdeadmin/debian/patches/series
+++ b/ubuntu/maverick/kdeadmin/debian/patches/series
@ -0,0 +1,3 @@
 common/04_am_maintainer_mode.diff
 common/06_disable_no_undefined.diff
 common/kubuntu_01_kdepot.diff
--- a/ubuntu/maverick/kdeadmin/debian/rules
+++ b/ubuntu/maverick/kdeadmin/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