summaryrefslogtreecommitdiffstats
path: root/debian/squeeze
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-15 20:29:47 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-07-18 00:23:09 +0200
commitf025c10ab2c705f3b86669b3dae1817c0cdd6d1d (patch)
treee9ca489d65a931d999e375719a0ddd5d670b77f6 /debian/squeeze
parent17ce56f2601667a7515bbe21b4754cdb51f0d650 (diff)
downloadtde-packaging-f025c10ab2c705f3b86669b3dae1817c0cdd6d1d.tar.gz
tde-packaging-f025c10ab2c705f3b86669b3dae1817c0cdd6d1d.zip
Switch patch system from simple to quilt on Debian and Ubuntu
(cherry picked from commit f24915471ea396c53670df51b2affc4af74373bf)
Diffstat (limited to 'debian/squeeze')
-rw-r--r--debian/squeeze/applications/abakus/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/abakus/debian/patches/series (renamed from debian/squeeze/applications/adept/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/abakus/debian/rules2
-rw-r--r--debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/applications/adept/debian/rules2
-rw-r--r--debian/squeeze/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/applications/amarok.cmake/debian/rules2
-rw-r--r--debian/squeeze/applications/amarok/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/basket/debian/control2
-rwxr-xr-xdebian/squeeze/applications/basket/debian/rules6
-rw-r--r--debian/squeeze/applications/bibletime/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/bibletime/debian/patches/series (renamed from debian/squeeze/applications/bibletime/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/bibletime/debian/rules2
-rw-r--r--debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/compizconfig-backend-kconfig/debian/patches/series (renamed from debian/squeeze/applications/compizconfig-backend-kconfig/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/compizconfig-backend-kconfig/debian/rules2
-rw-r--r--debian/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/digikam/debian/patches/series (renamed from debian/squeeze/applications/digikam/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/digikam/debian/rules2
-rw-r--r--debian/squeeze/applications/dolphin/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/dolphin/debian/patches/series (renamed from debian/squeeze/applications/dolphin/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/dolphin/debian/rules2
-rw-r--r--debian/squeeze/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/filelight-l10n/debian/control2
-rw-r--r--debian/squeeze/applications/filelight-l10n/debian/patches/series (renamed from debian/squeeze/applications/fusion-icon/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/filelight-l10n/debian/rules2
-rw-r--r--debian/squeeze/applications/filelight/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/fusion-icon/debian/patches/series (renamed from debian/squeeze/applications/gtk-qt-engine/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/fusion-icon/debian/rules2
-rw-r--r--debian/squeeze/applications/gtk-qt-engine/debian/patches/series (renamed from debian/squeeze/applications/gwenview/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/gtk-qt-engine/debian/rules2
-rw-r--r--debian/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/gwenview-i18n/debian/patches/series (renamed from debian/squeeze/applications/k9copy/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/gwenview-i18n/debian/rules2
-rw-r--r--debian/squeeze/applications/gwenview/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/gwenview/debian/patches/series (renamed from debian/squeeze/applications/kaffeine/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/gwenview/debian/rules2
-rw-r--r--debian/squeeze/applications/k3b/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/applications/k3b/debian/rules2
-rw-r--r--debian/squeeze/applications/k9copy/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/k9copy/debian/patches/series (renamed from debian/squeeze/applications/katapult/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/k9copy/debian/rules2
-rw-r--r--debian/squeeze/applications/kaffeine/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kaffeine/debian/patches/series (renamed from debian/squeeze/applications/kbfx/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kaffeine/debian/rules2
-rw-r--r--debian/squeeze/applications/katapult/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/katapult/debian/patches/series (renamed from debian/squeeze/applications/kbookreader/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/katapult/debian/rules2
-rw-r--r--debian/squeeze/applications/kbarcode/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kbfx/debian/patches/series (renamed from debian/squeeze/applications/kde-guidance/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kbfx/debian/rules2
-rw-r--r--debian/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kbiff/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kbookreader/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kbookreader/debian/patches/series (renamed from debian/squeeze/applications/kde-style-qtcurve/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kbookreader/debian/rules2
-rw-r--r--debian/squeeze/applications/kcpuload/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kdbg/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kde-guidance/debian/patches/series (renamed from debian/squeeze/applications/kde-systemsettings/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kde-guidance/debian/rules2
-rw-r--r--debian/squeeze/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kde-style-qtcurve/debian/patches/series (renamed from debian/squeeze/applications/kdesudo/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kde-style-qtcurve/debian/rules2
-rw-r--r--debian/squeeze/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kde-systemsettings/debian/patches/series (renamed from debian/squeeze/applications/kdirstat/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kde-systemsettings/debian/rules2
-rw-r--r--debian/squeeze/applications/kdesudo/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kdesudo/debian/patches/series (renamed from debian/squeeze/applications/kdpkg/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kdesudo/debian/rules2
-rw-r--r--debian/squeeze/applications/kdesvn/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kdesvn/debian/rules2
-rw-r--r--debian/squeeze/applications/kdiff3/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kdirstat/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kdirstat/debian/patches/series (renamed from debian/squeeze/applications/kio-apt/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kdirstat/debian/rules2
-rw-r--r--debian/squeeze/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kdpkg/debian/patches/series (renamed from debian/squeeze/applications/kio-umountwrapper/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kdpkg/debian/rules2
-rw-r--r--debian/squeeze/applications/keep/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/applications/keep/debian/rules2
-rw-r--r--debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kerry/debian/patches/series (renamed from debian/squeeze/applications/kiosktool/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kerry/debian/rules2
-rw-r--r--debian/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kgtk-qt3/debian/patches/series (renamed from debian/squeeze/applications/kmplayer/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kgtk-qt3/debian/rules2
-rw-r--r--debian/squeeze/applications/kile/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kio-apt/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kio-apt/debian/patches/series (renamed from debian/squeeze/applications/knemo/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kio-apt/debian/rules2
-rw-r--r--debian/squeeze/applications/kio-locate/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kio-locate/debian/patches/series (renamed from debian/squeeze/applications/knetstats/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kio-locate/debian/rules2
-rw-r--r--debian/squeeze/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kio-umountwrapper/debian/patches/series (renamed from debian/squeeze/applications/koffice/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kio-umountwrapper/debian/rules2
-rw-r--r--debian/squeeze/applications/kiosktool/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kiosktool/debian/patches/series (renamed from debian/squeeze/applications/kpowersave.cmake/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kiosktool/debian/rules2
-rw-r--r--debian/squeeze/applications/kmplayer/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kmplayer/debian/patches/series (renamed from debian/squeeze/applications/kpowersave/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kmplayer/debian/rules2
-rw-r--r--debian/squeeze/applications/kmymoney/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kmymoney/debian/patches/series (renamed from debian/squeeze/applications/krusader/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kmymoney/debian/rules2
-rw-r--r--debian/squeeze/applications/knemo/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/knemo/debian/patches/series (renamed from debian/squeeze/applications/ksystemlog/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/knemo/debian/rules2
-rw-r--r--debian/squeeze/applications/knetstats/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/knetstats/debian/patches/series (renamed from debian/squeeze/applications/ktorrent/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/knetstats/debian/rules2
-rw-r--r--debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/applications/knetworkmanager.cmake/debian/rules2
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/koffice/debian/patches/series (renamed from debian/squeeze/applications/kvirc/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/koffice/debian/rules2
-rw-r--r--debian/squeeze/applications/konversation/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kpilot/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kpowersave.cmake/debian/control2
-rw-r--r--debian/squeeze/applications/kpowersave.cmake/debian/patches/series (renamed from debian/squeeze/applications/kwin-style-crystal/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kpowersave.cmake/debian/rules2
-rw-r--r--debian/squeeze/applications/kpowersave/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kpowersave/debian/patches/series (renamed from debian/squeeze/applications/piklab/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kpowersave/debian/rules2
-rw-r--r--debian/squeeze/applications/krename/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/krename/debian/patches/series (renamed from debian/squeeze/applications/rosegarden/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/krename/debian/rules2
-rw-r--r--debian/squeeze/applications/krusader/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/krusader/debian/patches/series (renamed from debian/squeeze/applications/wlassistant/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/krusader/debian/rules2
-rw-r--r--debian/squeeze/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/ksystemlog/debian/patches/series (renamed from debian/squeeze/kdegraphics/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/ksystemlog/debian/rules2
-rw-r--r--debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/ktorrent/debian/patches/series (renamed from debian/squeeze/kdepim/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/ktorrent/debian/rules2
-rw-r--r--debian/squeeze/applications/kuickshow/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kuickshow/debian/patches/series (renamed from debian/squeeze/libraries/libkipi/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kuickshow/debian/rules2
-rw-r--r--debian/squeeze/applications/kvirc/debian/patches/series0
-rwxr-xr-xdebian/squeeze/applications/kvirc/debian/rules2
-rw-r--r--debian/squeeze/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/kwin-style-crystal/debian/patches/series0
-rwxr-xr-xdebian/squeeze/applications/kwin-style-crystal/debian/rules2
-rw-r--r--debian/squeeze/applications/piklab/debian/control2
-rw-r--r--debian/squeeze/applications/piklab/debian/patches/series0
-rwxr-xr-xdebian/squeeze/applications/piklab/debian/rules9
-rw-r--r--debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/rosegarden/debian/control2
-rw-r--r--debian/squeeze/applications/rosegarden/debian/patches/series0
-rwxr-xr-xdebian/squeeze/applications/rosegarden/debian/rules2
-rw-r--r--debian/squeeze/applications/smb4k/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/wlassistant/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/wlassistant/debian/patches/series0
-rwxr-xr-xdebian/squeeze/applications/wlassistant/debian/rules2
-rw-r--r--debian/squeeze/applications/yakuake/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/dependencies/arts/debian/rules2
-rw-r--r--debian/squeeze/dependencies/dbus-1-tqt/debian/patches/series0
-rwxr-xr-xdebian/squeeze/dependencies/dbus-1-tqt/debian/rules2
-rw-r--r--debian/squeeze/dependencies/dbus-tqt/debian/patches/series0
-rwxr-xr-xdebian/squeeze/dependencies/dbus-tqt/debian/rules2
-rw-r--r--debian/squeeze/dependencies/qt3/debian/control2
-rwxr-xr-xdebian/squeeze/dependencies/qt3/debian/rules8
-rw-r--r--debian/squeeze/dependencies/tqtinterface/debian/patches/series0
-rwxr-xr-xdebian/squeeze/dependencies/tqtinterface/debian/rules2
-rw-r--r--debian/squeeze/kdeaccessibility/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdeaccessibility/debian/rules2
-rw-r--r--debian/squeeze/kdeaddons/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdeaddons/debian/rules2
-rw-r--r--debian/squeeze/kdeadmin/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdeadmin/debian/rules2
-rw-r--r--debian/squeeze/kdeartwork/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdeartwork/debian/rules2
-rw-r--r--debian/squeeze/kdebase/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdebase/debian/rules2
-rw-r--r--debian/squeeze/kdebindings/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/kdeedu/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdeedu/debian/rules2
-rw-r--r--debian/squeeze/kdegames/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdegames/debian/rules2
-rw-r--r--debian/squeeze/kdegraphics/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdegraphics/debian/rules2
-rw-r--r--debian/squeeze/kdelibs/debian/patches/series0
-rwxr-xr-xdebian/squeeze/kdelibs/debian/rules2
-rw-r--r--debian/squeeze/kdemultimedia/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdemultimedia/debian/rules2
-rw-r--r--debian/squeeze/kdenetwork/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdenetwork/debian/rules2
-rw-r--r--debian/squeeze/kdepim/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/kdepim/debian/patches/series0
-rwxr-xr-xdebian/squeeze/kdepim/debian/rules2
-rw-r--r--debian/squeeze/kdesdk/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdesdk/debian/rules2
-rw-r--r--debian/squeeze/kdetoys/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdetoys/debian/rules2
-rw-r--r--debian/squeeze/kdeutils/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdeutils/debian/rules2
-rw-r--r--debian/squeeze/kdevelop/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdevelop/debian/rules2
-rw-r--r--debian/squeeze/kdewebdev/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/squeeze/kdewebdev/debian/rules2
-rw-r--r--debian/squeeze/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/libraries/libkipi/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/libraries/libkipi/debian/patches/series0
-rwxr-xr-xdebian/squeeze/libraries/libkipi/debian/rules2
212 files changed, 252 insertions, 89 deletions
diff --git a/debian/squeeze/applications/abakus/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/abakus/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/debian/squeeze/applications/abakus/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/adept/debian/patches/.gitignore b/debian/squeeze/applications/abakus/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/adept/debian/patches/.gitignore
+++ b/debian/squeeze/applications/abakus/debian/patches/series
diff --git a/debian/squeeze/applications/abakus/debian/rules b/debian/squeeze/applications/abakus/debian/rules
index 36bb62fb5..7f037b23e 100755
--- a/debian/squeeze/applications/abakus/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/adept/debian/rules b/debian/squeeze/applications/adept/debian/rules
index aa5a629a7..2618af2fc 100755
--- a/debian/squeeze/applications/adept/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/amarok.cmake/debian/rules b/debian/squeeze/applications/amarok.cmake/debian/rules
index 4fd9a743d..ae58dd49c 100755
--- a/debian/squeeze/applications/amarok.cmake/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/amarok/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/amarok/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/amarok/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/basket/debian/control b/debian/squeeze/applications/basket/debian/control
index 4efd608c7..c7e3f95b9 100644
--- a/debian/squeeze/applications/basket/debian/control
+++ b/debian/squeeze/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/squeeze/applications/basket/debian/rules b/debian/squeeze/applications/basket/debian/rules
index 2cfda511e..1de38c154 100755
--- a/debian/squeeze/applications/basket/debian/rules
+++ b/debian/squeeze/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:
+clean::
dh_testdir
dh_testroot
diff --git a/debian/squeeze/applications/bibletime/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/bibletime/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/bibletime/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/bibletime/debian/patches/.gitignore b/debian/squeeze/applications/bibletime/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/bibletime/debian/patches/.gitignore
+++ b/debian/squeeze/applications/bibletime/debian/patches/series
diff --git a/debian/squeeze/applications/bibletime/debian/rules b/debian/squeeze/applications/bibletime/debian/rules
index fdd90c2b3..c57001178 100755
--- a/debian/squeeze/applications/bibletime/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/compizconfig-backend-kconfig/debian/patches/.gitignore b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/patches/.gitignore
+++ b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/patches/series
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules
index 943412831..cbb918dcb 100755
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/digikam/debian/patches/.gitignore b/debian/squeeze/applications/digikam/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/digikam/debian/patches/.gitignore
+++ b/debian/squeeze/applications/digikam/debian/patches/series
diff --git a/debian/squeeze/applications/digikam/debian/rules b/debian/squeeze/applications/digikam/debian/rules
index 046053e54..2d85649a6 100755
--- a/debian/squeeze/applications/digikam/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/dolphin/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/debian/squeeze/applications/dolphin/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/dolphin/debian/patches/.gitignore b/debian/squeeze/applications/dolphin/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/dolphin/debian/patches/.gitignore
+++ b/debian/squeeze/applications/dolphin/debian/patches/series
diff --git a/debian/squeeze/applications/dolphin/debian/rules b/debian/squeeze/applications/dolphin/debian/rules
index 33e949961..7b4528041 100755
--- a/debian/squeeze/applications/dolphin/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/filelight-l10n/debian/control b/debian/squeeze/applications/filelight-l10n/debian/control
index 9edd33456..6845dfba9 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/control
+++ b/debian/squeeze/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/squeeze/applications/fusion-icon/debian/patches/.gitignore b/debian/squeeze/applications/filelight-l10n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/fusion-icon/debian/patches/.gitignore
+++ b/debian/squeeze/applications/filelight-l10n/debian/patches/series
diff --git a/debian/squeeze/applications/filelight-l10n/debian/rules b/debian/squeeze/applications/filelight-l10n/debian/rules
index bc018d11c..5d3cc2a77 100755
--- a/debian/squeeze/applications/filelight-l10n/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/filelight/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/filelight/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/filelight/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/gtk-qt-engine/debian/patches/.gitignore b/debian/squeeze/applications/fusion-icon/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/patches/.gitignore
+++ b/debian/squeeze/applications/fusion-icon/debian/patches/series
diff --git a/debian/squeeze/applications/fusion-icon/debian/rules b/debian/squeeze/applications/fusion-icon/debian/rules
index 207573dea..88040a563 100755
--- a/debian/squeeze/applications/fusion-icon/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/gwenview/debian/patches/.gitignore b/debian/squeeze/applications/gtk-qt-engine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/gwenview/debian/patches/.gitignore
+++ b/debian/squeeze/applications/gtk-qt-engine/debian/patches/series
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/rules b/debian/squeeze/applications/gtk-qt-engine/debian/rules
index bf8de0fc0..4e6f9181d 100755
--- a/debian/squeeze/applications/gtk-qt-engine/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
index fa0d532f4..ec89756bb 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/k9copy/debian/patches/.gitignore b/debian/squeeze/applications/gwenview-i18n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/k9copy/debian/patches/.gitignore
+++ b/debian/squeeze/applications/gwenview-i18n/debian/patches/series
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/rules b/debian/squeeze/applications/gwenview-i18n/debian/rules
index 02b4fd146..05b674469 100755
--- a/debian/squeeze/applications/gwenview-i18n/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/gwenview/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/gwenview/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/gwenview/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kaffeine/debian/patches/.gitignore b/debian/squeeze/applications/gwenview/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kaffeine/debian/patches/.gitignore
+++ b/debian/squeeze/applications/gwenview/debian/patches/series
diff --git a/debian/squeeze/applications/gwenview/debian/rules b/debian/squeeze/applications/gwenview/debian/rules
index b6b642662..11548ae60 100755
--- a/debian/squeeze/applications/gwenview/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/k3b/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/k3b/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/k3b/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/k3b/debian/rules b/debian/squeeze/applications/k3b/debian/rules
index db76176bd..f4f5b0012 100755
--- a/debian/squeeze/applications/k3b/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/k9copy/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/k9copy/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/k9copy/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/katapult/debian/patches/.gitignore b/debian/squeeze/applications/k9copy/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/katapult/debian/patches/.gitignore
+++ b/debian/squeeze/applications/k9copy/debian/patches/series
diff --git a/debian/squeeze/applications/k9copy/debian/rules b/debian/squeeze/applications/k9copy/debian/rules
index 46d6822df..6761a0c33 100755
--- a/debian/squeeze/applications/k9copy/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kbfx/debian/patches/.gitignore b/debian/squeeze/applications/kaffeine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kbfx/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kaffeine/debian/patches/series
diff --git a/debian/squeeze/applications/kaffeine/debian/rules b/debian/squeeze/applications/kaffeine/debian/rules
index fd4a2e53e..1add9ec5d 100755
--- a/debian/squeeze/applications/kaffeine/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/katapult/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/katapult/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/katapult/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kbookreader/debian/patches/.gitignore b/debian/squeeze/applications/katapult/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kbookreader/debian/patches/.gitignore
+++ b/debian/squeeze/applications/katapult/debian/patches/series
diff --git a/debian/squeeze/applications/katapult/debian/rules b/debian/squeeze/applications/katapult/debian/rules
index 642ce1550..da2411aad 100755
--- a/debian/squeeze/applications/katapult/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kbarcode/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kde-guidance/debian/patches/.gitignore b/debian/squeeze/applications/kbfx/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kde-guidance/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kbfx/debian/patches/series
diff --git a/debian/squeeze/applications/kbfx/debian/rules b/debian/squeeze/applications/kbfx/debian/rules
index ac0d219bc..e839edd42 100755
--- a/debian/squeeze/applications/kbfx/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/debian/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kbiff/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kbiff/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/debian/squeeze/applications/kbiff/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kbookreader/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kde-style-qtcurve/debian/patches/.gitignore b/debian/squeeze/applications/kbookreader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kbookreader/debian/patches/series
diff --git a/debian/squeeze/applications/kbookreader/debian/rules b/debian/squeeze/applications/kbookreader/debian/rules
index 20b42f646..780803d59 100755
--- a/debian/squeeze/applications/kbookreader/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kcpuload/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdbg/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/debian/squeeze/applications/kdbg/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kde-systemsettings/debian/patches/.gitignore b/debian/squeeze/applications/kde-guidance/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kde-guidance/debian/patches/series
diff --git a/debian/squeeze/applications/kde-guidance/debian/rules b/debian/squeeze/applications/kde-guidance/debian/rules
index a3a9cae35..48e5e31d7 100755
--- a/debian/squeeze/applications/kde-guidance/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kdesudo/debian/patches/.gitignore b/debian/squeeze/applications/kde-style-qtcurve/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kdesudo/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kde-style-qtcurve/debian/patches/series
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/rules b/debian/squeeze/applications/kde-style-qtcurve/debian/rules
index ad341b5e0..52bf17ae4 100755
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kdirstat/debian/patches/.gitignore b/debian/squeeze/applications/kde-systemsettings/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kdirstat/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kde-systemsettings/debian/patches/series
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/rules b/debian/squeeze/applications/kde-systemsettings/debian/rules
index 6ba108e8a..e1f09b5cc 100755
--- a/debian/squeeze/applications/kde-systemsettings/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kdesudo/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdesudo/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kdesudo/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kdpkg/debian/patches/.gitignore b/debian/squeeze/applications/kdesudo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kdpkg/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kdesudo/debian/patches/series
diff --git a/debian/squeeze/applications/kdesudo/debian/rules b/debian/squeeze/applications/kdesudo/debian/rules
index df41bc83d..f5cd38f63 100755
--- a/debian/squeeze/applications/kdesudo/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kdesvn/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdesvn/debian/cdbs/debian-qt-kde.mk
index 856fa4932..1d366e492 100644
--- a/debian/squeeze/applications/kdesvn/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kdesvn/debian/rules b/debian/squeeze/applications/kdesvn/debian/rules
index d85c8bf6a..74c5fe7ec 100755
--- a/debian/squeeze/applications/kdesvn/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kdiff3/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kdirstat/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kio-apt/debian/patches/.gitignore b/debian/squeeze/applications/kdirstat/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kio-apt/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kdirstat/debian/patches/series
diff --git a/debian/squeeze/applications/kdirstat/debian/rules b/debian/squeeze/applications/kdirstat/debian/rules
index e05262ec0..1e16df51a 100755
--- a/debian/squeeze/applications/kdirstat/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kio-umountwrapper/debian/patches/.gitignore b/debian/squeeze/applications/kdpkg/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kdpkg/debian/patches/series
diff --git a/debian/squeeze/applications/kdpkg/debian/rules b/debian/squeeze/applications/kdpkg/debian/rules
index d5ac50b42..8293bfe64 100755
--- a/debian/squeeze/applications/kdpkg/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/keep/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/keep/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/keep/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/keep/debian/rules b/debian/squeeze/applications/keep/debian/rules
index 9e498f345..e2718e364 100755
--- a/debian/squeeze/applications/keep/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kiosktool/debian/patches/.gitignore b/debian/squeeze/applications/kerry/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kiosktool/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kerry/debian/patches/series
diff --git a/debian/squeeze/applications/kerry/debian/rules b/debian/squeeze/applications/kerry/debian/rules
index f254c8044..d86250261 100755
--- a/debian/squeeze/applications/kerry/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kmplayer/debian/patches/.gitignore b/debian/squeeze/applications/kgtk-qt3/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kmplayer/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kgtk-qt3/debian/patches/series
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/rules b/debian/squeeze/applications/kgtk-qt3/debian/rules
index 7511e74b3..df246e2ae 100755
--- a/debian/squeeze/applications/kgtk-qt3/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kile/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kile/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kile/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kio-apt/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/knemo/debian/patches/.gitignore b/debian/squeeze/applications/kio-apt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/knemo/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kio-apt/debian/patches/series
diff --git a/debian/squeeze/applications/kio-apt/debian/rules b/debian/squeeze/applications/kio-apt/debian/rules
index f4c04e6ed..db5da700b 100755
--- a/debian/squeeze/applications/kio-apt/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kio-locate/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/debian/squeeze/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/knetstats/debian/patches/.gitignore b/debian/squeeze/applications/kio-locate/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/knetstats/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kio-locate/debian/patches/series
diff --git a/debian/squeeze/applications/kio-locate/debian/rules b/debian/squeeze/applications/kio-locate/debian/rules
index c75119f72..09b22dcb0 100755
--- a/debian/squeeze/applications/kio-locate/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/patches/.gitignore b/debian/squeeze/applications/kio-umountwrapper/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/koffice/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kio-umountwrapper/debian/patches/series
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/rules b/debian/squeeze/applications/kio-umountwrapper/debian/rules
index 24f8e63c2..5fd992d85 100755
--- a/debian/squeeze/applications/kio-umountwrapper/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kpowersave.cmake/debian/patches/.gitignore b/debian/squeeze/applications/kiosktool/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kiosktool/debian/patches/series
diff --git a/debian/squeeze/applications/kiosktool/debian/rules b/debian/squeeze/applications/kiosktool/debian/rules
index bdce983e0..677edd830 100755
--- a/debian/squeeze/applications/kiosktool/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kmplayer/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kpowersave/debian/patches/.gitignore b/debian/squeeze/applications/kmplayer/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kpowersave/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kmplayer/debian/patches/series
diff --git a/debian/squeeze/applications/kmplayer/debian/rules b/debian/squeeze/applications/kmplayer/debian/rules
index 9384ba114..5327ea0ac 100755
--- a/debian/squeeze/applications/kmplayer/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kmymoney/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/krusader/debian/patches/.gitignore b/debian/squeeze/applications/kmymoney/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/krusader/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kmymoney/debian/patches/series
diff --git a/debian/squeeze/applications/kmymoney/debian/rules b/debian/squeeze/applications/kmymoney/debian/rules
index 9eb4ec3ad..31b6f6332 100755
--- a/debian/squeeze/applications/kmymoney/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/knemo/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knemo/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/knemo/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/ksystemlog/debian/patches/.gitignore b/debian/squeeze/applications/knemo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/ksystemlog/debian/patches/.gitignore
+++ b/debian/squeeze/applications/knemo/debian/patches/series
diff --git a/debian/squeeze/applications/knemo/debian/rules b/debian/squeeze/applications/knemo/debian/rules
index bb89aadc5..3b66fe478 100755
--- a/debian/squeeze/applications/knemo/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/knetstats/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knetstats/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/knetstats/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/ktorrent/debian/patches/.gitignore b/debian/squeeze/applications/knetstats/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/ktorrent/debian/patches/.gitignore
+++ b/debian/squeeze/applications/knetstats/debian/patches/series
diff --git a/debian/squeeze/applications/knetstats/debian/rules b/debian/squeeze/applications/knetstats/debian/rules
index 1505e8e8e..a19b60c8d 100755
--- a/debian/squeeze/applications/knetstats/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/knetworkmanager.cmake/debian/rules b/debian/squeeze/applications/knetworkmanager.cmake/debian/rules
index 5043dd652..4a5e56fb5 100755
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk
index b93e7c154..a803f50d6 100644
--- a/debian/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kvirc/debian/patches/.gitignore b/debian/squeeze/applications/koffice/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kvirc/debian/patches/.gitignore
+++ b/debian/squeeze/applications/koffice/debian/patches/series
diff --git a/debian/squeeze/applications/koffice/debian/rules b/debian/squeeze/applications/koffice/debian/rules
index a5825d047..372998f85 100755
--- a/debian/squeeze/applications/koffice/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/konversation/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/konversation/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/konversation/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kpilot/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kpilot/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kpilot/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kpowersave.cmake/debian/control b/debian/squeeze/applications/kpowersave.cmake/debian/control
index 430ad6cb1..b5aed9d71 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/control
+++ b/debian/squeeze/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/squeeze/applications/kwin-style-crystal/debian/patches/.gitignore b/debian/squeeze/applications/kpowersave.cmake/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kpowersave.cmake/debian/patches/series
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/rules b/debian/squeeze/applications/kpowersave.cmake/debian/rules
index 0d2383bae..f84c79ba9 100755
--- a/debian/squeeze/applications/kpowersave.cmake/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/piklab/debian/patches/.gitignore b/debian/squeeze/applications/kpowersave/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/piklab/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kpowersave/debian/patches/series
diff --git a/debian/squeeze/applications/kpowersave/debian/rules b/debian/squeeze/applications/kpowersave/debian/rules
index 16dc75082..1575fca96 100755
--- a/debian/squeeze/applications/kpowersave/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/krename/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/krename/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/krename/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/rosegarden/debian/patches/.gitignore b/debian/squeeze/applications/krename/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/rosegarden/debian/patches/.gitignore
+++ b/debian/squeeze/applications/krename/debian/patches/series
diff --git a/debian/squeeze/applications/krename/debian/rules b/debian/squeeze/applications/krename/debian/rules
index 0df91fd2c..404787210 100755
--- a/debian/squeeze/applications/krename/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/krusader/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/krusader/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/krusader/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/wlassistant/debian/patches/.gitignore b/debian/squeeze/applications/krusader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/wlassistant/debian/patches/.gitignore
+++ b/debian/squeeze/applications/krusader/debian/patches/series
diff --git a/debian/squeeze/applications/krusader/debian/rules b/debian/squeeze/applications/krusader/debian/rules
index 3095cca3c..eb772b614 100755
--- a/debian/squeeze/applications/krusader/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/kdegraphics/debian/patches/.gitignore b/debian/squeeze/applications/ksystemlog/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/kdegraphics/debian/patches/.gitignore
+++ b/debian/squeeze/applications/ksystemlog/debian/patches/series
diff --git a/debian/squeeze/applications/ksystemlog/debian/rules b/debian/squeeze/applications/ksystemlog/debian/rules
index 6e41ea3f6..2ba30f9a0 100755
--- a/debian/squeeze/applications/ksystemlog/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index b93e7c154..a803f50d6 100644
--- a/debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/kdepim/debian/patches/.gitignore b/debian/squeeze/applications/ktorrent/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/kdepim/debian/patches/.gitignore
+++ b/debian/squeeze/applications/ktorrent/debian/patches/series
diff --git a/debian/squeeze/applications/ktorrent/debian/rules b/debian/squeeze/applications/ktorrent/debian/rules
index 191e61381..df3bef893 100755
--- a/debian/squeeze/applications/ktorrent/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kuickshow/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/libraries/libkipi/debian/patches/.gitignore b/debian/squeeze/applications/kuickshow/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/libraries/libkipi/debian/patches/.gitignore
+++ b/debian/squeeze/applications/kuickshow/debian/patches/series
diff --git a/debian/squeeze/applications/kuickshow/debian/rules b/debian/squeeze/applications/kuickshow/debian/rules
index c8061ea29..e8c53e5db 100755
--- a/debian/squeeze/applications/kuickshow/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kvirc/debian/patches/series b/debian/squeeze/applications/kvirc/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/applications/kvirc/debian/patches/series
diff --git a/debian/squeeze/applications/kvirc/debian/rules b/debian/squeeze/applications/kvirc/debian/rules
index 96984bd79..3a8490e65 100755
--- a/debian/squeeze/applications/kvirc/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/kwin-style-crystal/debian/patches/series b/debian/squeeze/applications/kwin-style-crystal/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/applications/kwin-style-crystal/debian/patches/series
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/rules b/debian/squeeze/applications/kwin-style-crystal/debian/rules
index 6e735f5dc..2546c8657 100755
--- a/debian/squeeze/applications/kwin-style-crystal/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/piklab/debian/control b/debian/squeeze/applications/piklab/debian/control
index 2e8d8ffda..72ab578b2 100644
--- a/debian/squeeze/applications/piklab/debian/control
+++ b/debian/squeeze/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/squeeze/applications/piklab/debian/patches/series b/debian/squeeze/applications/piklab/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/applications/piklab/debian/patches/series
diff --git a/debian/squeeze/applications/piklab/debian/rules b/debian/squeeze/applications/piklab/debian/rules
index 5edcb99ef..416588f8a 100755
--- a/debian/squeeze/applications/piklab/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
index 856fa4932..1d366e492 100644
--- a/debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/rosegarden/debian/control b/debian/squeeze/applications/rosegarden/debian/control
index b62c06adc..bfa8fbc1f 100644
--- a/debian/squeeze/applications/rosegarden/debian/control
+++ b/debian/squeeze/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, quilt, 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
+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/squeeze/applications/rosegarden/debian/patches/series b/debian/squeeze/applications/rosegarden/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/applications/rosegarden/debian/patches/series
diff --git a/debian/squeeze/applications/rosegarden/debian/rules b/debian/squeeze/applications/rosegarden/debian/rules
index d554585f6..03a24f92b 100755
--- a/debian/squeeze/applications/rosegarden/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/smb4k/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/smb4k/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/smb4k/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/wlassistant/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/debian/squeeze/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/applications/wlassistant/debian/patches/series b/debian/squeeze/applications/wlassistant/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/applications/wlassistant/debian/patches/series
diff --git a/debian/squeeze/applications/wlassistant/debian/rules b/debian/squeeze/applications/wlassistant/debian/rules
index f9260b34c..13db5ab65 100755
--- a/debian/squeeze/applications/wlassistant/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/yakuake/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/yakuake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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 :=
diff --git a/debian/squeeze/dependencies/arts/debian/rules b/debian/squeeze/dependencies/arts/debian/rules
index 9c6b3f289..2e7e5c14f 100755
--- a/debian/squeeze/dependencies/arts/debian/rules
+++ b/debian/squeeze/dependencies/arts/debian/rules
@@ -10,7 +10,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/squeeze/dependencies/dbus-1-tqt/debian/patches/series b/debian/squeeze/dependencies/dbus-1-tqt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/dependencies/dbus-1-tqt/debian/patches/series
diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/rules b/debian/squeeze/dependencies/dbus-1-tqt/debian/rules
index 6a0f5bbed..ffe1bf6e7 100755
--- a/debian/squeeze/dependencies/dbus-1-tqt/debian/rules
+++ b/debian/squeeze/dependencies/dbus-1-tqt/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-#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 /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/patches/series b/debian/squeeze/dependencies/dbus-tqt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/dependencies/dbus-tqt/debian/patches/series
diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/rules b/debian/squeeze/dependencies/dbus-tqt/debian/rules
index 3edd7c59c..71f625c30 100755
--- a/debian/squeeze/dependencies/dbus-tqt/debian/rules
+++ b/debian/squeeze/dependencies/dbus-tqt/debian/rules
@@ -3,7 +3,7 @@
# Copyright © 2003 Daniel Stone <daniels@debian.org>
# Copyright © 2006 Sjoerd Simons <sjoerd@debian.org>
-#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 /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
diff --git a/debian/squeeze/dependencies/qt3/debian/control b/debian/squeeze/dependencies/qt3/debian/control
index d469c66cf..aee89f140 100644
--- a/debian/squeeze/dependencies/qt3/debian/control
+++ b/debian/squeeze/dependencies/qt3/debian/control
@@ -2,7 +2,7 @@ Source: qt-x11-free
Maintainer: Debian Developers <kubuntu-devel@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
+Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4),
libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
diff --git a/debian/squeeze/dependencies/qt3/debian/rules b/debian/squeeze/dependencies/qt3/debian/rules
index 09124ab8b..1b4954261 100755
--- a/debian/squeeze/dependencies/qt3/debian/rules
+++ b/debian/squeeze/dependencies/qt3/debian/rules
@@ -29,7 +29,7 @@ endif #sparc
endif #hurd
# quilt stuff
-#include /usr/share/quilt/quilt.make
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# build variables (directorys)
DEBIAN = $(shell pwd)/debian
@@ -123,7 +123,7 @@ build: libqt-thread-stamp
touch build-stamp
-libqt-thread-stamp: $(QUILT_STAMPFN)
+libqt-thread-stamp: post-patches
@echo "QTDIR is ${QTDIR}"
@@ -171,7 +171,7 @@ libqt-thread-stamp: $(QUILT_STAMPFN)
touch libqt-thread-stamp
-clean: unpatch
+clean::
dh_testdir
@@ -475,4 +475,4 @@ binary-arch: build install
dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS)
binary: binary-indep binary-arch
-.PHONY: build binary-indep binary-arch binary install clean patch unpatch
+.PHONY: build binary-indep binary-arch binary install clean
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/patches/series b/debian/squeeze/dependencies/tqtinterface/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/dependencies/tqtinterface/debian/patches/series
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/rules b/debian/squeeze/dependencies/tqtinterface/debian/rules
index ed3f07a6d..464100180 100755
--- a/debian/squeeze/dependencies/tqtinterface/debian/rules
+++ b/debian/squeeze/dependencies/tqtinterface/debian/rules
@@ -3,7 +3,7 @@
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
DEB_KDE_APIDOX := yes
diff --git a/debian/squeeze/kdeaccessibility/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/squeeze/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdeaccessibility/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/squeeze/kdeaccessibility/debian/rules b/debian/squeeze/kdeaccessibility/debian/rules
index 3cdcff750..40438cdd6 100755
--- a/debian/squeeze/kdeaccessibility/debian/rules
+++ b/debian/squeeze/kdeaccessibility/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/squeeze/kdeaddons/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdeaddons/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/squeeze/kdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdeaddons/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/squeeze/kdeaddons/debian/rules b/debian/squeeze/kdeaddons/debian/rules
index 27866a5e6..7c1c683e5 100755
--- a/debian/squeeze/kdeaddons/debian/rules
+++ b/debian/squeeze/kdeaddons/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/squeeze/kdeadmin/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdeadmin/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/squeeze/kdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdeadmin/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/squeeze/kdeadmin/debian/rules b/debian/squeeze/kdeadmin/debian/rules
index 52fa58219..9a3c17683 100755
--- a/debian/squeeze/kdeadmin/debian/rules
+++ b/debian/squeeze/kdeadmin/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/squeeze/kdeartwork/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdeartwork/debian/cdbs/debian-qt-kde.mk
index 497be9751..425264528 100644
--- a/debian/squeeze/kdeartwork/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdeartwork/debian/cdbs/debian-qt-kde.mk
@@ -20,7 +20,9 @@ endif
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/squeeze/kdeartwork/debian/rules b/debian/squeeze/kdeartwork/debian/rules
index 150859d96..3c40130e7 100755
--- a/debian/squeeze/kdeartwork/debian/rules
+++ b/debian/squeeze/kdeartwork/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.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
diff --git a/debian/squeeze/kdebase/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdebase/debian/cdbs/debian-qt-kde.mk
index fa0d532f4..ec89756bb 100644
--- a/debian/squeeze/kdebase/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdebase/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/squeeze/kdebase/debian/rules b/debian/squeeze/kdebase/debian/rules
index f19b000c6..00893f940 100755
--- a/debian/squeeze/kdebase/debian/rules
+++ b/debian/squeeze/kdebase/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/squeeze/kdebindings/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdebindings/debian/cdbs/debian-qt-kde.mk
index 2a219d60a..1e862f623 100644
--- a/debian/squeeze/kdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdebindings/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/squeeze/kdeedu/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdeedu/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/squeeze/kdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdeedu/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/squeeze/kdeedu/debian/rules b/debian/squeeze/kdeedu/debian/rules
index acf638002..cb62b898c 100755
--- a/debian/squeeze/kdeedu/debian/rules
+++ b/debian/squeeze/kdeedu/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/squeeze/kdegames/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdegames/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/squeeze/kdegames/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdegames/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/squeeze/kdegames/debian/rules b/debian/squeeze/kdegames/debian/rules
index 96f768ec9..d63ea6d30 100755
--- a/debian/squeeze/kdegames/debian/rules
+++ b/debian/squeeze/kdegames/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
export kde_bindir = /opt/trinity/games
diff --git a/debian/squeeze/kdegraphics/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdegraphics/debian/cdbs/debian-qt-kde.mk
index df08f2d37..7c7e6d56c 100644
--- a/debian/squeeze/kdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdegraphics/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/squeeze/kdegraphics/debian/rules b/debian/squeeze/kdegraphics/debian/rules
index ab2877e0c..3a69a6d97 100755
--- a/debian/squeeze/kdegraphics/debian/rules
+++ b/debian/squeeze/kdegraphics/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
DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
diff --git a/debian/squeeze/kdelibs/debian/patches/series b/debian/squeeze/kdelibs/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/kdelibs/debian/patches/series
diff --git a/debian/squeeze/kdelibs/debian/rules b/debian/squeeze/kdelibs/debian/rules
index 35d5a5bac..df85a42f7 100755
--- a/debian/squeeze/kdelibs/debian/rules
+++ b/debian/squeeze/kdelibs/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/squeeze/kdemultimedia/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdemultimedia/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/squeeze/kdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdemultimedia/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/squeeze/kdemultimedia/debian/rules b/debian/squeeze/kdemultimedia/debian/rules
index 178e42e96..c7bbdcd71 100755
--- a/debian/squeeze/kdemultimedia/debian/rules
+++ b/debian/squeeze/kdemultimedia/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/squeeze/kdenetwork/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdenetwork/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/debian/squeeze/kdenetwork/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdenetwork/debian/cdbs/debian-qt-kde.mk
@@ -20,7 +20,9 @@ endif
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/squeeze/kdenetwork/debian/rules b/debian/squeeze/kdenetwork/debian/rules
index 169b64e66..101d91a2c 100755
--- a/debian/squeeze/kdenetwork/debian/rules
+++ b/debian/squeeze/kdenetwork/debian/rules
@@ -15,7 +15,7 @@ export DH_OPTIONS
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.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
diff --git a/debian/squeeze/kdepim/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdepim/debian/cdbs/debian-qt-kde.mk
index fa0d532f4..ec89756bb 100644
--- a/debian/squeeze/kdepim/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdepim/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/squeeze/kdepim/debian/patches/series b/debian/squeeze/kdepim/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/kdepim/debian/patches/series
diff --git a/debian/squeeze/kdepim/debian/rules b/debian/squeeze/kdepim/debian/rules
index 4c8d36cb3..23a00eba7 100755
--- a/debian/squeeze/kdepim/debian/rules
+++ b/debian/squeeze/kdepim/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/squeeze/kdesdk/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdesdk/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/debian/squeeze/kdesdk/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdesdk/debian/cdbs/debian-qt-kde.mk
@@ -20,7 +20,9 @@ endif
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/squeeze/kdesdk/debian/rules b/debian/squeeze/kdesdk/debian/rules
index f85a4bf86..b382ba355 100755
--- a/debian/squeeze/kdesdk/debian/rules
+++ b/debian/squeeze/kdesdk/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.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
diff --git a/debian/squeeze/kdetoys/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdetoys/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/debian/squeeze/kdetoys/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdetoys/debian/cdbs/debian-qt-kde.mk
@@ -20,7 +20,9 @@ endif
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/squeeze/kdetoys/debian/rules b/debian/squeeze/kdetoys/debian/rules
index dc7b40efd..96f3778ee 100755
--- a/debian/squeeze/kdetoys/debian/rules
+++ b/debian/squeeze/kdetoys/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.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
diff --git a/debian/squeeze/kdeutils/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdeutils/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/debian/squeeze/kdeutils/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdeutils/debian/cdbs/debian-qt-kde.mk
@@ -20,7 +20,9 @@ endif
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/squeeze/kdeutils/debian/rules b/debian/squeeze/kdeutils/debian/rules
index 9cae10e9b..cdb529f2e 100755
--- a/debian/squeeze/kdeutils/debian/rules
+++ b/debian/squeeze/kdeutils/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.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
diff --git a/debian/squeeze/kdevelop/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdevelop/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/debian/squeeze/kdevelop/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdevelop/debian/cdbs/debian-qt-kde.mk
@@ -20,7 +20,9 @@ endif
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/squeeze/kdevelop/debian/rules b/debian/squeeze/kdevelop/debian/rules
index 6c70c4b46..2e5fb0268 100755
--- a/debian/squeeze/kdevelop/debian/rules
+++ b/debian/squeeze/kdevelop/debian/rules
@@ -7,7 +7,7 @@ makebuilddir::
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.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
diff --git a/debian/squeeze/kdewebdev/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdewebdev/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/squeeze/kdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdewebdev/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/squeeze/kdewebdev/debian/rules b/debian/squeeze/kdewebdev/debian/rules
index 7c1c6306f..9cbfc111e 100755
--- a/debian/squeeze/kdewebdev/debian/rules
+++ b/debian/squeeze/kdewebdev/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/libraries/kipi-plugins/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/squeeze/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/libraries/libkdcraw/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/squeeze/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/libraries/libkexiv2/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/squeeze/libraries/libkipi/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/libraries/libkipi/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/squeeze/libraries/libkipi/debian/patches/series b/debian/squeeze/libraries/libkipi/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/libraries/libkipi/debian/patches/series
diff --git a/debian/squeeze/libraries/libkipi/debian/rules b/debian/squeeze/libraries/libkipi/debian/rules
index 3eccc3266..ee0b9c258 100755
--- a/debian/squeeze/libraries/libkipi/debian/rules
+++ b/debian/squeeze/libraries/libkipi/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