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 --- debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/squeeze/applications/adept/debian/control | 2 +- debian/squeeze/applications/adept/debian/patches/.gitignore | 0 debian/squeeze/applications/adept/debian/patches/series | 1 + debian/squeeze/applications/adept/debian/rules | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 debian/squeeze/applications/adept/debian/patches/.gitignore create mode 100644 debian/squeeze/applications/adept/debian/patches/series (limited to 'debian/squeeze/applications/adept') diff --git a/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/applications/adept/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/squeeze/applications/adept/debian/control b/debian/squeeze/applications/adept/debian/control index 12796cfa7..95fee8d1e 100644 --- a/debian/squeeze/applications/adept/debian/control +++ b/debian/squeeze/applications/adept/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Peter Rockai Uploaders: Isaac Clerencia , Enrico Zini -Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>> 4.1), quilt, dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: adept-trinity diff --git a/debian/squeeze/applications/adept/debian/patches/.gitignore b/debian/squeeze/applications/adept/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/squeeze/applications/adept/debian/patches/series b/debian/squeeze/applications/adept/debian/patches/series new file mode 100644 index 000000000..ad5b05138 --- /dev/null +++ b/debian/squeeze/applications/adept/debian/patches/series @@ -0,0 +1 @@ +remove_apport.diff diff --git a/debian/squeeze/applications/adept/debian/rules b/debian/squeeze/applications/adept/debian/rules index 742307eb6..0e554102b 100755 --- a/debian/squeeze/applications/adept/debian/rules +++ b/debian/squeeze/applications/adept/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -- cgit v1.2.1