From 4d5343230ab62d5e55efd49f2d75a4ea030dee88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 14 Jul 2012 19:02:47 +0200 Subject: [PATCH] Superseded former way of managing patches for kdewebdev on Debian and Ubuntu --- debian/squeeze/kdewebdev/debian/control | 2 +- debian/squeeze/kdewebdev/debian/patches/series | 1 + debian/squeeze/kdewebdev/debian/rules | 2 +- ubuntu/maverick/kdewebdev/debian/control | 2 +- ubuntu/maverick/kdewebdev/debian/patches/series | 1 + ubuntu/maverick/kdewebdev/debian/rules | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 debian/squeeze/kdewebdev/debian/patches/series create mode 100644 ubuntu/maverick/kdewebdev/debian/patches/series diff --git a/debian/squeeze/kdewebdev/debian/control b/debian/squeeze/kdewebdev/debian/control index 4a4dd1f6c..6c0818aeb 100644 --- a/debian/squeeze/kdewebdev/debian/control +++ b/debian/squeeze/kdewebdev/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Adeodato Simó , Ana Beatriz Guerrero Lopez , Armin Berres , Sune Vuorela -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://trinity.pearsoncomputing.net diff --git a/debian/squeeze/kdewebdev/debian/patches/series b/debian/squeeze/kdewebdev/debian/patches/series new file mode 100644 index 000000000..8f8f0bd6b --- /dev/null +++ b/debian/squeeze/kdewebdev/debian/patches/series @@ -0,0 +1 @@ +common/kubuntu_01_kdepot.diff diff --git a/debian/squeeze/kdewebdev/debian/rules b/debian/squeeze/kdewebdev/debian/rules index cce47390d..119f28b3c 100755 --- a/debian/squeeze/kdewebdev/debian/rules +++ b/debian/squeeze/kdewebdev/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 diff --git a/ubuntu/maverick/kdewebdev/debian/control b/ubuntu/maverick/kdewebdev/debian/control index 40a7cdfdd..9b2e4beb7 100644 --- a/ubuntu/maverick/kdewebdev/debian/control +++ b/ubuntu/maverick/kdewebdev/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Armin Berres , Sune Vuorela -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://trinity.pearsoncomputing.net diff --git a/ubuntu/maverick/kdewebdev/debian/patches/series b/ubuntu/maverick/kdewebdev/debian/patches/series new file mode 100644 index 000000000..8f8f0bd6b --- /dev/null +++ b/ubuntu/maverick/kdewebdev/debian/patches/series @@ -0,0 +1 @@ +common/kubuntu_01_kdepot.diff diff --git a/ubuntu/maverick/kdewebdev/debian/rules b/ubuntu/maverick/kdewebdev/debian/rules index cce47390d..119f28b3c 100755 --- a/ubuntu/maverick/kdewebdev/debian/rules +++ b/ubuntu/maverick/kdewebdev/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