From 824d117acca49a5897b7c54603fe0e739993a3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 13 Jul 2012 08:48:24 +0200 Subject: [PATCH] Superseded former way of managing patches for kdesdk on Debian and Ubuntu --- debian/squeeze/kdesdk/debian/control | 2 +- debian/squeeze/kdesdk/debian/patches/series | 3 +++ debian/squeeze/kdesdk/debian/rules | 2 +- ubuntu/maverick/kdesdk/debian/control | 2 +- ubuntu/maverick/kdesdk/debian/patches/series | 3 +++ ubuntu/maverick/kdesdk/debian/rules | 2 +- 6 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 debian/squeeze/kdesdk/debian/patches/series create mode 100644 ubuntu/maverick/kdesdk/debian/patches/series diff --git a/debian/squeeze/kdesdk/debian/control b/debian/squeeze/kdesdk/debian/control index e240524d0..97970150a 100644 --- a/debian/squeeze/kdesdk/debian/control +++ b/debian/squeeze/kdesdk/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Fathi Boudra , Josh Metzler , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, pkg-config, kdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex, kdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10), libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev, diff --git a/debian/squeeze/kdesdk/debian/patches/series b/debian/squeeze/kdesdk/debian/patches/series new file mode 100644 index 000000000..6b3ddc8ec --- /dev/null +++ b/debian/squeeze/kdesdk/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/kdesdk/debian/rules b/debian/squeeze/kdesdk/debian/rules index 15d420b54..2d91925b6 100755 --- a/debian/squeeze/kdesdk/debian/rules +++ b/debian/squeeze/kdesdk/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/kdesdk/debian/control b/ubuntu/maverick/kdesdk/debian/control index cd3d6c8fa..6cb28444c 100644 --- a/ubuntu/maverick/kdesdk/debian/control +++ b/ubuntu/maverick/kdesdk/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Fathi Boudra , Josh Metzler , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, pkg-config, kdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex, kdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10), libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev, diff --git a/ubuntu/maverick/kdesdk/debian/patches/series b/ubuntu/maverick/kdesdk/debian/patches/series new file mode 100644 index 000000000..6b3ddc8ec --- /dev/null +++ b/ubuntu/maverick/kdesdk/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/kdesdk/debian/rules b/ubuntu/maverick/kdesdk/debian/rules index 15d420b54..2d91925b6 100755 --- a/ubuntu/maverick/kdesdk/debian/rules +++ b/ubuntu/maverick/kdesdk/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