From 6a2c4d436944390c16266544e383f99246fd8da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 7 Jul 2012 17:36:50 +0200 Subject: Superseded former way of managing patches for kdelibs on Debian and Ubuntu --- debian/squeeze/kdelibs/debian/control | 2 +- debian/squeeze/kdelibs/debian/rules | 2 +- ubuntu/maverick/kdelibs/debian/control | 2 +- ubuntu/maverick/kdelibs/debian/patches/series | 3 +++ ubuntu/maverick/kdelibs/debian/rules | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 ubuntu/maverick/kdelibs/debian/patches/series diff --git a/debian/squeeze/kdelibs/debian/control b/debian/squeeze/kdelibs/debian/control index d654cb80c..14b53fd37 100644 --- a/debian/squeeze/kdelibs/debian/control +++ b/debian/squeeze/kdelibs/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Adeodato Simó , Ana Beatriz Guerrero Lopez , Daniel Schepler , Fathi Boudra , Sune Vuorela -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], diff --git a/debian/squeeze/kdelibs/debian/rules b/debian/squeeze/kdelibs/debian/rules index 5ce617371..b383e5381 100755 --- 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 diff --git a/ubuntu/maverick/kdelibs/debian/control b/ubuntu/maverick/kdelibs/debian/control index 764069d21..31593cbd1 100644 --- a/ubuntu/maverick/kdelibs/debian/control +++ b/ubuntu/maverick/kdelibs/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Daniel Schepler , Fathi Boudra , Sune Vuorela -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], diff --git a/ubuntu/maverick/kdelibs/debian/patches/series b/ubuntu/maverick/kdelibs/debian/patches/series new file mode 100644 index 000000000..75a6e44a8 --- /dev/null +++ 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 diff --git a/ubuntu/maverick/kdelibs/debian/rules b/ubuntu/maverick/kdelibs/debian/rules index 5ce617371..b383e5381 100755 --- 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 -- cgit v1.2.1