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/lenny/applications/ksensors/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/lenny/applications/ksensors/debian/control | 2 +- debian/lenny/applications/ksensors/debian/patches/series | 0 debian/lenny/applications/ksensors/debian/rules | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 debian/lenny/applications/ksensors/debian/patches/series (limited to 'debian/lenny/applications/ksensors') diff --git a/debian/lenny/applications/ksensors/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/ksensors/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/lenny/applications/ksensors/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/ksensors/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/ksensors/debian/control b/debian/lenny/applications/ksensors/debian/control index f0ba5d2d4..e7de2b810 100644 --- a/debian/lenny/applications/ksensors/debian/control +++ b/debian/lenny/applications/ksensors/debian/control @@ -2,7 +2,7 @@ Source: ksensors-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>> 5), cdbs, autotools-dev, automake, autoconf, libtool, libsensors4-dev, tdelibs14-trinity-dev, imagemagick +Build-Depends: debhelper (>> 5), quilt, cdbs, autotools-dev, automake, autoconf, libtool, libsensors4-dev, tdelibs14-trinity-dev, imagemagick Build-Conflicts: autoconf2.13 Standards-Version: 3.8.3 diff --git a/debian/lenny/applications/ksensors/debian/patches/series b/debian/lenny/applications/ksensors/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/lenny/applications/ksensors/debian/rules b/debian/lenny/applications/ksensors/debian/rules index 8b97ef030..8030d443a 100755 --- a/debian/lenny/applications/ksensors/debian/rules +++ b/debian/lenny/applications/ksensors/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 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -- cgit v1.2.1