From 0c52a85c8361e5b45283e479e70e5d26a7b806a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 18 Jul 2012 03:32:13 +0200 Subject: [PATCH] Superseded former way of managing patches for kerry on Debian and Ubuntu --- debian/squeeze/applications/kerry/debian/control | 2 +- debian/squeeze/applications/kerry/debian/rules | 2 +- ubuntu/maverick/applications/kerry/debian/control | 2 +- ubuntu/maverick/applications/kerry/debian/patches/series | 3 +++ ubuntu/maverick/applications/kerry/debian/rules | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 ubuntu/maverick/applications/kerry/debian/patches/series diff --git a/debian/squeeze/applications/kerry/debian/control b/debian/squeeze/applications/kerry/debian/control index a88165323..50a7b8707 100644 --- a/debian/squeeze/applications/kerry/debian/control +++ b/debian/squeeze/applications/kerry/debian/control @@ -2,7 +2,7 @@ Source: kerry-trinity Section: kde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev Homepage: http://en.opensuse.org/Kerry Standards-Version: 3.8.4 diff --git a/debian/squeeze/applications/kerry/debian/rules b/debian/squeeze/applications/kerry/debian/rules index e3861ca8d..65b0fc115 100755 --- a/debian/squeeze/applications/kerry/debian/rules +++ b/debian/squeeze/applications/kerry/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +#include /usr/share/cdbs/1/rules/simple-patchsys.mk # include /usr/share/cdbs/1/class/kde.mk include debian/cdbs/debian-qt-kde.mk diff --git a/ubuntu/maverick/applications/kerry/debian/control b/ubuntu/maverick/applications/kerry/debian/control index 76f3c5184..4b39027cc 100644 --- a/ubuntu/maverick/applications/kerry/debian/control +++ b/ubuntu/maverick/applications/kerry/debian/control @@ -2,7 +2,7 @@ Source: kerry-trinity Section: kde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev Homepage: http://en.opensuse.org/Kerry Standards-Version: 3.8.4 diff --git a/ubuntu/maverick/applications/kerry/debian/patches/series b/ubuntu/maverick/applications/kerry/debian/patches/series new file mode 100644 index 000000000..f23925f70 --- /dev/null +++ b/ubuntu/maverick/applications/kerry/debian/patches/series @@ -0,0 +1,3 @@ +kubuntu_03_no_beagle_autostart.patch +kubuntu_04_no_core_kmenu_entry.desktop.patch +kubuntu_05_shortkey.patch diff --git a/ubuntu/maverick/applications/kerry/debian/rules b/ubuntu/maverick/applications/kerry/debian/rules index e3861ca8d..65b0fc115 100755 --- a/ubuntu/maverick/applications/kerry/debian/rules +++ b/ubuntu/maverick/applications/kerry/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +#include /usr/share/cdbs/1/rules/simple-patchsys.mk # include /usr/share/cdbs/1/class/kde.mk include debian/cdbs/debian-qt-kde.mk