From f24915471ea396c53670df51b2affc4af74373bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 15 Sep 2013 20:29:47 +0200 Subject: Switch patch system from simple to quilt on Debian and Ubuntu --- ubuntu/raring/applications/kerry/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/raring/applications/kerry/debian/control | 2 +- .../kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch | 9 +++++---- ubuntu/raring/applications/kerry/debian/patches/series | 3 +++ ubuntu/raring/applications/kerry/debian/rules | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 ubuntu/raring/applications/kerry/debian/patches/series (limited to 'ubuntu/raring/applications/kerry/debian') diff --git a/ubuntu/raring/applications/kerry/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/kerry/debian/cdbs/debian-qt-kde.mk index 4a11bc028..6b7b16643 100644 --- a/ubuntu/raring/applications/kerry/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/raring/applications/kerry/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/ubuntu/raring/applications/kerry/debian/control b/ubuntu/raring/applications/kerry/debian/control index 914717575..04a60414a 100644 --- a/ubuntu/raring/applications/kerry/debian/control +++ b/ubuntu/raring/applications/kerry/debian/control @@ -2,7 +2,7 @@ Source: kerry-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 5.0.0), cdbs, tdelibs14-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, tdelibs14-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/raring/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch b/ubuntu/raring/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch index 811069db9..7b06f8128 100644 --- a/ubuntu/raring/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch +++ b/ubuntu/raring/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch @@ -1,8 +1,9 @@ -diff -Nur kerry-0.2.1/kerry/src/Makefile.am kerry-0.2.1.new/kerry/src/Makefile.am ---- kerry-0.2.1/kerry/src/Makefile.am 2006-12-05 18:28:31.000000000 +0100 -+++ kerry-0.2.1.new/kerry/src/Makefile.am 2006-12-05 18:28:53.000000000 +0100 +Index: b/kerry/src/Makefile.am +=================================================================== +--- a/kerry/src/Makefile.am ++++ b/kerry/src/Makefile.am @@ -31,7 +31,7 @@ - kerry_la_LIBADD = -lkio -lkonq $(LIB_TDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_TDEABC) -lDCOP $(LIB_QT) $(LIB_TDECORE) + kerry_la_LIBADD = -ltdeio -lkonq $(LIB_TDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_TDEABC) -lDCOP $(LIB_QT) $(LIB_TDECORE) autostartdir = $(datadir)/autostart -autostart_DATA = kerry.autostart.desktop beagled.desktop diff --git a/ubuntu/raring/applications/kerry/debian/patches/series b/ubuntu/raring/applications/kerry/debian/patches/series new file mode 100644 index 000000000..f23925f70 --- /dev/null +++ b/ubuntu/raring/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/raring/applications/kerry/debian/rules b/ubuntu/raring/applications/kerry/debian/rules index dea466c17..7b26c5eb5 100755 --- a/ubuntu/raring/applications/kerry/debian/rules +++ b/ubuntu/raring/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/patchsys-quilt.mk # include /usr/share/cdbs/1/class/kde.mk include debian/cdbs/debian-qt-kde.mk -- cgit v1.2.1