diff options
Diffstat (limited to 'debian/lenny/applications')
205 files changed, 227 insertions, 103 deletions
diff --git a/debian/lenny/applications/abakus/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/abakus/debian/cdbs/debian-qt-kde.mk index 5e704aa4a..c5d8ecfd3 100644 --- a/debian/lenny/applications/abakus/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/abakus/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/debian/lenny/applications/abakus/debian/control b/debian/lenny/applications/abakus/debian/control index a5cd5363f..9b924007c 100644 --- a/debian/lenny/applications/abakus/debian/control +++ b/debian/lenny/applications/abakus/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de> -Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, kdelibs4-trinity-dev, chrpath, bison, flex +Build-Depends: autotools-dev, debhelper (>= 4.1.0), quilt, cdbs (>= 0.4.0), cmake, imagemagick, kdelibs4-trinity-dev, chrpath, bison, flex Standards-Version: 3.8.4 Package: abakus-trinity diff --git a/debian/lenny/applications/adept/debian/patches/.gitignore b/debian/lenny/applications/abakus/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/adept/debian/patches/.gitignore +++ b/debian/lenny/applications/abakus/debian/patches/series diff --git a/debian/lenny/applications/abakus/debian/rules b/debian/lenny/applications/abakus/debian/rules index c856f7cae..83d7d7fb4 100755 --- a/debian/lenny/applications/abakus/debian/rules +++ b/debian/lenny/applications/abakus/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 include debian/cdbs/debian-qt-kde.mk diff --git a/debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/adept/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/debian/lenny/applications/adept/debian/control b/debian/lenny/applications/adept/debian/control index 64cc6d154..f7e39d89b 100644 --- a/debian/lenny/applications/adept/debian/control +++ b/debian/lenny/applications/adept/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Peter Rockai <me@mornfall.net> Uploaders: Isaac Clerencia <isaac@debian.org>, Enrico Zini <enrico@debian.org> -Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), kdelibs4-trinity-dev (>= 3.5.0), sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>> 4.1), quilt, dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), kdelibs4-trinity-dev (>= 3.5.0), sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: adept-trinity diff --git a/debian/lenny/applications/adept/debian/patches/series b/debian/lenny/applications/adept/debian/patches/series new file mode 100644 index 000000000..ad5b05138 --- /dev/null +++ b/debian/lenny/applications/adept/debian/patches/series @@ -0,0 +1 @@ +remove_apport.diff diff --git a/debian/lenny/applications/adept/debian/rules b/debian/lenny/applications/adept/debian/rules index de6788eff..d9d20bace 100755 --- a/debian/lenny/applications/adept/debian/rules +++ b/debian/lenny/applications/adept/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/lenny/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk index 345cc0a61..fb36ac52f 100644 --- a/debian/lenny/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/debian/lenny/applications/amarok.cmake/debian/rules b/debian/lenny/applications/amarok.cmake/debian/rules index 4fd9a743d..7f157aa03 100755 --- a/debian/lenny/applications/amarok.cmake/debian/rules +++ b/debian/lenny/applications/amarok.cmake/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 include debian/cdbs/debian-qt-kde.mk diff --git a/debian/lenny/applications/amarok/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/amarok/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/amarok/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/amarok/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/debian/lenny/applications/basket/debian/control b/debian/lenny/applications/basket/debian/control index 3f4027902..f78a6d8f7 100644 --- a/debian/lenny/applications/basket/debian/control +++ b/debian/lenny/applications/basket/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: libasound2-dev, debhelper (>= 5), kdelibs4-trinity-dev (>= 4:3.5.6), kdepim-trinity-dev (>= 4:3.5.6), libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs, debhelper (>= 5), kdelibs4-trinity-dev (>= 4:3.5.6), kdepim-trinity-dev (>= 4:3.5.6), libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: basket-trinity diff --git a/debian/lenny/applications/basket/debian/rules b/debian/lenny/applications/basket/debian/rules index 5a52ee2fc..cb18fa380 100755 --- a/debian/lenny/applications/basket/debian/rules +++ b/debian/lenny/applications/basket/debian/rules @@ -26,10 +26,10 @@ else CFLAGS += -O2 endif -include /usr/share/quilt/quilt.make +include /usr/share/cdbs/1/rules/patchsys-quilt.mk -config.status: $(QUILT_STAMPFN) +config.status: post-patches dh_testdir test -e config.sub -a -L config.sub || \ ln -sf /usr/share/misc/config.sub config.sub @@ -59,7 +59,7 @@ build-stamp: config.status touch build-stamp -clean: unpatch +clean:: dh_testdir dh_testroot diff --git a/debian/lenny/applications/bibletime/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/bibletime/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/bibletime/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/bibletime/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/debian/lenny/applications/bibletime/debian/patches/.gitignore b/debian/lenny/applications/bibletime/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/bibletime/debian/patches/.gitignore +++ b/debian/lenny/applications/bibletime/debian/patches/series diff --git a/debian/lenny/applications/bibletime/debian/rules b/debian/lenny/applications/bibletime/debian/rules index 225ac5e18..9000a60dc 100755 --- a/debian/lenny/applications/bibletime/debian/rules +++ b/debian/lenny/applications/bibletime/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_DH_INSTALL_SOURCEDIR := debian diff --git a/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/compizconfig-backend-kconfig/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/debian/lenny/applications/compizconfig-backend-kconfig/debian/control b/debian/lenny/applications/compizconfig-backend-kconfig/debian/control index 33a99eec5..2ba2cbf96 100644 --- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/control +++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/control @@ -2,7 +2,7 @@ Source: compizconfig-backend-kconfig-trinity Section: libs Priority: extra Maintainer: Timothy Pearosn <kb9vqf@pearsoncomputing.net> -Build-Depends: cdbs, debhelper (>= 5), compiz-trinity-dev, pkg-config, intltool, kdelibs4-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, compiz-trinity-dev, pkg-config, intltool, kdelibs4-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: compizconfig-backend-kconfig-trinity diff --git a/debian/lenny/applications/compizconfig-backend-kconfig/debian/patches/.gitignore b/debian/lenny/applications/compizconfig-backend-kconfig/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/patches/.gitignore +++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/patches/series diff --git a/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules b/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules index 806eaae15..ac4f53c0c 100755 --- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules +++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/lenny/applications/digikam/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/digikam/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/digikam/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/digikam/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/debian/lenny/applications/digikam/debian/control b/debian/lenny/applications/digikam/debian/control index 32c14ae8d..726f494d7 100644 --- a/debian/lenny/applications/digikam/debian/control +++ b/debian/lenny/applications/digikam/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, +Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev, libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6), libjasper-dev, libpng-dev, libexiv2-dev, diff --git a/debian/lenny/applications/digikam/debian/patches/.gitignore b/debian/lenny/applications/digikam/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/digikam/debian/patches/.gitignore +++ b/debian/lenny/applications/digikam/debian/patches/series diff --git a/debian/lenny/applications/digikam/debian/rules b/debian/lenny/applications/digikam/debian/rules index 8a35928b4..6cbea6f8f 100755 --- a/debian/lenny/applications/digikam/debian/rules +++ b/debian/lenny/applications/digikam/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.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 include debian/cdbs/debian-qt-kde.mk -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk diff --git a/debian/lenny/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/dolphin/debian/cdbs/debian-qt-kde.mk index 345cc0a61..fb36ac52f 100644 --- a/debian/lenny/applications/dolphin/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/dolphin/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/debian/lenny/applications/dolphin/debian/control b/debian/lenny/applications/dolphin/debian/control index 5b7cd047e..833299bac 100644 --- a/debian/lenny/applications/dolphin/debian/control +++ b/debian/lenny/applications/dolphin/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, kdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake +Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, kdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake Standards-Version: 3.8.4 Package: dolphin-trinity diff --git a/debian/lenny/applications/dolphin/debian/patches/.gitignore b/debian/lenny/applications/dolphin/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/dolphin/debian/patches/.gitignore +++ b/debian/lenny/applications/dolphin/debian/patches/series diff --git a/debian/lenny/applications/dolphin/debian/rules b/debian/lenny/applications/dolphin/debian/rules index 66ea98891..f978c418e 100755 --- a/debian/lenny/applications/dolphin/debian/rules +++ b/debian/lenny/applications/dolphin/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 include debian/cdbs/debian-qt-kde.mk diff --git a/debian/lenny/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/filelight-l10n/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/debian/lenny/applications/filelight-l10n/debian/control b/debian/lenny/applications/filelight-l10n/debian/control index 9edd33456..6845dfba9 100644 --- a/debian/lenny/applications/filelight-l10n/debian/control +++ b/debian/lenny/applications/filelight-l10n/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Raúl Sánchez Siles <rasasi78@gmail.com> -Build-Depends: kdelibs4-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake, autoconf, libtool, libltdl-dev +Build-Depends: kdelibs4-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.methylblue.com/filelight/ diff --git a/debian/lenny/applications/fusion-icon/debian/patches/.gitignore b/debian/lenny/applications/filelight-l10n/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/fusion-icon/debian/patches/.gitignore +++ b/debian/lenny/applications/filelight-l10n/debian/patches/series diff --git a/debian/lenny/applications/filelight-l10n/debian/rules b/debian/lenny/applications/filelight-l10n/debian/rules index bc018d11c..32b295e00 100755 --- a/debian/lenny/applications/filelight-l10n/debian/rules +++ b/debian/lenny/applications/filelight-l10n/debian/rules @@ -4,7 +4,7 @@ DEB_PATCHDIRS := debian/patches/common debian/patches include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/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 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/filelight/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/filelight/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/filelight/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/filelight/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/debian/lenny/applications/fusion-icon/debian/control b/debian/lenny/applications/fusion-icon/debian/control index 7130740f7..cbc63cebc 100644 --- a/debian/lenny/applications/fusion-icon/debian/control +++ b/debian/lenny/applications/fusion-icon/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org> XS-Python-Version: all -Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), pkg-config, python-all-dev +Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), quilt, pkg-config, python-all-dev Build-Depends-Indep: python-support (>= 0.6), intltool Standards-Version: 3.8.4 diff --git a/debian/lenny/applications/gtk-qt-engine/debian/patches/.gitignore b/debian/lenny/applications/fusion-icon/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/gtk-qt-engine/debian/patches/.gitignore +++ b/debian/lenny/applications/fusion-icon/debian/patches/series diff --git a/debian/lenny/applications/fusion-icon/debian/rules b/debian/lenny/applications/fusion-icon/debian/rules index 2b780a204..3c129a596 100755 --- a/debian/lenny/applications/fusion-icon/debian/rules +++ b/debian/lenny/applications/fusion-icon/debian/rules @@ -5,7 +5,7 @@ DEB_PYTHON_SYSTEM=pysupport include /usr/share/cdbs/1/rules/debhelper.mk # include /usr/share/cdbs/1/class/python-distutils.mk include debian/python-distutils-custom.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) diff --git a/debian/lenny/applications/gtk-qt-engine/debian/control b/debian/lenny/applications/gtk-qt-engine/debian/control index 5d4629ded..fe97ffbff 100644 --- a/debian/lenny/applications/gtk-qt-engine/debian/control +++ b/debian/lenny/applications/gtk-qt-engine/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org> -Build-Depends: debhelper (>= 5.0), cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1) +Build-Depends: debhelper (>= 5.0), quilt, cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1) Standards-Version: 3.8.4 Package: gtk-qt-engine-trinity diff --git a/debian/lenny/applications/gwenview/debian/patches/.gitignore b/debian/lenny/applications/gtk-qt-engine/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/gwenview/debian/patches/.gitignore +++ b/debian/lenny/applications/gtk-qt-engine/debian/patches/series diff --git a/debian/lenny/applications/gtk-qt-engine/debian/rules b/debian/lenny/applications/gtk-qt-engine/debian/rules index ad9d85488..8d669da83 100755 --- a/debian/lenny/applications/gtk-qt-engine/debian/rules +++ b/debian/lenny/applications/gtk-qt-engine/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 include debian/cdbs/debian-qt-kde.mk diff --git a/debian/lenny/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk index fa0d532f4..ec89756bb 100644 --- a/debian/lenny/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/debian/lenny/applications/k9copy/debian/patches/.gitignore b/debian/lenny/applications/gwenview-i18n/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/k9copy/debian/patches/.gitignore +++ b/debian/lenny/applications/gwenview-i18n/debian/patches/series diff --git a/debian/lenny/applications/gwenview-i18n/debian/rules b/debian/lenny/applications/gwenview-i18n/debian/rules index 3070a9c9d..045fcc43f 100755 --- a/debian/lenny/applications/gwenview-i18n/debian/rules +++ b/debian/lenny/applications/gwenview-i18n/debian/rules @@ -4,7 +4,7 @@ DEB_PATCHDIRS := debian/patches/common debian/patches include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/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 -include debian/debiandirs diff --git a/debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/gwenview/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/debian/lenny/applications/gwenview/debian/control b/debian/lenny/applications/gwenview/debian/control index 7f170578e..b55471cb6 100644 --- a/debian/lenny/applications/gwenview/debian/control +++ b/debian/lenny/applications/gwenview/debian/control @@ -2,7 +2,7 @@ Source: gwenview-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6.0.0), kdelibs4-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, libmng-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6.0.0), quilt, kdelibs4-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, libmng-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://gwenview.sourceforge.net diff --git a/debian/lenny/applications/kaffeine/debian/patches/.gitignore b/debian/lenny/applications/gwenview/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kaffeine/debian/patches/.gitignore +++ b/debian/lenny/applications/gwenview/debian/patches/series diff --git a/debian/lenny/applications/gwenview/debian/rules b/debian/lenny/applications/gwenview/debian/rules index 9e06b4ce6..5f0d8a005 100755 --- a/debian/lenny/applications/gwenview/debian/rules +++ b/debian/lenny/applications/gwenview/debian/rules @@ -4,7 +4,7 @@ DEB_PATCHDIRS := debian/patches/common debian/patches include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/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 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/k3b/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/k3b/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/k3b/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/k3b/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/debian/lenny/applications/k3b/debian/control b/debian/lenny/applications/k3b/debian/control index 1829d884a..3fc94d515 100644 --- a/debian/lenny/applications/k3b/debian/control +++ b/debian/lenny/applications/k3b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), kdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), kdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.k3b.org diff --git a/debian/lenny/applications/k3b/debian/patches/series b/debian/lenny/applications/k3b/debian/patches/series new file mode 100644 index 000000000..bff63cb8c --- /dev/null +++ b/debian/lenny/applications/k3b/debian/patches/series @@ -0,0 +1 @@ +111_advice_kubuntu_restricted_extras.diff diff --git a/debian/lenny/applications/k3b/debian/rules b/debian/lenny/applications/k3b/debian/rules index a441e55e1..2b9405abd 100755 --- a/debian/lenny/applications/k3b/debian/rules +++ b/debian/lenny/applications/k3b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5 diff --git a/debian/lenny/applications/k9copy/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/k9copy/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/k9copy/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/k9copy/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/debian/lenny/applications/k9copy/debian/control b/debian/lenny/applications/k9copy/debian/control index 3ab1187f6..80b0aa194 100644 --- a/debian/lenny/applications/k9copy/debian/control +++ b/debian/lenny/applications/k9copy/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libhal-dev, libhal-storage-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libhal-dev, libhal-storage-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://k9copy.sourceforge.net/ diff --git a/debian/lenny/applications/katapult/debian/patches/.gitignore b/debian/lenny/applications/k9copy/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/katapult/debian/patches/.gitignore +++ b/debian/lenny/applications/k9copy/debian/patches/series diff --git a/debian/lenny/applications/k9copy/debian/rules b/debian/lenny/applications/k9copy/debian/rules index 35960c577..ffc38cd83 100755 --- a/debian/lenny/applications/k9copy/debian/rules +++ b/debian/lenny/applications/k9copy/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kaffeine/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kaffeine/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kaffeine/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/debian/lenny/applications/kaffeine/debian/control b/debian/lenny/applications/kaffeine/debian/control index 2c3bdce06..344b488a5 100644 --- a/debian/lenny/applications/kaffeine/debian/control +++ b/debian/lenny/applications/kaffeine/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Riku Voipio <riku.voipio@iki.fi>, Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, +Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev, libxtst-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libcdio-cdda-dev, libcdio-paranoia-dev, diff --git a/debian/lenny/applications/kbfx/debian/patches/.gitignore b/debian/lenny/applications/kaffeine/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kbfx/debian/patches/.gitignore +++ b/debian/lenny/applications/kaffeine/debian/patches/series diff --git a/debian/lenny/applications/kaffeine/debian/rules b/debian/lenny/applications/kaffeine/debian/rules index 27c2f5b08..8b3094571 100755 --- a/debian/lenny/applications/kaffeine/debian/rules +++ b/debian/lenny/applications/kaffeine/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/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 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/katapult/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/debian/lenny/applications/katapult/debian/control b/debian/lenny/applications/katapult/debian/control index b43c2565e..083574c75 100644 --- a/debian/lenny/applications/katapult/debian/control +++ b/debian/lenny/applications/katapult/debian/control @@ -2,7 +2,7 @@ Source: katapult-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), kdelibs4-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: katapult-trinity diff --git a/debian/lenny/applications/kbookreader/debian/patches/.gitignore b/debian/lenny/applications/katapult/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kbookreader/debian/patches/.gitignore +++ b/debian/lenny/applications/katapult/debian/patches/series diff --git a/debian/lenny/applications/katapult/debian/rules b/debian/lenny/applications/katapult/debian/rules index 70524295d..1d5785aef 100755 --- a/debian/lenny/applications/katapult/debian/rules +++ b/debian/lenny/applications/katapult/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/lenny/applications/kbarcode/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kbarcode/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kbarcode/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kbarcode/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/debian/lenny/applications/kbfx/debian/control b/debian/lenny/applications/kbfx/debian/control index dfa9d2054..299c9fba0 100644 --- a/debian/lenny/applications/kbfx/debian/control +++ b/debian/lenny/applications/kbfx/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 5), cmake, kdelibs4-trinity-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, cmake, kdelibs4-trinity-dev Standards-Version: 3.8.4 Package: kbfx-trinity diff --git a/debian/lenny/applications/kde-guidance/debian/patches/.gitignore b/debian/lenny/applications/kbfx/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kde-guidance/debian/patches/.gitignore +++ b/debian/lenny/applications/kbfx/debian/patches/series diff --git a/debian/lenny/applications/kbfx/debian/rules b/debian/lenny/applications/kbfx/debian/rules index 658c8aaac..8f0da9ac1 100755 --- a/debian/lenny/applications/kbfx/debian/rules +++ b/debian/lenny/applications/kbfx/debian/rules @@ -11,7 +11,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit include debian/cmake.mk include /usr/share/cdbs/1/rules/debhelper.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 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kbibtex/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/debian/lenny/applications/kbiff/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kbiff/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/lenny/applications/kbiff/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kbiff/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/debian/lenny/applications/kbookreader/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kbookreader/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kbookreader/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kbookreader/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/debian/lenny/applications/kbookreader/debian/control b/debian/lenny/applications/kbookreader/debian/control index 8ac579805..60a19cafd 100644 --- a/debian/lenny/applications/kbookreader/debian/control +++ b/debian/lenny/applications/kbookreader/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://k9copy.sourceforge.net/ diff --git a/debian/lenny/applications/kde-style-qtcurve/debian/patches/.gitignore b/debian/lenny/applications/kbookreader/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kde-style-qtcurve/debian/patches/.gitignore +++ b/debian/lenny/applications/kbookreader/debian/patches/series diff --git a/debian/lenny/applications/kbookreader/debian/rules b/debian/lenny/applications/kbookreader/debian/rules index 065dcfd33..35979766b 100755 --- a/debian/lenny/applications/kbookreader/debian/rules +++ b/debian/lenny/applications/kbookreader/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/kcpuload/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kcpuload/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kcpuload/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kcpuload/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/debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kdbg/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/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kdbusnotification/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/debian/lenny/applications/kde-guidance/debian/control b/debian/lenny/applications/kde-guidance/debian/control index 454cdfd58..c40fe98b6 100644 --- a/debian/lenny/applications/kde-guidance/debian/control +++ b/debian/lenny/applications/kde-guidance/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 5), chrpath, kdelibs4-trinity-dev, +Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, kdelibs4-trinity-dev, libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, pykdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata diff --git a/debian/lenny/applications/kde-systemsettings/debian/patches/.gitignore b/debian/lenny/applications/kde-guidance/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kde-systemsettings/debian/patches/.gitignore +++ b/debian/lenny/applications/kde-guidance/debian/patches/series diff --git a/debian/lenny/applications/kde-guidance/debian/rules b/debian/lenny/applications/kde-guidance/debian/rules index 2510b9aaa..af3ef58e1 100755 --- a/debian/lenny/applications/kde-guidance/debian/rules +++ b/debian/lenny/applications/kde-guidance/debian/rules @@ -5,7 +5,7 @@ DEB_PYTHON_SYSTEM = pysupport include /usr/share/cdbs/1/rules/debhelper.mk #include /usr/share/cdbs/1/class/python-distutils.mk include debian/python-distutils-jaunty.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 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp diff --git a/debian/lenny/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk index 5e704aa4a..c5d8ecfd3 100644 --- a/debian/lenny/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/debian/lenny/applications/kde-style-qtcurve/debian/control b/debian/lenny/applications/kde-style-qtcurve/debian/control index 7b20ea4da..a3d34e10a 100644 --- a/debian/lenny/applications/kde-style-qtcurve/debian/control +++ b/debian/lenny/applications/kde-style-qtcurve/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org> -Build-Depends: debhelper (>= 5), kdelibs4-trinity-dev, cmake, cdbs +Build-Depends: debhelper (>= 5), quilt, kdelibs4-trinity-dev, cmake, cdbs Standards-Version: 3.8.4 Package: kde-style-qtcurve-trinity diff --git a/debian/lenny/applications/kdesudo/debian/patches/.gitignore b/debian/lenny/applications/kde-style-qtcurve/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kdesudo/debian/patches/.gitignore +++ b/debian/lenny/applications/kde-style-qtcurve/debian/patches/series diff --git a/debian/lenny/applications/kde-style-qtcurve/debian/rules b/debian/lenny/applications/kde-style-qtcurve/debian/rules index 685703a85..f697a7e99 100755 --- a/debian/lenny/applications/kde-style-qtcurve/debian/rules +++ b/debian/lenny/applications/kde-style-qtcurve/debian/rules @@ -13,7 +13,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 include debian/cdbs/debian-qt-kde.mk diff --git a/debian/lenny/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kde-systemsettings/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/debian/lenny/applications/kde-systemsettings/debian/control b/debian/lenny/applications/kde-systemsettings/debian/control index 6d3d022c9..c92920c50 100644 --- a/debian/lenny/applications/kde-systemsettings/debian/control +++ b/debian/lenny/applications/kde-systemsettings/debian/control @@ -2,7 +2,7 @@ Source: kde-systemsettings-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), patchutils (>= 0.2.25), kdelibs4-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), quilt, patchutils (>= 0.2.25), kdelibs4-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kde-systemsettings-trinity diff --git a/debian/lenny/applications/kdirstat/debian/patches/.gitignore b/debian/lenny/applications/kde-systemsettings/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kdirstat/debian/patches/.gitignore +++ b/debian/lenny/applications/kde-systemsettings/debian/patches/series diff --git a/debian/lenny/applications/kde-systemsettings/debian/rules b/debian/lenny/applications/kde-systemsettings/debian/rules index fbfdf7a42..71831d1ad 100755 --- a/debian/lenny/applications/kde-systemsettings/debian/rules +++ b/debian/lenny/applications/kde-systemsettings/debian/rules @@ -3,7 +3,7 @@ cdbs_kde_enable_debug = --disable-debug include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/kdesudo/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdesudo/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kdesudo/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kdesudo/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/debian/lenny/applications/kdesudo/debian/control b/debian/lenny/applications/kdesudo/debian/control index f14497994..6d5b74a48 100644 --- a/debian/lenny/applications/kdesudo/debian/control +++ b/debian/lenny/applications/kdesudo/debian/control @@ -2,7 +2,7 @@ Source: kdesudo-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>> 5), cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>> 5), quilt, cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kdesudo-trinity diff --git a/debian/lenny/applications/kdpkg/debian/patches/.gitignore b/debian/lenny/applications/kdesudo/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kdpkg/debian/patches/.gitignore +++ b/debian/lenny/applications/kdesudo/debian/patches/series diff --git a/debian/lenny/applications/kdesudo/debian/rules b/debian/lenny/applications/kdesudo/debian/rules index 1f131406e..da76f8d08 100755 --- a/debian/lenny/applications/kdesudo/debian/rules +++ b/debian/lenny/applications/kdesudo/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/kdesvn/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdesvn/debian/cdbs/debian-qt-kde.mk index 856fa4932..1d366e492 100644 --- a/debian/lenny/applications/kdesvn/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kdesvn/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/debian/lenny/applications/kdesvn/debian/rules b/debian/lenny/applications/kdesvn/debian/rules index d85c8bf6a..4da14a393 100755 --- a/debian/lenny/applications/kdesvn/debian/rules +++ b/debian/lenny/applications/kdesvn/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 include debian/cdbs/debian-qt-kde.mk diff --git a/debian/lenny/applications/kdiff3/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdiff3/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kdiff3/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kdiff3/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/debian/lenny/applications/kdirstat/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdirstat/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kdirstat/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kdirstat/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/debian/lenny/applications/kdirstat/debian/control b/debian/lenny/applications/kdirstat/debian/control index 4071787f7..f9068bab6 100644 --- a/debian/lenny/applications/kdirstat/debian/control +++ b/debian/lenny/applications/kdirstat/debian/control @@ -2,7 +2,7 @@ Source: kdirstat-trinity Section: misc Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), quilt, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://kdirstat.sourceforge.net/ diff --git a/debian/lenny/applications/kio-apt/debian/patches/.gitignore b/debian/lenny/applications/kdirstat/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kio-apt/debian/patches/.gitignore +++ b/debian/lenny/applications/kdirstat/debian/patches/series diff --git a/debian/lenny/applications/kdirstat/debian/rules b/debian/lenny/applications/kdirstat/debian/rules index 201ba1594..90cbae40e 100755 --- a/debian/lenny/applications/kdirstat/debian/rules +++ b/debian/lenny/applications/kdirstat/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/lenny/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kdmtheme/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/debian/lenny/applications/kdpkg/debian/control b/debian/lenny/applications/kdpkg/debian/control index 96dd69e74..adf1773a5 100644 --- a/debian/lenny/applications/kdpkg/debian/control +++ b/debian/lenny/applications/kdpkg/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Alexander Kopf <kopf-alexander@gmx.de> -Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, gettext, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, gettext, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kdpkg-trinity diff --git a/debian/lenny/applications/kio-umountwrapper/debian/patches/.gitignore b/debian/lenny/applications/kdpkg/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kio-umountwrapper/debian/patches/.gitignore +++ b/debian/lenny/applications/kdpkg/debian/patches/series diff --git a/debian/lenny/applications/kdpkg/debian/rules b/debian/lenny/applications/kdpkg/debian/rules index 1c07fcb5f..1e590de5f 100755 --- a/debian/lenny/applications/kdpkg/debian/rules +++ b/debian/lenny/applications/kdpkg/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/lenny/applications/keep/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/keep/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/keep/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/keep/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/debian/lenny/applications/keep/debian/control b/debian/lenny/applications/keep/debian/control index 76681aa87..8b8071a0a 100644 --- a/debian/lenny/applications/keep/debian/control +++ b/debian/lenny/applications/keep/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: keep-trinity diff --git a/debian/lenny/applications/keep/debian/patches/series b/debian/lenny/applications/keep/debian/patches/series new file mode 100644 index 000000000..9ccf4a125 --- /dev/null +++ b/debian/lenny/applications/keep/debian/patches/series @@ -0,0 +1 @@ +kubuntu_01_kdepot.diff diff --git a/debian/lenny/applications/keep/debian/rules b/debian/lenny/applications/keep/debian/rules index c6fa8833d..12e8fd743 100755 --- a/debian/lenny/applications/keep/debian/rules +++ b/debian/lenny/applications/keep/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/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 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk index 4a11bc028..6b7b16643 100644 --- a/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kerry/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/debian/lenny/applications/kerry/debian/control b/debian/lenny/applications/kerry/debian/control index a88165323..50a7b8707 100644 --- a/debian/lenny/applications/kerry/debian/control +++ b/debian/lenny/applications/kerry/debian/control @@ -2,7 +2,7 @@ Source: kerry-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev Homepage: http://en.opensuse.org/Kerry Standards-Version: 3.8.4 diff --git a/debian/lenny/applications/kiosktool/debian/patches/.gitignore b/debian/lenny/applications/kerry/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kiosktool/debian/patches/.gitignore +++ b/debian/lenny/applications/kerry/debian/patches/series diff --git a/debian/lenny/applications/kerry/debian/rules b/debian/lenny/applications/kerry/debian/rules index 4cbb0340e..b00341b4b 100755 --- a/debian/lenny/applications/kerry/debian/rules +++ b/debian/lenny/applications/kerry/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk # include /usr/share/cdbs/1/class/kde.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/lenny/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk index 5e704aa4a..c5d8ecfd3 100644 --- a/debian/lenny/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/debian/lenny/applications/kgtk-qt3/debian/control b/debian/lenny/applications/kgtk-qt3/debian/control index 67715ac0f..d8b21e720 100644 --- a/debian/lenny/applications/kgtk-qt3/debian/control +++ b/debian/lenny/applications/kgtk-qt3/debian/control @@ -2,7 +2,7 @@ Source: kgtk-qt3-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 7), cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake +Build-Depends: debhelper (>= 7), quilt, cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake Standards-Version: 3.8.4 Homepage: http://trinity.pearsoncomputing.net diff --git a/debian/lenny/applications/kmplayer/debian/patches/.gitignore b/debian/lenny/applications/kgtk-qt3/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kmplayer/debian/patches/.gitignore +++ b/debian/lenny/applications/kgtk-qt3/debian/patches/series diff --git a/debian/lenny/applications/kgtk-qt3/debian/rules b/debian/lenny/applications/kgtk-qt3/debian/rules index b4cb7a953..91c8ec995 100755 --- a/debian/lenny/applications/kgtk-qt3/debian/rules +++ b/debian/lenny/applications/kgtk-qt3/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 include debian/cdbs/debian-qt-kde.mk diff --git a/debian/lenny/applications/kile/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kile/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kile/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kile/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/debian/lenny/applications/kio-apt/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kio-apt/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kio-apt/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kio-apt/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/debian/lenny/applications/kio-apt/debian/control b/debian/lenny/applications/kio-apt/debian/control index 793a97da7..3340b7670 100644 --- a/debian/lenny/applications/kio-apt/debian/control +++ b/debian/lenny/applications/kio-apt/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Emmanuel Bouthenot <kolter@openics.org> -Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kio-apt-trinity diff --git a/debian/lenny/applications/knemo/debian/patches/.gitignore b/debian/lenny/applications/kio-apt/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/knemo/debian/patches/.gitignore +++ b/debian/lenny/applications/kio-apt/debian/patches/series diff --git a/debian/lenny/applications/kio-apt/debian/rules b/debian/lenny/applications/kio-apt/debian/rules index 394819b8a..e9afe96d6 100755 --- a/debian/lenny/applications/kio-apt/debian/rules +++ b/debian/lenny/applications/kio-apt/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/kio-locate/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kio-locate/debian/cdbs/debian-qt-kde.mk index 5e704aa4a..c5d8ecfd3 100644 --- a/debian/lenny/applications/kio-locate/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kio-locate/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/debian/lenny/applications/kio-locate/debian/control b/debian/lenny/applications/kio-locate/debian/control index 44c5cbfa8..944c5800b 100644 --- a/debian/lenny/applications/kio-locate/debian/control +++ b/debian/lenny/applications/kio-locate/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com> -Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, bzip2, python (>= 2.3), cmake +Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, bzip2, python (>= 2.3), cmake Standards-Version: 3.8.4 Package: kio-locate-trinity diff --git a/debian/lenny/applications/knetstats/debian/patches/.gitignore b/debian/lenny/applications/kio-locate/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/knetstats/debian/patches/.gitignore +++ b/debian/lenny/applications/kio-locate/debian/patches/series diff --git a/debian/lenny/applications/kio-locate/debian/rules b/debian/lenny/applications/kio-locate/debian/rules index ecf59da08..4d6404d6c 100755 --- a/debian/lenny/applications/kio-locate/debian/rules +++ b/debian/lenny/applications/kio-locate/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 include debian/cdbs/debian-qt-kde.mk diff --git a/debian/lenny/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kio-umountwrapper/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/debian/lenny/applications/kio-umountwrapper/debian/control b/debian/lenny/applications/kio-umountwrapper/debian/control index 8c760573e..489dac991 100644 --- a/debian/lenny/applications/kio-umountwrapper/debian/control +++ b/debian/lenny/applications/kio-umountwrapper/debian/control @@ -2,7 +2,7 @@ Source: kio-umountwrapper-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>> 5), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>> 5), quilt, cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kio-umountwrapper-trinity diff --git a/debian/lenny/applications/koffice/debian/patches/.gitignore b/debian/lenny/applications/kio-umountwrapper/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/koffice/debian/patches/.gitignore +++ b/debian/lenny/applications/kio-umountwrapper/debian/patches/series diff --git a/debian/lenny/applications/kio-umountwrapper/debian/rules b/debian/lenny/applications/kio-umountwrapper/debian/rules index 8a83b84a6..325e30125 100755 --- a/debian/lenny/applications/kio-umountwrapper/debian/rules +++ b/debian/lenny/applications/kio-umountwrapper/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kiosktool/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/debian/lenny/applications/kiosktool/debian/control b/debian/lenny/applications/kiosktool/debian/control index bbf9a457f..9e8a6636d 100644 --- a/debian/lenny/applications/kiosktool/debian/control +++ b/debian/lenny/applications/kiosktool/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org> -Build-Depends: debhelper (>= 4.1.0), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 4.1.0), quilt, cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kiosktool-trinity diff --git a/debian/lenny/applications/kpowersave.cmake/debian/patches/.gitignore b/debian/lenny/applications/kiosktool/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kpowersave.cmake/debian/patches/.gitignore +++ b/debian/lenny/applications/kiosktool/debian/patches/series diff --git a/debian/lenny/applications/kiosktool/debian/rules b/debian/lenny/applications/kiosktool/debian/rules index 43179510b..f29b20b10 100755 --- a/debian/lenny/applications/kiosktool/debian/rules +++ b/debian/lenny/applications/kiosktool/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/kmplayer/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kmplayer/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kmplayer/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kmplayer/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/debian/lenny/applications/kmplayer/debian/control b/debian/lenny/applications/kmplayer/debian/control index ae42b94a5..0959f65a4 100644 --- a/debian/lenny/applications/kmplayer/debian/control +++ b/debian/lenny/applications/kmplayer/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, +Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev, libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, docbook2x, automake, autoconf, libtool, libltdl-dev diff --git a/debian/lenny/applications/kpowersave/debian/patches/.gitignore b/debian/lenny/applications/kmplayer/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kpowersave/debian/patches/.gitignore +++ b/debian/lenny/applications/kmplayer/debian/patches/series diff --git a/debian/lenny/applications/kmplayer/debian/rules b/debian/lenny/applications/kmplayer/debian/rules index aefb53e38..51f7c5e62 100755 --- a/debian/lenny/applications/kmplayer/debian/rules +++ b/debian/lenny/applications/kmplayer/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/utils.mk diff --git a/debian/lenny/applications/kmymoney/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kmymoney/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kmymoney/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kmymoney/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/debian/lenny/applications/kmymoney/debian/control b/debian/lenny/applications/kmymoney/debian/control index 2ca999c49..156707ea3 100644 --- a/debian/lenny/applications/kmymoney/debian/control +++ b/debian/lenny/applications/kmymoney/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: debhelper (>= 7.0.50~), cdbs, chrpath, automake, libtool, kdelibs4-trinity-dev, libofx-dev, libsqlite3-dev, recode, html2ps +Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, chrpath, automake, libtool, kdelibs4-trinity-dev, libofx-dev, libsqlite3-dev, recode, html2ps Standards-Version: 3.8.4 Package: kmymoney2-trinity diff --git a/debian/lenny/applications/krusader/debian/patches/.gitignore b/debian/lenny/applications/kmymoney/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/krusader/debian/patches/.gitignore +++ b/debian/lenny/applications/kmymoney/debian/patches/series diff --git a/debian/lenny/applications/kmymoney/debian/rules b/debian/lenny/applications/kmymoney/debian/rules index 0ed3de40c..338d1373f 100755 --- a/debian/lenny/applications/kmymoney/debian/rules +++ b/debian/lenny/applications/kmymoney/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/lenny/applications/knemo/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knemo/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/knemo/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/knemo/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/debian/lenny/applications/knemo/debian/control b/debian/lenny/applications/knemo/debian/control index 500b81dfc..6f15573b5 100644 --- a/debian/lenny/applications/knemo/debian/control +++ b/debian/lenny/applications/knemo/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: debhelper (>> 4.1), cdbs, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>> 4.1), quilt, cdbs, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: knemo-trinity diff --git a/debian/lenny/applications/ksystemlog/debian/patches/.gitignore b/debian/lenny/applications/knemo/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/ksystemlog/debian/patches/.gitignore +++ b/debian/lenny/applications/knemo/debian/patches/series diff --git a/debian/lenny/applications/knemo/debian/rules b/debian/lenny/applications/knemo/debian/rules index adb950752..a1a0015ad 100755 --- a/debian/lenny/applications/knemo/debian/rules +++ b/debian/lenny/applications/knemo/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/knetstats/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetstats/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/knetstats/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/knetstats/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/debian/lenny/applications/knetstats/debian/control b/debian/lenny/applications/knetstats/debian/control index c2f2f6429..fb660c633 100644 --- a/debian/lenny/applications/knetstats/debian/control +++ b/debian/lenny/applications/knetstats/debian/control @@ -2,7 +2,7 @@ Source: knetstats-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 5.0), cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0), quilt, cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://knetstats.sourceforge.net/ diff --git a/debian/lenny/applications/ktorrent/debian/patches/.gitignore b/debian/lenny/applications/knetstats/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/ktorrent/debian/patches/.gitignore +++ b/debian/lenny/applications/knetstats/debian/patches/series diff --git a/debian/lenny/applications/knetstats/debian/rules b/debian/lenny/applications/knetstats/debian/rules index 948def121..603171a4b 100755 --- a/debian/lenny/applications/knetstats/debian/rules +++ b/debian/lenny/applications/knetstats/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk index 345cc0a61..fb36ac52f 100644 --- a/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/debian/lenny/applications/knetworkmanager.cmake/debian/rules b/debian/lenny/applications/knetworkmanager.cmake/debian/rules index 5043dd652..7b801da5f 100755 --- a/debian/lenny/applications/knetworkmanager.cmake/debian/rules +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 include debian/cdbs/debian-qt-kde.mk diff --git a/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/knetworkmanager8/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/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk index b93e7c154..a803f50d6 100644 --- a/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk 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/debian/lenny/applications/koffice/debian/control b/debian/lenny/applications/koffice/debian/control index 1af407ae6..8608af09d 100644 --- a/debian/lenny/applications/koffice/debian/control +++ b/debian/lenny/applications/koffice/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>, Raúl Sánchez Siles <rasasi78@gmail.com> -Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.4 Homepage: http://www.koffice.org diff --git a/debian/lenny/applications/kvirc/debian/patches/.gitignore b/debian/lenny/applications/koffice/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kvirc/debian/patches/.gitignore +++ b/debian/lenny/applications/koffice/debian/patches/series diff --git a/debian/lenny/applications/koffice/debian/rules b/debian/lenny/applications/koffice/debian/rules index 597adca91..a80a266df 100755 --- a/debian/lenny/applications/koffice/debian/rules +++ b/debian/lenny/applications/koffice/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 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/konversation/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/konversation/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/konversation/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/konversation/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/debian/lenny/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kopete-otr/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/debian/lenny/applications/kpilot/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kpilot/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kpilot/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kpilot/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/debian/lenny/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk index 345cc0a61..fb36ac52f 100644 --- a/debian/lenny/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/debian/lenny/applications/kpowersave.cmake/debian/control b/debian/lenny/applications/kpowersave.cmake/debian/control index 430ad6cb1..b5aed9d71 100644 --- a/debian/lenny/applications/kpowersave.cmake/debian/control +++ b/debian/lenny/applications/kpowersave.cmake/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org> -Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, libtool, libltdl-dev, cmake +Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, libtool, libltdl-dev, cmake Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/debian/lenny/applications/kwin-style-crystal/debian/patches/.gitignore b/debian/lenny/applications/kpowersave.cmake/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/kwin-style-crystal/debian/patches/.gitignore +++ b/debian/lenny/applications/kpowersave.cmake/debian/patches/series diff --git a/debian/lenny/applications/kpowersave.cmake/debian/rules b/debian/lenny/applications/kpowersave.cmake/debian/rules index 0d2383bae..6d3ac5584 100755 --- a/debian/lenny/applications/kpowersave.cmake/debian/rules +++ b/debian/lenny/applications/kpowersave.cmake/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 include debian/cdbs/debian-qt-kde.mk diff --git a/debian/lenny/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kpowersave/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kpowersave/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kpowersave/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/debian/lenny/applications/kpowersave/debian/control b/debian/lenny/applications/kpowersave/debian/control index faaac13d0..8abf3510b 100644 --- a/debian/lenny/applications/kpowersave/debian/control +++ b/debian/lenny/applications/kpowersave/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org> -Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13 Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/debian/lenny/applications/piklab/debian/patches/.gitignore b/debian/lenny/applications/kpowersave/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/piklab/debian/patches/.gitignore +++ b/debian/lenny/applications/kpowersave/debian/patches/series diff --git a/debian/lenny/applications/kpowersave/debian/rules b/debian/lenny/applications/kpowersave/debian/rules index 484f52352..a194aaad3 100755 --- a/debian/lenny/applications/kpowersave/debian/rules +++ b/debian/lenny/applications/kpowersave/debian/rules @@ -2,7 +2,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/lenny/applications/krename/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/krename/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/krename/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/krename/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/debian/lenny/applications/krename/debian/control b/debian/lenny/applications/krename/debian/control index 29e40ed70..f278a8051 100644 --- a/debian/lenny/applications/krename/debian/control +++ b/debian/lenny/applications/krename/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Richard A. Johnson <nixternal@ubuntu.com> -Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: krename-trinity diff --git a/debian/lenny/applications/rosegarden/debian/patches/.gitignore b/debian/lenny/applications/krename/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/rosegarden/debian/patches/.gitignore +++ b/debian/lenny/applications/krename/debian/patches/series diff --git a/debian/lenny/applications/krename/debian/rules b/debian/lenny/applications/krename/debian/rules index 3888eea1b..8f3290ed2 100755 --- a/debian/lenny/applications/krename/debian/rules +++ b/debian/lenny/applications/krename/debian/rules @@ -4,7 +4,7 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/lenny/applications/krusader/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/krusader/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/krusader/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/krusader/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/debian/lenny/applications/krusader/debian/control b/debian/lenny/applications/krusader/debian/control index 80e187bea..aac4f0d9f 100644 --- a/debian/lenny/applications/krusader/debian/control +++ b/debian/lenny/applications/krusader/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 5), libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://krusader.sourceforge.net diff --git a/debian/lenny/applications/wlassistant/debian/patches/.gitignore b/debian/lenny/applications/krusader/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/lenny/applications/wlassistant/debian/patches/.gitignore +++ b/debian/lenny/applications/krusader/debian/patches/series diff --git a/debian/lenny/applications/krusader/debian/rules b/debian/lenny/applications/krusader/debian/rules index f413f4d3a..fa96d831d 100755 --- a/debian/lenny/applications/krusader/debian/rules +++ b/debian/lenny/applications/krusader/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/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 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/ksystemlog/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/debian/lenny/applications/ksystemlog/debian/control b/debian/lenny/applications/ksystemlog/debian/control index d818029c1..3948d02c9 100644 --- a/debian/lenny/applications/ksystemlog/debian/control +++ b/debian/lenny/applications/ksystemlog/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ksystemlog-trinity diff --git a/debian/lenny/applications/ksystemlog/debian/patches/series b/debian/lenny/applications/ksystemlog/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/lenny/applications/ksystemlog/debian/patches/series diff --git a/debian/lenny/applications/ksystemlog/debian/rules b/debian/lenny/applications/ksystemlog/debian/rules index e26e7d22c..5efd2e313 100755 --- a/debian/lenny/applications/ksystemlog/debian/rules +++ b/debian/lenny/applications/ksystemlog/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk index b93e7c154..a803f50d6 100644 --- a/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk 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/debian/lenny/applications/ktorrent/debian/control b/debian/lenny/applications/ktorrent/debian/control index e22709c7b..02a745894 100644 --- a/debian/lenny/applications/ktorrent/debian/control +++ b/debian/lenny/applications/ktorrent/debian/control @@ -2,7 +2,7 @@ Source: ktorrent-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, kdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0), quilt, cdbs, docbook2x, kdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ktorrent-trinity diff --git a/debian/lenny/applications/ktorrent/debian/patches/series b/debian/lenny/applications/ktorrent/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/lenny/applications/ktorrent/debian/patches/series diff --git a/debian/lenny/applications/ktorrent/debian/rules b/debian/lenny/applications/ktorrent/debian/rules index 853b79b3f..8b87031cb 100755 --- a/debian/lenny/applications/ktorrent/debian/rules +++ b/debian/lenny/applications/ktorrent/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/debian-qt-kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/kuickshow/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kuickshow/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kuickshow/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kuickshow/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/debian/lenny/applications/kuickshow/debian/control b/debian/lenny/applications/kuickshow/debian/control index 58a19c6c9..0c8890be4 100644 --- a/debian/lenny/applications/kuickshow/debian/control +++ b/debian/lenny/applications/kuickshow/debian/control @@ -2,7 +2,7 @@ Source: kuickshow-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, kdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, kdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kuickshow-trinity diff --git a/debian/lenny/applications/kuickshow/debian/patches/series b/debian/lenny/applications/kuickshow/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/lenny/applications/kuickshow/debian/patches/series diff --git a/debian/lenny/applications/kuickshow/debian/rules b/debian/lenny/applications/kuickshow/debian/rules index b751ebfe5..1132acaac 100755 --- a/debian/lenny/applications/kuickshow/debian/rules +++ b/debian/lenny/applications/kuickshow/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 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde diff --git a/debian/lenny/applications/kvirc/debian/control b/debian/lenny/applications/kvirc/debian/control index 4dc24713a..fc58a788a 100644 --- a/debian/lenny/applications/kvirc/debian/control +++ b/debian/lenny/applications/kvirc/debian/control @@ -1,5 +1,5 @@ Source: kvirc-trinity -Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), kdelibs4-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), quilt, kdelibs4-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool, libltdl-dev Section: net Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> diff --git a/debian/lenny/applications/kvirc/debian/patches/series b/debian/lenny/applications/kvirc/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/lenny/applications/kvirc/debian/patches/series diff --git a/debian/lenny/applications/kvirc/debian/rules b/debian/lenny/applications/kvirc/debian/rules index cb7bb0c9a..eefb7c18b 100755 --- a/debian/lenny/applications/kvirc/debian/rules +++ b/debian/lenny/applications/kvirc/debian/rules @@ -15,7 +15,7 @@ common-configure-impl:: include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/lenny/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kwin-style-crystal/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/debian/lenny/applications/kwin-style-crystal/debian/control b/debian/lenny/applications/kwin-style-crystal/debian/control index 0f61547f5..c503a6b12 100644 --- a/debian/lenny/applications/kwin-style-crystal/debian/control +++ b/debian/lenny/applications/kwin-style-crystal/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com> -Build-Depends: debhelper (>= 5.0.0), cdbs, kdebase-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, kdebase-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kwin-style-crystal-trinity diff --git a/debian/lenny/applications/kwin-style-crystal/debian/patches/series b/debian/lenny/applications/kwin-style-crystal/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/lenny/applications/kwin-style-crystal/debian/patches/series diff --git a/debian/lenny/applications/kwin-style-crystal/debian/rules b/debian/lenny/applications/kwin-style-crystal/debian/rules index 967c93592..f75d9ba60 100755 --- a/debian/lenny/applications/kwin-style-crystal/debian/rules +++ b/debian/lenny/applications/kwin-style-crystal/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/lenny/applications/piklab/debian/control b/debian/lenny/applications/piklab/debian/control index 2e8d8ffda..72ab578b2 100644 --- a/debian/lenny/applications/piklab/debian/control +++ b/debian/lenny/applications/piklab/debian/control @@ -2,7 +2,7 @@ Source: piklab-trinity Section: electronics Priority: extra Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 5), autotools-dev, quilt, chrpath, +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, quilt, chrpath, libusb-dev, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://piklab.sourceforge.net/ diff --git a/debian/lenny/applications/piklab/debian/patches/series b/debian/lenny/applications/piklab/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/lenny/applications/piklab/debian/patches/series diff --git a/debian/lenny/applications/piklab/debian/rules b/debian/lenny/applications/piklab/debian/rules index 31c8548d3..650dfcc80 100755 --- a/debian/lenny/applications/piklab/debian/rules +++ b/debian/lenny/applications/piklab/debian/rules @@ -26,7 +26,9 @@ else CFLAGS += -O2 endif -config: config-stamp +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +config: post-patches config-stamp config-stamp: configure dh_testdir @@ -39,8 +41,6 @@ config-stamp: configure make -f admin/Makefile.common cvs touch debian/stamp-bootstrap - $(MAKE) -f /usr/share/quilt/quilt.make patch - ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif @@ -62,7 +62,7 @@ build-stamp: config-stamp #docbook-to-man debian/piklab.sgml > piklab.1 touch $@ -clean: +clean:: dh_testdir dh_testroot @@ -80,7 +80,6 @@ clean: rm -f po/*.gmo rm -f src/common/global/svn_revision/svn_revision.h rm -f config.sub config.guess config.status config.log - $(MAKE) -f /usr/share/quilt/quilt.make unpatch dh_clean install: build-stamp diff --git a/debian/lenny/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/rosegarden/debian/cdbs/debian-qt-kde.mk index 856fa4932..1d366e492 100644 --- a/debian/lenny/applications/rosegarden/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/rosegarden/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/debian/lenny/applications/rosegarden/debian/control b/debian/lenny/applications/rosegarden/debian/control index 62bb14e30..bfa8fbc1f 100644 --- a/debian/lenny/applications/rosegarden/debian/control +++ b/debian/lenny/applications/rosegarden/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org> Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org> -Build-Depends: debhelper (>> 5.0.0), cdbs, cmake, kdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev +Build-Depends: debhelper (>> 5.0.0), quilt, cdbs, cmake, kdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev Standards-Version: 3.8.4 Homepage: http://www.rosegardenmusic.com/ diff --git a/debian/lenny/applications/rosegarden/debian/patches/series b/debian/lenny/applications/rosegarden/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/lenny/applications/rosegarden/debian/patches/series diff --git a/debian/lenny/applications/rosegarden/debian/rules b/debian/lenny/applications/rosegarden/debian/rules index d554585f6..cc6b1a29a 100755 --- a/debian/lenny/applications/rosegarden/debian/rules +++ b/debian/lenny/applications/rosegarden/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 include debian/cdbs/debian-qt-kde.mk diff --git a/debian/lenny/applications/smb4k/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/smb4k/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/smb4k/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/smb4k/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/debian/lenny/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/soundkonverter/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/debian/lenny/applications/wlassistant/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/wlassistant/debian/cdbs/debian-qt-kde.mk index 5e704aa4a..c5d8ecfd3 100644 --- a/debian/lenny/applications/wlassistant/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/wlassistant/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/debian/lenny/applications/wlassistant/debian/control b/debian/lenny/applications/wlassistant/debian/control index d3c8ba9c9..b0e391a33 100644 --- a/debian/lenny/applications/wlassistant/debian/control +++ b/debian/lenny/applications/wlassistant/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: debhelper (>= 4.1.0), cmake, cdbs, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev +Build-Depends: debhelper (>= 4.1.0), quilt, cmake, cdbs, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev Standards-Version: 3.8.4 Package: wlassistant-trinity diff --git a/debian/lenny/applications/wlassistant/debian/patches/series b/debian/lenny/applications/wlassistant/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/lenny/applications/wlassistant/debian/patches/series diff --git a/debian/lenny/applications/wlassistant/debian/rules b/debian/lenny/applications/wlassistant/debian/rules index 1a8fdeafb..5e6564e64 100755 --- a/debian/lenny/applications/wlassistant/debian/rules +++ b/debian/lenny/applications/wlassistant/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 include debian/cdbs/debian-qt-kde.mk diff --git a/debian/lenny/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/yakuake/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/lenny/applications/yakuake/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/yakuake/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 := |