diff --git a/debian/squeeze/kdeadmin/debian/control b/debian/squeeze/kdeadmin/debian/control index 5258ab6e7..4f9637854 100644 --- a/debian/squeeze/kdeadmin/debian/control +++ b/debian/squeeze/kdeadmin/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Fathi Boudra , Modestas Vainius , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), quilt, docbook-to-man, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kdeadmin-trinity diff --git a/debian/squeeze/kdeadmin/debian/patches/series b/debian/squeeze/kdeadmin/debian/patches/series new file mode 100644 index 000000000..6b3ddc8ec --- /dev/null +++ b/debian/squeeze/kdeadmin/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/kdeadmin/debian/rules b/debian/squeeze/kdeadmin/debian/rules index dec35a720..e2b266555 100755 --- a/debian/squeeze/kdeadmin/debian/rules +++ b/debian/squeeze/kdeadmin/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/kdeadmin/debian/control b/ubuntu/maverick/kdeadmin/debian/control index 33e19eaf9..f5e8b74f6 100644 --- a/ubuntu/maverick/kdeadmin/debian/control +++ b/ubuntu/maverick/kdeadmin/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Fathi Boudra , Modestas Vainius , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), quilt, docbook-to-man, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kdeadmin-trinity diff --git a/ubuntu/maverick/kdeadmin/debian/patches/series b/ubuntu/maverick/kdeadmin/debian/patches/series new file mode 100644 index 000000000..6b3ddc8ec --- /dev/null +++ b/ubuntu/maverick/kdeadmin/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/kdeadmin/debian/rules b/ubuntu/maverick/kdeadmin/debian/rules index dec35a720..e2b266555 100755 --- a/ubuntu/maverick/kdeadmin/debian/rules +++ b/ubuntu/maverick/kdeadmin/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