summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-07-12 00:38:13 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-07-23 23:18:31 +0200
commit5774aff96d3d9caee7f938bc24b54759bd3aa2f9 (patch)
treeb41b55b1a0d2825ae97b37a1f64ac0e5596df6b7
parent302f8cf4d946334e3b580aec965dde85adcabb36 (diff)
downloadtde-packaging-5774aff96d3d9caee7f938bc24b54759bd3aa2f9.tar.gz
tde-packaging-5774aff96d3d9caee7f938bc24b54759bd3aa2f9.zip
Superseded former way of managing patches for kdegames on Debian and Ubuntu
-rw-r--r--debian/squeeze/kdegames/debian/control2
-rw-r--r--debian/squeeze/kdegames/debian/patches/series3
-rwxr-xr-xdebian/squeeze/kdegames/debian/rules2
-rw-r--r--ubuntu/maverick/kdegames/debian/control2
-rw-r--r--ubuntu/maverick/kdegames/debian/patches/series3
-rwxr-xr-xubuntu/maverick/kdegames/debian/rules2
6 files changed, 10 insertions, 4 deletions
diff --git a/debian/squeeze/kdegames/debian/control b/debian/squeeze/kdegames/debian/control
index f73fcc774..06e3b9b85 100644
--- a/debian/squeeze/kdegames/debian/control
+++ b/debian/squeeze/kdegames/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>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libtool, groff-base, sharutils, bzip2, sharutils, libogg-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 (>= 4:3.5.10), libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, kdelibs4-trinity-doc
Standards-Version: 3.8.4
diff --git a/debian/squeeze/kdegames/debian/patches/series b/debian/squeeze/kdegames/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/squeeze/kdegames/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/debian/squeeze/kdegames/debian/rules b/debian/squeeze/kdegames/debian/rules
index 92c1bc149..a51ffb02d 100755
--- a/debian/squeeze/kdegames/debian/rules
+++ b/debian/squeeze/kdegames/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
export kde_bindir = /opt/trinity/games
diff --git a/ubuntu/maverick/kdegames/debian/control b/ubuntu/maverick/kdegames/debian/control
index a89543d16..1bd431a13 100644
--- a/ubuntu/maverick/kdegames/debian/control
+++ b/ubuntu/maverick/kdegames/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>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libtool, groff-base, sharutils, bzip2, sharutils, libogg-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 (>= 4:3.5.10), libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, kdelibs4-trinity-doc
Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/kdegames/debian/patches/series b/ubuntu/maverick/kdegames/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/kdegames/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/kdegames/debian/rules b/ubuntu/maverick/kdegames/debian/rules
index 92c1bc149..a51ffb02d 100755
--- a/ubuntu/maverick/kdegames/debian/rules
+++ b/ubuntu/maverick/kdegames/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
export kde_bindir = /opt/trinity/games