diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-15 20:29:47 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-15 20:29:47 +0200 |
commit | f24915471ea396c53670df51b2affc4af74373bf (patch) | |
tree | 04e25e027d641ad6b82ba5828ae9a9c72924b1f1 /ubuntu/maverick/tdegames/debian | |
parent | 1c7a831407fea1378682db5c21b06e792343be06 (diff) | |
download | tde-packaging-f24915471ea396c53670df51b2affc4af74373bf.tar.gz tde-packaging-f24915471ea396c53670df51b2affc4af74373bf.zip |
Switch patch system from simple to quilt on Debian and Ubuntu
Diffstat (limited to 'ubuntu/maverick/tdegames/debian')
-rw-r--r-- | ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk | 2 | ||||
-rw-r--r-- | ubuntu/maverick/tdegames/debian/control | 2 | ||||
-rw-r--r-- | ubuntu/maverick/tdegames/debian/patches/series | 3 | ||||
-rwxr-xr-x | ubuntu/maverick/tdegames/debian/rules | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk index 4a11bc028..6b7b16643 100644 --- a/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/tdegames/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/ubuntu/maverick/tdegames/debian/control b/ubuntu/maverick/tdegames/debian/control index 80c1c1a03..419fbc5fd 100644 --- a/ubuntu/maverick/tdegames/debian/control +++ b/ubuntu/maverick/tdegames/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, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc Standards-Version: 3.8.4 diff --git a/ubuntu/maverick/tdegames/debian/patches/series b/ubuntu/maverick/tdegames/debian/patches/series new file mode 100644 index 000000000..6b3ddc8ec --- /dev/null +++ b/ubuntu/maverick/tdegames/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/tdegames/debian/rules b/ubuntu/maverick/tdegames/debian/rules index 085eb8404..7f682874f 100755 --- a/ubuntu/maverick/tdegames/debian/rules +++ b/ubuntu/maverick/tdegames/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/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk export kde_bindir = /opt/trinity/games |