summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-07-12 04:25:06 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-07-23 23:18:37 +0200
commiteb2d5ae1efd89528a8d1ccabd80568a90a5571a1 (patch)
tree3f2aa95c03069e1a12b619d82eff2f1b0562830a /ubuntu
parent95a7d476f2b01934bcfb29008283ac1f83afca24 (diff)
downloadtde-packaging-eb2d5ae1efd89528a8d1ccabd80568a90a5571a1.tar.gz
tde-packaging-eb2d5ae1efd89528a8d1ccabd80568a90a5571a1.zip
Superseded former way of managing patches for kdeaddons on Debian and Ubuntu
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/kdeaddons/debian/control2
-rw-r--r--ubuntu/maverick/kdeaddons/debian/patches/series3
-rwxr-xr-xubuntu/maverick/kdeaddons/debian/rules2
3 files changed, 5 insertions, 2 deletions
diff --git a/ubuntu/maverick/kdeaddons/debian/control b/ubuntu/maverick/kdeaddons/debian/control
index 8e6600157..62bc775d9 100644
--- a/ubuntu/maverick/kdeaddons/debian/control
+++ b/ubuntu/maverick/kdeaddons/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.8++-dev | libdb++-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.8++-dev | libdb++-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdeaddons-trinity
diff --git a/ubuntu/maverick/kdeaddons/debian/patches/series b/ubuntu/maverick/kdeaddons/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/kdeaddons/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdeaddons/debian/rules b/ubuntu/maverick/kdeaddons/debian/rules
index 8e11cd8a6..369d6c5ae 100755
--- a/ubuntu/maverick/kdeaddons/debian/rules
+++ b/ubuntu/maverick/kdeaddons/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde