summaryrefslogtreecommitdiffstats
path: root/debian/lenny/applications/adept
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>2013-09-15 20:29:47 +0200
commitf24915471ea396c53670df51b2affc4af74373bf (patch)
tree04e25e027d641ad6b82ba5828ae9a9c72924b1f1 /debian/lenny/applications/adept
parent1c7a831407fea1378682db5c21b06e792343be06 (diff)
downloadtde-packaging-f24915471ea396c53670df51b2affc4af74373bf.tar.gz
tde-packaging-f24915471ea396c53670df51b2affc4af74373bf.zip
Switch patch system from simple to quilt on Debian and Ubuntu
Diffstat (limited to 'debian/lenny/applications/adept')
-rw-r--r--debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/adept/debian/control2
-rw-r--r--debian/lenny/applications/adept/debian/patches/.gitignore0
-rw-r--r--debian/lenny/applications/adept/debian/patches/series1
-rwxr-xr-xdebian/lenny/applications/adept/debian/rules2
5 files changed, 5 insertions, 2 deletions
diff --git a/debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/applications/adept/debian/control b/debian/lenny/applications/adept/debian/control
index 12796cfa7..95fee8d1e 100644
--- a/debian/lenny/applications/adept/debian/control
+++ b/debian/lenny/applications/adept/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Peter Rockai <me@mornfall.net>
Uploaders: Isaac Clerencia <isaac@debian.org>, Enrico Zini <enrico@debian.org>
-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/lenny/applications/adept/debian/patches/.gitignore b/debian/lenny/applications/adept/debian/patches/.gitignore
deleted file mode 100644
index e69de29bb..000000000
--- a/debian/lenny/applications/adept/debian/patches/.gitignore
+++ /dev/null
diff --git a/debian/lenny/applications/adept/debian/patches/series b/debian/lenny/applications/adept/debian/patches/series
new file mode 100644
index 000000000..ad5b05138
--- /dev/null
+++ b/debian/lenny/applications/adept/debian/patches/series
@@ -0,0 +1 @@
+remove_apport.diff
diff --git a/debian/lenny/applications/adept/debian/rules b/debian/lenny/applications/adept/debian/rules
index 742307eb6..0e554102b 100755
--- a/debian/lenny/applications/adept/debian/rules
+++ b/debian/lenny/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