summaryrefslogtreecommitdiffstats
path: root/debian/lenny/applications/kerry
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-15 20:29:47 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-07-18 00:23:09 +0200
commitf025c10ab2c705f3b86669b3dae1817c0cdd6d1d (patch)
treee9ca489d65a931d999e375719a0ddd5d670b77f6 /debian/lenny/applications/kerry
parent17ce56f2601667a7515bbe21b4754cdb51f0d650 (diff)
downloadtde-packaging-f025c10ab2c705f3b86669b3dae1817c0cdd6d1d.tar.gz
tde-packaging-f025c10ab2c705f3b86669b3dae1817c0cdd6d1d.zip
Switch patch system from simple to quilt on Debian and Ubuntu
(cherry picked from commit f24915471ea396c53670df51b2affc4af74373bf)
Diffstat (limited to 'debian/lenny/applications/kerry')
-rw-r--r--debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kerry/debian/control2
-rw-r--r--debian/lenny/applications/kerry/debian/patches/series0
-rwxr-xr-xdebian/lenny/applications/kerry/debian/rules2
4 files changed, 4 insertions, 2 deletions
diff --git a/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/debian/lenny/applications/kerry/debian/control b/debian/lenny/applications/kerry/debian/control
index a88165323..50a7b8707 100644
--- a/debian/lenny/applications/kerry/debian/control
+++ b/debian/lenny/applications/kerry/debian/control
@@ -2,7 +2,7 @@ Source: kerry-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-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/lenny/applications/kerry/debian/patches/series b/debian/lenny/applications/kerry/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/lenny/applications/kerry/debian/patches/series
diff --git a/debian/lenny/applications/kerry/debian/rules b/debian/lenny/applications/kerry/debian/rules
index 4cbb0340e..b00341b4b 100755
--- a/debian/lenny/applications/kerry/debian/rules
+++ b/debian/lenny/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