From f025c10ab2c705f3b86669b3dae1817c0cdd6d1d 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 (cherry picked from commit f24915471ea396c53670df51b2affc4af74373bf) --- debian/lenny/applications/kdesudo/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/lenny/applications/kdesudo/debian/control | 2 +- debian/lenny/applications/kdesudo/debian/patches/.gitignore | 0 debian/lenny/applications/kdesudo/debian/patches/series | 0 debian/lenny/applications/kdesudo/debian/rules | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 debian/lenny/applications/kdesudo/debian/patches/.gitignore create mode 100644 debian/lenny/applications/kdesudo/debian/patches/series (limited to 'debian/lenny/applications/kdesudo') diff --git a/debian/lenny/applications/kdesudo/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdesudo/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kdesudo/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kdesudo/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/kdesudo/debian/control b/debian/lenny/applications/kdesudo/debian/control index f14497994..6d5b74a48 100644 --- a/debian/lenny/applications/kdesudo/debian/control +++ b/debian/lenny/applications/kdesudo/debian/control @@ -2,7 +2,7 @@ Source: kdesudo-trinity Section: kde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>> 5), cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>> 5), quilt, cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kdesudo-trinity diff --git a/debian/lenny/applications/kdesudo/debian/patches/.gitignore b/debian/lenny/applications/kdesudo/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/lenny/applications/kdesudo/debian/patches/series b/debian/lenny/applications/kdesudo/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/lenny/applications/kdesudo/debian/rules b/debian/lenny/applications/kdesudo/debian/rules index 1f131406e..da76f8d08 100755 --- a/debian/lenny/applications/kdesudo/debian/rules +++ b/debian/lenny/applications/kdesudo/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 debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde -- cgit v1.2.3