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

13 years ago · 6a2c4d4369
parent d0076d9f9a
commit 6a2c4d4369
5 changed files with 7 additions and 4 deletions
--- a/debian/squeeze/kdelibs/debian/control
+++ b/debian/squeeze/kdelibs/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: Adeodato Simó <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
+Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-dev,
 binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
 libart-2.0-dev (>= 2.3.17), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
 libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
--- a/debian/squeeze/kdelibs/debian/rules
+++ b/debian/squeeze/kdelibs/debian/rules
@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.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
 include debian/cdbs/debian-qt-kde.mk
--- a/ubuntu/maverick/kdelibs/debian/control
+++ b/ubuntu/maverick/kdelibs/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: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
+Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-dev,
 binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
 libart-2.0-dev (>= 2.3.17), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
 libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
--- a/ubuntu/maverick/kdelibs/debian/patches/series
+++ b/ubuntu/maverick/kdelibs/debian/patches/series
@ -0,0 +1,3 @@
 kubuntu_19_debianize_useragent.diff
 kubuntu_38_no_generate_kdepot.diff
 kubuntu_64_rosetta_translation.diff
--- a/ubuntu/maverick/kdelibs/debian/rules
+++ b/ubuntu/maverick/kdelibs/debian/rules
@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.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
 include debian/cdbs/debian-qt-kde.mk