From 2c2de32f46a3c2cde359493a39917d63e15865a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 18 Jul 2012 01:19:16 +0200 Subject: [PATCH] Superseded former way of managing patches for katapult on Debian and Ubuntu --- debian/squeeze/applications/katapult/debian/control | 2 +- debian/squeeze/applications/katapult/debian/rules | 2 +- ubuntu/maverick/applications/katapult/debian/control | 2 +- ubuntu/maverick/applications/katapult/debian/rules | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/squeeze/applications/katapult/debian/control b/debian/squeeze/applications/katapult/debian/control index b43c2565e..083574c75 100644 --- a/debian/squeeze/applications/katapult/debian/control +++ b/debian/squeeze/applications/katapult/debian/control @@ -2,7 +2,7 @@ Source: katapult-trinity Section: kde Priority: optional Maintainer: Timothy Pearson -Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), kdelibs4-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: katapult-trinity diff --git a/debian/squeeze/applications/katapult/debian/rules b/debian/squeeze/applications/katapult/debian/rules index f29a6a564..9f78e7c35 100755 --- a/debian/squeeze/applications/katapult/debian/rules +++ b/debian/squeeze/applications/katapult/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/simple-patchsys.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/ubuntu/maverick/applications/katapult/debian/control b/ubuntu/maverick/applications/katapult/debian/control index 833e4bdc0..bc21a1112 100644 --- a/ubuntu/maverick/applications/katapult/debian/control +++ b/ubuntu/maverick/applications/katapult/debian/control @@ -2,7 +2,7 @@ Source: katapult-trinity Section: kde Priority: optional Maintainer: Timothy Pearson -Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), kdelibs4-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: katapult-trinity diff --git a/ubuntu/maverick/applications/katapult/debian/rules b/ubuntu/maverick/applications/katapult/debian/rules index f29a6a564..9f78e7c35 100755 --- a/ubuntu/maverick/applications/katapult/debian/rules +++ b/ubuntu/maverick/applications/katapult/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/simple-patchsys.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man