summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/lenny/applications/abakus/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/abakus/debian/control2
-rw-r--r--debian/lenny/applications/abakus/debian/patches/series (renamed from debian/lenny/applications/adept/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/abakus/debian/rules2
-rw-r--r--debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/adept/debian/control2
-rw-r--r--debian/lenny/applications/adept/debian/patches/series1
-rwxr-xr-xdebian/lenny/applications/adept/debian/rules2
-rw-r--r--debian/lenny/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/lenny/applications/amarok.cmake/debian/rules2
-rw-r--r--debian/lenny/applications/amarok/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/basket/debian/control2
-rwxr-xr-xdebian/lenny/applications/basket/debian/rules6
-rw-r--r--debian/lenny/applications/bibletime/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/bibletime/debian/patches/series (renamed from debian/lenny/applications/bibletime/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/bibletime/debian/rules2
-rw-r--r--debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/compizconfig-backend-kconfig/debian/control2
-rw-r--r--debian/lenny/applications/compizconfig-backend-kconfig/debian/patches/series (renamed from debian/lenny/applications/compizconfig-backend-kconfig/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/compizconfig-backend-kconfig/debian/rules2
-rw-r--r--debian/lenny/applications/digikam/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/digikam/debian/control2
-rw-r--r--debian/lenny/applications/digikam/debian/patches/series (renamed from debian/lenny/applications/digikam/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/digikam/debian/rules2
-rw-r--r--debian/lenny/applications/dolphin/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/dolphin/debian/control2
-rw-r--r--debian/lenny/applications/dolphin/debian/patches/series (renamed from debian/lenny/applications/dolphin/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/dolphin/debian/rules2
-rw-r--r--debian/lenny/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/filelight-l10n/debian/control2
-rw-r--r--debian/lenny/applications/filelight-l10n/debian/patches/series (renamed from debian/lenny/applications/fusion-icon/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/filelight-l10n/debian/rules2
-rw-r--r--debian/lenny/applications/filelight/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/fusion-icon/debian/control2
-rw-r--r--debian/lenny/applications/fusion-icon/debian/patches/series (renamed from debian/lenny/applications/gtk-qt-engine/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/fusion-icon/debian/rules2
-rw-r--r--debian/lenny/applications/gtk-qt-engine/debian/control2
-rw-r--r--debian/lenny/applications/gtk-qt-engine/debian/patches/series (renamed from debian/lenny/applications/gwenview/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/gtk-qt-engine/debian/rules2
-rw-r--r--debian/lenny/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/gwenview-i18n/debian/patches/series (renamed from debian/lenny/applications/k9copy/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/gwenview-i18n/debian/rules2
-rw-r--r--debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/gwenview/debian/control2
-rw-r--r--debian/lenny/applications/gwenview/debian/patches/series (renamed from debian/lenny/applications/kaffeine/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/gwenview/debian/rules2
-rw-r--r--debian/lenny/applications/k3b/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/k3b/debian/control2
-rw-r--r--debian/lenny/applications/k3b/debian/patches/series1
-rwxr-xr-xdebian/lenny/applications/k3b/debian/rules2
-rw-r--r--debian/lenny/applications/k9copy/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/k9copy/debian/control2
-rw-r--r--debian/lenny/applications/k9copy/debian/patches/series (renamed from debian/lenny/applications/katapult/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/k9copy/debian/rules2
-rw-r--r--debian/lenny/applications/kaffeine/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kaffeine/debian/control2
-rw-r--r--debian/lenny/applications/kaffeine/debian/patches/series (renamed from debian/lenny/applications/kbfx/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kaffeine/debian/rules2
-rw-r--r--debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/katapult/debian/control2
-rw-r--r--debian/lenny/applications/katapult/debian/patches/series (renamed from debian/lenny/applications/kbookreader/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/katapult/debian/rules2
-rw-r--r--debian/lenny/applications/kbarcode/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kbfx/debian/control2
-rw-r--r--debian/lenny/applications/kbfx/debian/patches/series (renamed from debian/lenny/applications/kde-guidance/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kbfx/debian/rules2
-rw-r--r--debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kbiff/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kbookreader/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kbookreader/debian/control2
-rw-r--r--debian/lenny/applications/kbookreader/debian/patches/series (renamed from debian/lenny/applications/kde-style-qtcurve/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kbookreader/debian/rules2
-rw-r--r--debian/lenny/applications/kcpuload/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kde-guidance/debian/control2
-rw-r--r--debian/lenny/applications/kde-guidance/debian/patches/series (renamed from debian/lenny/applications/kde-systemsettings/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kde-guidance/debian/rules2
-rw-r--r--debian/lenny/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kde-style-qtcurve/debian/control2
-rw-r--r--debian/lenny/applications/kde-style-qtcurve/debian/patches/series (renamed from debian/lenny/applications/kdesudo/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kde-style-qtcurve/debian/rules2
-rw-r--r--debian/lenny/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kde-systemsettings/debian/control2
-rw-r--r--debian/lenny/applications/kde-systemsettings/debian/patches/series (renamed from debian/lenny/applications/kdirstat/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kde-systemsettings/debian/rules2
-rw-r--r--debian/lenny/applications/kdesudo/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kdesudo/debian/control2
-rw-r--r--debian/lenny/applications/kdesudo/debian/patches/series (renamed from debian/lenny/applications/kdpkg/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kdesudo/debian/rules2
-rw-r--r--debian/lenny/applications/kdesvn/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/lenny/applications/kdesvn/debian/rules2
-rw-r--r--debian/lenny/applications/kdiff3/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kdirstat/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kdirstat/debian/control2
-rw-r--r--debian/lenny/applications/kdirstat/debian/patches/series (renamed from debian/lenny/applications/kio-apt/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kdirstat/debian/rules2
-rw-r--r--debian/lenny/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kdpkg/debian/control2
-rw-r--r--debian/lenny/applications/kdpkg/debian/patches/series (renamed from debian/lenny/applications/kio-umountwrapper/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kdpkg/debian/rules2
-rw-r--r--debian/lenny/applications/keep/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/keep/debian/control2
-rw-r--r--debian/lenny/applications/keep/debian/patches/series1
-rwxr-xr-xdebian/lenny/applications/keep/debian/rules2
-rw-r--r--debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kerry/debian/control2
-rw-r--r--debian/lenny/applications/kerry/debian/patches/series (renamed from debian/lenny/applications/kiosktool/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kerry/debian/rules2
-rw-r--r--debian/lenny/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kgtk-qt3/debian/control2
-rw-r--r--debian/lenny/applications/kgtk-qt3/debian/patches/series (renamed from debian/lenny/applications/kmplayer/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kgtk-qt3/debian/rules2
-rw-r--r--debian/lenny/applications/kile/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kio-apt/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kio-apt/debian/control2
-rw-r--r--debian/lenny/applications/kio-apt/debian/patches/series (renamed from debian/lenny/applications/knemo/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kio-apt/debian/rules2
-rw-r--r--debian/lenny/applications/kio-locate/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kio-locate/debian/control2
-rw-r--r--debian/lenny/applications/kio-locate/debian/patches/series (renamed from debian/lenny/applications/knetstats/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kio-locate/debian/rules2
-rw-r--r--debian/lenny/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kio-umountwrapper/debian/control2
-rw-r--r--debian/lenny/applications/kio-umountwrapper/debian/patches/series (renamed from debian/lenny/applications/koffice/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kio-umountwrapper/debian/rules2
-rw-r--r--debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kiosktool/debian/control2
-rw-r--r--debian/lenny/applications/kiosktool/debian/patches/series (renamed from debian/lenny/applications/kpowersave.cmake/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kiosktool/debian/rules2
-rw-r--r--debian/lenny/applications/kmplayer/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kmplayer/debian/control2
-rw-r--r--debian/lenny/applications/kmplayer/debian/patches/series (renamed from debian/lenny/applications/kpowersave/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kmplayer/debian/rules2
-rw-r--r--debian/lenny/applications/kmymoney/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kmymoney/debian/control2
-rw-r--r--debian/lenny/applications/kmymoney/debian/patches/series (renamed from debian/lenny/applications/krusader/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kmymoney/debian/rules2
-rw-r--r--debian/lenny/applications/knemo/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/knemo/debian/control2
-rw-r--r--debian/lenny/applications/knemo/debian/patches/series (renamed from debian/lenny/applications/ksystemlog/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/knemo/debian/rules2
-rw-r--r--debian/lenny/applications/knetstats/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/knetstats/debian/control2
-rw-r--r--debian/lenny/applications/knetstats/debian/patches/series (renamed from debian/lenny/applications/ktorrent/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/knetstats/debian/rules2
-rw-r--r--debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xdebian/lenny/applications/knetworkmanager.cmake/debian/rules2
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/koffice/debian/control2
-rw-r--r--debian/lenny/applications/koffice/debian/patches/series (renamed from debian/lenny/applications/kvirc/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/koffice/debian/rules2
-rw-r--r--debian/lenny/applications/konversation/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kpilot/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kpowersave.cmake/debian/control2
-rw-r--r--debian/lenny/applications/kpowersave.cmake/debian/patches/series (renamed from debian/lenny/applications/kwin-style-crystal/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kpowersave.cmake/debian/rules2
-rw-r--r--debian/lenny/applications/kpowersave/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kpowersave/debian/control2
-rw-r--r--debian/lenny/applications/kpowersave/debian/patches/series (renamed from debian/lenny/applications/piklab/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kpowersave/debian/rules2
-rw-r--r--debian/lenny/applications/krename/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/krename/debian/control2
-rw-r--r--debian/lenny/applications/krename/debian/patches/series (renamed from debian/lenny/applications/rosegarden/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/krename/debian/rules2
-rw-r--r--debian/lenny/applications/krusader/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/krusader/debian/control2
-rw-r--r--debian/lenny/applications/krusader/debian/patches/series (renamed from debian/lenny/applications/wlassistant/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/krusader/debian/rules2
-rw-r--r--debian/lenny/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/ksystemlog/debian/control2
-rw-r--r--debian/lenny/applications/ksystemlog/debian/patches/series (renamed from debian/lenny/kdegraphics/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/ksystemlog/debian/rules2
-rw-r--r--debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/ktorrent/debian/control2
-rw-r--r--debian/lenny/applications/ktorrent/debian/patches/series (renamed from debian/lenny/kdepim/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/ktorrent/debian/rules2
-rw-r--r--debian/lenny/applications/kuickshow/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kuickshow/debian/control2
-rw-r--r--debian/lenny/applications/kuickshow/debian/patches/series (renamed from debian/lenny/libraries/libkipi/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kuickshow/debian/rules2
-rw-r--r--debian/lenny/applications/kvirc/debian/control2
-rw-r--r--debian/lenny/applications/kvirc/debian/patches/series (renamed from debian/squeeze/applications/adept/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kvirc/debian/rules2
-rw-r--r--debian/lenny/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/kwin-style-crystal/debian/control2
-rw-r--r--debian/lenny/applications/kwin-style-crystal/debian/patches/series (renamed from debian/squeeze/applications/bibletime/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/kwin-style-crystal/debian/rules2
-rw-r--r--debian/lenny/applications/piklab/debian/control2
-rw-r--r--debian/lenny/applications/piklab/debian/patches/series (renamed from debian/squeeze/applications/compizconfig-backend-kconfig/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/piklab/debian/rules9
-rw-r--r--debian/lenny/applications/rosegarden/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/rosegarden/debian/control2
-rw-r--r--debian/lenny/applications/rosegarden/debian/patches/series (renamed from debian/squeeze/applications/digikam/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/rosegarden/debian/rules2
-rw-r--r--debian/lenny/applications/smb4k/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/wlassistant/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/applications/wlassistant/debian/control2
-rw-r--r--debian/lenny/applications/wlassistant/debian/patches/series (renamed from debian/squeeze/applications/dolphin/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/applications/wlassistant/debian/rules2
-rw-r--r--debian/lenny/applications/yakuake/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/dependencies/arts/debian/control2
-rw-r--r--debian/lenny/dependencies/arts/debian/patches/series1
-rwxr-xr-xdebian/lenny/dependencies/arts/debian/rules2
-rw-r--r--debian/lenny/dependencies/dbus-1-tqt/debian/control2
-rw-r--r--debian/lenny/dependencies/dbus-1-tqt/debian/patches/series (renamed from debian/squeeze/applications/fusion-icon/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/dependencies/dbus-1-tqt/debian/rules2
-rw-r--r--debian/lenny/dependencies/dbus-tqt/debian/control2
-rw-r--r--debian/lenny/dependencies/dbus-tqt/debian/patches/series (renamed from debian/squeeze/applications/gtk-qt-engine/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/dependencies/dbus-tqt/debian/rules2
-rw-r--r--debian/lenny/dependencies/qt3/debian/control2
-rwxr-xr-xdebian/lenny/dependencies/qt3/debian/rules8
-rw-r--r--debian/lenny/dependencies/tqtinterface/debian/control2
-rw-r--r--debian/lenny/dependencies/tqtinterface/debian/patches/series (renamed from debian/squeeze/applications/gwenview/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/dependencies/tqtinterface/debian/rules2
-rw-r--r--debian/lenny/kdeaccessibility/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdeaccessibility/debian/control2
-rw-r--r--debian/lenny/kdeaccessibility/debian/patches/series3
-rwxr-xr-xdebian/lenny/kdeaccessibility/debian/rules2
-rw-r--r--debian/lenny/kdeaddons/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdeaddons/debian/control2
-rw-r--r--debian/lenny/kdeaddons/debian/patches/series3
-rwxr-xr-xdebian/lenny/kdeaddons/debian/rules2
-rw-r--r--debian/lenny/kdeadmin/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdeadmin/debian/control2
-rw-r--r--debian/lenny/kdeadmin/debian/patches/series3
-rwxr-xr-xdebian/lenny/kdeadmin/debian/rules2
-rw-r--r--debian/lenny/kdeartwork/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdeartwork/debian/control2
-rw-r--r--debian/lenny/kdeartwork/debian/patches/series (renamed from debian/squeeze/applications/k9copy/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/kdeartwork/debian/rules2
-rw-r--r--debian/lenny/kdebase/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdebase/debian/control2
-rw-r--r--debian/lenny/kdebase/debian/patches/series2
-rwxr-xr-xdebian/lenny/kdebase/debian/rules2
-rw-r--r--debian/lenny/kdebindings/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdeedu/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdeedu/debian/control2
-rw-r--r--debian/lenny/kdeedu/debian/patches/series3
-rwxr-xr-xdebian/lenny/kdeedu/debian/rules2
-rw-r--r--debian/lenny/kdegames/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdegames/debian/control2
-rw-r--r--debian/lenny/kdegames/debian/patches/series3
-rwxr-xr-xdebian/lenny/kdegames/debian/rules2
-rw-r--r--debian/lenny/kdegraphics/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdegraphics/debian/control2
-rw-r--r--debian/lenny/kdegraphics/debian/patches/series3
-rwxr-xr-xdebian/lenny/kdegraphics/debian/rules2
-rw-r--r--debian/lenny/kdelibs/debian/control2
-rw-r--r--debian/lenny/kdelibs/debian/patches/series (renamed from debian/squeeze/applications/kaffeine/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/kdelibs/debian/rules2
-rw-r--r--debian/lenny/kdemultimedia/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdemultimedia/debian/control2
-rw-r--r--debian/lenny/kdemultimedia/debian/patches/series3
-rwxr-xr-xdebian/lenny/kdemultimedia/debian/rules2
-rw-r--r--debian/lenny/kdenetwork/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdenetwork/debian/control2
-rw-r--r--debian/lenny/kdenetwork/debian/patches/series3
-rwxr-xr-xdebian/lenny/kdenetwork/debian/rules2
-rw-r--r--debian/lenny/kdepim/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdepim/debian/control2
-rw-r--r--debian/lenny/kdepim/debian/patches/series (renamed from debian/squeeze/applications/katapult/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/kdepim/debian/rules2
-rw-r--r--debian/lenny/kdesdk/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdesdk/debian/control2
-rw-r--r--debian/lenny/kdesdk/debian/patches/series3
-rwxr-xr-xdebian/lenny/kdesdk/debian/rules2
-rw-r--r--debian/lenny/kdetoys/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdetoys/debian/control2
-rw-r--r--debian/lenny/kdetoys/debian/patches/series3
-rwxr-xr-xdebian/lenny/kdetoys/debian/rules2
-rw-r--r--debian/lenny/kdeutils/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdeutils/debian/control2
-rw-r--r--debian/lenny/kdeutils/debian/patches/series5
-rwxr-xr-xdebian/lenny/kdeutils/debian/rules2
-rw-r--r--debian/lenny/kdevelop/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdevelop/debian/control2
-rw-r--r--debian/lenny/kdevelop/debian/patches/series3
-rwxr-xr-xdebian/lenny/kdevelop/debian/rules2
-rw-r--r--debian/lenny/kdewebdev/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/kdewebdev/debian/control2
-rw-r--r--debian/lenny/kdewebdev/debian/patches/series1
-rwxr-xr-xdebian/lenny/kdewebdev/debian/rules2
-rw-r--r--debian/lenny/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/libraries/libkipi/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/libraries/libkipi/debian/control2
-rw-r--r--debian/lenny/libraries/libkipi/debian/patches/series (renamed from debian/squeeze/applications/kbfx/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/libraries/libkipi/debian/rules2
-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/kbookreader/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/kde-guidance/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/kde-style-qtcurve/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/kde-systemsettings/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/kdesudo/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/kdirstat/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/kdpkg/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/kio-apt/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/kio-umountwrapper/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/kiosktool/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/kmplayer/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/knemo/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/knetstats/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/koffice/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/kpowersave.cmake/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/kpowersave/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/krusader/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/ksystemlog/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/ktorrent/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/kvirc/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/kwin-style-crystal/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/piklab/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/rosegarden/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/wlassistant/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/kdegraphics/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/kdepim/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/libraries/libkipi/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 ubuntu/maverick/applications/adept/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 ubuntu/maverick/applications/bibletime/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 ubuntu/maverick/applications/compizconfig-backend-kconfig/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 ubuntu/maverick/applications/digikam/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 ubuntu/maverick/applications/dolphin/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 ubuntu/maverick/applications/fusion-icon/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 ubuntu/maverick/applications/gtk-qt-engine/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 ubuntu/maverick/applications/gwenview/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 ubuntu/maverick/applications/k9copy/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 ubuntu/maverick/applications/kaffeine/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 ubuntu/maverick/applications/katapult/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 ubuntu/maverick/applications/kbfx/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/applications/kuickshow/debian/rules2
-rw-r--r--debian/squeeze/applications/kvirc/debian/patches/series (renamed from ubuntu/maverick/applications/kbookreader/debian/patches/.gitignore)0
-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/series (renamed from ubuntu/maverick/applications/kde-guidance/debian/patches/.gitignore)0
-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/series (renamed from ubuntu/maverick/applications/kde-style-qtcurve/debian/patches/.gitignore)0
-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/series (renamed from ubuntu/maverick/applications/kde-systemsettings/debian/patches/.gitignore)0
-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/series (renamed from ubuntu/maverick/applications/kdesudo/debian/patches/.gitignore)0
-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/series (renamed from ubuntu/maverick/applications/kdirstat/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/dependencies/dbus-1-tqt/debian/rules2
-rw-r--r--debian/squeeze/dependencies/dbus-tqt/debian/patches/series (renamed from ubuntu/maverick/applications/kdpkg/debian/patches/.gitignore)0
-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/series (renamed from ubuntu/maverick/applications/kio-apt/debian/patches/.gitignore)0
-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/series (renamed from ubuntu/maverick/applications/kio-umountwrapper/debian/patches/.gitignore)0
-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/series (renamed from ubuntu/maverick/applications/kmplayer/debian/patches/.gitignore)0
-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/series (renamed from ubuntu/maverick/applications/knemo/debian/patches/.gitignore)0
-rwxr-xr-xdebian/squeeze/libraries/libkipi/debian/rules2
-rw-r--r--ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/abakus/debian/patches/series (renamed from ubuntu/maverick/applications/knetstats/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/abakus/debian/rules2
-rw-r--r--ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/adept/debian/patches/series (renamed from ubuntu/maverick/applications/koffice/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/adept/debian/rules2
-rw-r--r--ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/applications/amarok.cmake/debian/rules2
-rw-r--r--ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/basket/debian/control2
-rwxr-xr-xubuntu/maverick/applications/basket/debian/rules6
-rw-r--r--ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/bibletime/debian/patches/series (renamed from ubuntu/maverick/applications/kpowersave.cmake/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/bibletime/debian/rules2
-rw-r--r--ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/series (renamed from ubuntu/maverick/applications/kpowersave/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules2
-rw-r--r--ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/digikam/debian/patches/series (renamed from ubuntu/maverick/applications/krusader/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/digikam/debian/rules2
-rw-r--r--ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/dolphin/debian/patches/series (renamed from ubuntu/maverick/applications/ksystemlog/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/dolphin/debian/rules2
-rw-r--r--ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/filelight-l10n/debian/control2
-rw-r--r--ubuntu/maverick/applications/filelight-l10n/debian/patches/series (renamed from ubuntu/maverick/applications/ktorrent/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/filelight-l10n/debian/rules2
-rw-r--r--ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/fusion-icon/debian/patches/series (renamed from ubuntu/maverick/applications/kvirc/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/fusion-icon/debian/rules2
-rw-r--r--ubuntu/maverick/applications/gtk-qt-engine/debian/patches/series (renamed from ubuntu/maverick/applications/kwin-style-crystal/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/gtk-qt-engine/debian/rules2
-rw-r--r--ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/gwenview-i18n/debian/patches/series (renamed from ubuntu/maverick/applications/piklab/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/gwenview-i18n/debian/rules2
-rw-r--r--ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/gwenview/debian/patches/series (renamed from ubuntu/maverick/applications/rosegarden/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/gwenview/debian/rules2
-rw-r--r--ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/applications/k3b/debian/rules2
-rw-r--r--ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/k9copy/debian/patches/series (renamed from ubuntu/maverick/applications/wlassistant/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/k9copy/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kaffeine/debian/patches/series (renamed from ubuntu/maverick/kdegraphics/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/kaffeine/debian/rules2
-rw-r--r--ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/katapult/debian/patches/series (renamed from ubuntu/maverick/kdepim/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/katapult/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kbfx/debian/patches/series (renamed from ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/kbfx/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kbiff/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kbookreader/debian/patches/series (renamed from ubuntu/maverick/libraries/libkipi/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/kbookreader/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kde-guidance/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kde-guidance/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kde-style-qtcurve/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kde-style-qtcurve/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kde-systemsettings/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kde-systemsettings/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kdesudo/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kdesudo/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kdesudo/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kdesvn/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/applications/kdesvn/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kdirstat/debian/control2
-rw-r--r--ubuntu/maverick/applications/kdirstat/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kdirstat/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kdpkg/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kdpkg/debian/rules2
-rw-r--r--ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/applications/keep/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch7
-rwxr-xr-xubuntu/maverick/applications/kerry/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kgtk-qt3/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kgtk-qt3/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kio-apt/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kio-apt/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kio-locate/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kio-locate/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kio-umountwrapper/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kio-umountwrapper/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/applications/kiosktool/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kmplayer/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kmplayer/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kmymoney/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kmymoney/debian/rules2
-rw-r--r--ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/knemo/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/knemo/debian/rules2
-rw-r--r--ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/knetstats/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/knetstats/debian/rules2
-rw-r--r--ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/applications/knetworkmanager.cmake/debian/rules2
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/koffice/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/koffice/debian/rules2
-rw-r--r--ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kpowersave.cmake/debian/control2
-rw-r--r--ubuntu/maverick/applications/kpowersave.cmake/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kpowersave.cmake/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kpowersave/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kpowersave/debian/rules2
-rw-r--r--ubuntu/maverick/applications/krename/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/krename/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/krename/debian/rules2
-rw-r--r--ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/krusader/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/krusader/debian/rules2
-rw-r--r--ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/ksystemlog/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/ksystemlog/debian/rules2
-rw-r--r--ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/ktorrent/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/ktorrent/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kuickshow/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kuickshow/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kvirc/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kvirc/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/kwin-style-crystal/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/kwin-style-crystal/debian/rules2
-rw-r--r--ubuntu/maverick/applications/piklab/debian/control2
-rw-r--r--ubuntu/maverick/applications/piklab/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/piklab/debian/rules9
-rw-r--r--ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/rosegarden/debian/control2
-rw-r--r--ubuntu/maverick/applications/rosegarden/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/rosegarden/debian/rules2
-rw-r--r--ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/wlassistant/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/wlassistant/debian/rules2
-rw-r--r--ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/dependencies/arts/debian/rules2
-rw-r--r--ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series0
-rwxr-xr-xubuntu/maverick/dependencies/dbus-1-tqt/debian/rules2
-rw-r--r--ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series0
-rwxr-xr-xubuntu/maverick/dependencies/dbus-tqt/debian/rules2
-rw-r--r--ubuntu/maverick/dependencies/qt3/debian/control2
-rwxr-xr-xubuntu/maverick/dependencies/qt3/debian/rules8
-rw-r--r--ubuntu/maverick/dependencies/tqtinterface/debian/patches/series0
-rwxr-xr-xubuntu/maverick/dependencies/tqtinterface/debian/rules2
-rw-r--r--ubuntu/maverick/kdeaccessibility/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdeaccessibility/debian/rules2
-rw-r--r--ubuntu/maverick/kdeaddons/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdeaddons/debian/rules2
-rw-r--r--ubuntu/maverick/kdeadmin/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdeadmin/debian/rules2
-rw-r--r--ubuntu/maverick/kdeartwork/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdeartwork/debian/rules2
-rw-r--r--ubuntu/maverick/kdebase/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff10
-rwxr-xr-xubuntu/maverick/kdebase/debian/rules2
-rw-r--r--ubuntu/maverick/kdebindings/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/kdeedu/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdeedu/debian/rules2
-rw-r--r--ubuntu/maverick/kdegames/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdegames/debian/rules2
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/control2
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/patches/series3
-rwxr-xr-xubuntu/maverick/kdegraphics.automake/debian/rules2
-rw-r--r--ubuntu/maverick/kdegraphics/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdegraphics/debian/rules2
-rwxr-xr-xubuntu/maverick/kdelibs/debian/rules2
-rw-r--r--ubuntu/maverick/kdemultimedia/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdemultimedia/debian/rules2
-rw-r--r--ubuntu/maverick/kdenetwork/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdenetwork/debian/rules2
-rw-r--r--ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/kdepim/debian/patches/series0
-rwxr-xr-xubuntu/maverick/kdepim/debian/rules2
-rw-r--r--ubuntu/maverick/kdesdk/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdesdk/debian/rules2
-rw-r--r--ubuntu/maverick/kdetoys/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdetoys/debian/rules2
-rw-r--r--ubuntu/maverick/kdeutils/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdeutils/debian/rules2
-rw-r--r--ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/kdevelop.cmake/debian/control2
-rw-r--r--ubuntu/maverick/kdevelop.cmake/debian/patches/series0
-rwxr-xr-xubuntu/maverick/kdevelop.cmake/debian/rules2
-rw-r--r--ubuntu/maverick/kdevelop/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdevelop/debian/rules2
-rw-r--r--ubuntu/maverick/kdewebdev/debian/cdbs/debian-qt-kde.mk2
-rwxr-xr-xubuntu/maverick/kdewebdev/debian/rules2
-rw-r--r--ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/libraries/libkipi/debian/patches/series0
-rwxr-xr-xubuntu/maverick/libraries/libkipi/debian/rules2
727 files changed, 886 insertions, 342 deletions
diff --git a/debian/lenny/applications/abakus/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/abakus/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/debian/lenny/applications/abakus/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/abakus/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/abakus/debian/control b/debian/lenny/applications/abakus/debian/control
index a5cd5363f..9b924007c 100644
--- a/debian/lenny/applications/abakus/debian/control
+++ b/debian/lenny/applications/abakus/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de>
-Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, kdelibs4-trinity-dev, chrpath, bison, flex
+Build-Depends: autotools-dev, debhelper (>= 4.1.0), quilt, cdbs (>= 0.4.0), cmake, imagemagick, kdelibs4-trinity-dev, chrpath, bison, flex
Standards-Version: 3.8.4
Package: abakus-trinity
diff --git a/debian/lenny/applications/adept/debian/patches/.gitignore b/debian/lenny/applications/abakus/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/adept/debian/patches/.gitignore
+++ b/debian/lenny/applications/abakus/debian/patches/series
diff --git a/debian/lenny/applications/abakus/debian/rules b/debian/lenny/applications/abakus/debian/rules
index c856f7cae..83d7d7fb4 100755
--- a/debian/lenny/applications/abakus/debian/rules
+++ b/debian/lenny/applications/abakus/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/adept/debian/control b/debian/lenny/applications/adept/debian/control
index 64cc6d154..f7e39d89b 100644
--- a/debian/lenny/applications/adept/debian/control
+++ b/debian/lenny/applications/adept/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Peter Rockai <me@mornfall.net>
Uploaders: Isaac Clerencia <isaac@debian.org>, Enrico Zini <enrico@debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), kdelibs4-trinity-dev (>= 3.5.0), sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), kdelibs4-trinity-dev (>= 3.5.0), sharutils, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: adept-trinity
diff --git a/debian/lenny/applications/adept/debian/patches/series b/debian/lenny/applications/adept/debian/patches/series
new file mode 100644
index 000000000..ad5b05138
--- /dev/null
+++ b/debian/lenny/applications/adept/debian/patches/series
@@ -0,0 +1 @@
+remove_apport.diff
diff --git a/debian/lenny/applications/adept/debian/rules b/debian/lenny/applications/adept/debian/rules
index de6788eff..d9d20bace 100755
--- a/debian/lenny/applications/adept/debian/rules
+++ b/debian/lenny/applications/adept/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/debian/lenny/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/debian/lenny/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/amarok.cmake/debian/rules b/debian/lenny/applications/amarok.cmake/debian/rules
index 4fd9a743d..7f157aa03 100755
--- a/debian/lenny/applications/amarok.cmake/debian/rules
+++ b/debian/lenny/applications/amarok.cmake/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/amarok/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/amarok/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/amarok/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/amarok/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/basket/debian/control b/debian/lenny/applications/basket/debian/control
index 3f4027902..f78a6d8f7 100644
--- a/debian/lenny/applications/basket/debian/control
+++ b/debian/lenny/applications/basket/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, debhelper (>= 5), kdelibs4-trinity-dev (>= 4:3.5.6), kdepim-trinity-dev (>= 4:3.5.6), libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs, debhelper (>= 5), kdelibs4-trinity-dev (>= 4:3.5.6), kdepim-trinity-dev (>= 4:3.5.6), libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: basket-trinity
diff --git a/debian/lenny/applications/basket/debian/rules b/debian/lenny/applications/basket/debian/rules
index 5a52ee2fc..cb18fa380 100755
--- a/debian/lenny/applications/basket/debian/rules
+++ b/debian/lenny/applications/basket/debian/rules
@@ -26,10 +26,10 @@ else
CFLAGS += -O2
endif
-include /usr/share/quilt/quilt.make
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-config.status: $(QUILT_STAMPFN)
+config.status: post-patches
dh_testdir
test -e config.sub -a -L config.sub || \
ln -sf /usr/share/misc/config.sub config.sub
@@ -59,7 +59,7 @@ build-stamp: config.status
touch build-stamp
-clean: unpatch
+clean::
dh_testdir
dh_testroot
diff --git a/debian/lenny/applications/bibletime/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/bibletime/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/bibletime/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/bibletime/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/bibletime/debian/patches/.gitignore b/debian/lenny/applications/bibletime/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/bibletime/debian/patches/.gitignore
+++ b/debian/lenny/applications/bibletime/debian/patches/series
diff --git a/debian/lenny/applications/bibletime/debian/rules b/debian/lenny/applications/bibletime/debian/rules
index 225ac5e18..9000a60dc 100755
--- a/debian/lenny/applications/bibletime/debian/rules
+++ b/debian/lenny/applications/bibletime/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_DH_INSTALL_SOURCEDIR := debian
diff --git a/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/compizconfig-backend-kconfig/debian/control b/debian/lenny/applications/compizconfig-backend-kconfig/debian/control
index 33a99eec5..2ba2cbf96 100644
--- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/control
+++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-kconfig-trinity
Section: libs
Priority: extra
Maintainer: Timothy Pearosn <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs, debhelper (>= 5), compiz-trinity-dev, pkg-config, intltool, kdelibs4-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, compiz-trinity-dev, pkg-config, intltool, kdelibs4-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: compizconfig-backend-kconfig-trinity
diff --git a/debian/lenny/applications/compizconfig-backend-kconfig/debian/patches/.gitignore b/debian/lenny/applications/compizconfig-backend-kconfig/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/patches/.gitignore
+++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/patches/series
diff --git a/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules b/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules
index 806eaae15..ac4f53c0c 100755
--- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules
+++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/debian/lenny/applications/digikam/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/digikam/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/digikam/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/digikam/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/digikam/debian/control b/debian/lenny/applications/digikam/debian/control
index 32c14ae8d..726f494d7 100644
--- a/debian/lenny/applications/digikam/debian/control
+++ b/debian/lenny/applications/digikam/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev,
libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
libjasper-dev, libpng-dev, libexiv2-dev,
diff --git a/debian/lenny/applications/digikam/debian/patches/.gitignore b/debian/lenny/applications/digikam/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/digikam/debian/patches/.gitignore
+++ b/debian/lenny/applications/digikam/debian/patches/series
diff --git a/debian/lenny/applications/digikam/debian/rules b/debian/lenny/applications/digikam/debian/rules
index 8a35928b4..6cbea6f8f 100755
--- a/debian/lenny/applications/digikam/debian/rules
+++ b/debian/lenny/applications/digikam/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
-include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
diff --git a/debian/lenny/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/dolphin/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/debian/lenny/applications/dolphin/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/dolphin/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/dolphin/debian/control b/debian/lenny/applications/dolphin/debian/control
index 5b7cd047e..833299bac 100644
--- a/debian/lenny/applications/dolphin/debian/control
+++ b/debian/lenny/applications/dolphin/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, kdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake
+Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, kdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake
Standards-Version: 3.8.4
Package: dolphin-trinity
diff --git a/debian/lenny/applications/dolphin/debian/patches/.gitignore b/debian/lenny/applications/dolphin/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/dolphin/debian/patches/.gitignore
+++ b/debian/lenny/applications/dolphin/debian/patches/series
diff --git a/debian/lenny/applications/dolphin/debian/rules b/debian/lenny/applications/dolphin/debian/rules
index 66ea98891..f978c418e 100755
--- a/debian/lenny/applications/dolphin/debian/rules
+++ b/debian/lenny/applications/dolphin/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/filelight-l10n/debian/control b/debian/lenny/applications/filelight-l10n/debian/control
index 9edd33456..6845dfba9 100644
--- a/debian/lenny/applications/filelight-l10n/debian/control
+++ b/debian/lenny/applications/filelight-l10n/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Raúl Sánchez Siles <rasasi78@gmail.com>
-Build-Depends: kdelibs4-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake, autoconf, libtool, libltdl-dev
+Build-Depends: kdelibs4-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://www.methylblue.com/filelight/
diff --git a/debian/lenny/applications/fusion-icon/debian/patches/.gitignore b/debian/lenny/applications/filelight-l10n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/fusion-icon/debian/patches/.gitignore
+++ b/debian/lenny/applications/filelight-l10n/debian/patches/series
diff --git a/debian/lenny/applications/filelight-l10n/debian/rules b/debian/lenny/applications/filelight-l10n/debian/rules
index bc018d11c..32b295e00 100755
--- a/debian/lenny/applications/filelight-l10n/debian/rules
+++ b/debian/lenny/applications/filelight-l10n/debian/rules
@@ -4,7 +4,7 @@ DEB_PATCHDIRS := debian/patches/common debian/patches
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/filelight/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/filelight/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/filelight/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/filelight/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/fusion-icon/debian/control b/debian/lenny/applications/fusion-icon/debian/control
index 7130740f7..cbc63cebc 100644
--- a/debian/lenny/applications/fusion-icon/debian/control
+++ b/debian/lenny/applications/fusion-icon/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
XS-Python-Version: all
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), pkg-config, python-all-dev
+Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), quilt, pkg-config, python-all-dev
Build-Depends-Indep: python-support (>= 0.6), intltool
Standards-Version: 3.8.4
diff --git a/debian/lenny/applications/gtk-qt-engine/debian/patches/.gitignore b/debian/lenny/applications/fusion-icon/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/gtk-qt-engine/debian/patches/.gitignore
+++ b/debian/lenny/applications/fusion-icon/debian/patches/series
diff --git a/debian/lenny/applications/fusion-icon/debian/rules b/debian/lenny/applications/fusion-icon/debian/rules
index 2b780a204..3c129a596 100755
--- a/debian/lenny/applications/fusion-icon/debian/rules
+++ b/debian/lenny/applications/fusion-icon/debian/rules
@@ -5,7 +5,7 @@ DEB_PYTHON_SYSTEM=pysupport
include /usr/share/cdbs/1/rules/debhelper.mk
# include /usr/share/cdbs/1/class/python-distutils.mk
include debian/python-distutils-custom.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
diff --git a/debian/lenny/applications/gtk-qt-engine/debian/control b/debian/lenny/applications/gtk-qt-engine/debian/control
index 5d4629ded..fe97ffbff 100644
--- a/debian/lenny/applications/gtk-qt-engine/debian/control
+++ b/debian/lenny/applications/gtk-qt-engine/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: debhelper (>= 5.0), cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1)
+Build-Depends: debhelper (>= 5.0), quilt, cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1)
Standards-Version: 3.8.4
Package: gtk-qt-engine-trinity
diff --git a/debian/lenny/applications/gwenview/debian/patches/.gitignore b/debian/lenny/applications/gtk-qt-engine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/gwenview/debian/patches/.gitignore
+++ b/debian/lenny/applications/gtk-qt-engine/debian/patches/series
diff --git a/debian/lenny/applications/gtk-qt-engine/debian/rules b/debian/lenny/applications/gtk-qt-engine/debian/rules
index ad9d85488..8d669da83 100755
--- a/debian/lenny/applications/gtk-qt-engine/debian/rules
+++ b/debian/lenny/applications/gtk-qt-engine/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
index fa0d532f4..ec89756bb 100644
--- a/debian/lenny/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/k9copy/debian/patches/.gitignore b/debian/lenny/applications/gwenview-i18n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/k9copy/debian/patches/.gitignore
+++ b/debian/lenny/applications/gwenview-i18n/debian/patches/series
diff --git a/debian/lenny/applications/gwenview-i18n/debian/rules b/debian/lenny/applications/gwenview-i18n/debian/rules
index 3070a9c9d..045fcc43f 100755
--- a/debian/lenny/applications/gwenview-i18n/debian/rules
+++ b/debian/lenny/applications/gwenview-i18n/debian/rules
@@ -4,7 +4,7 @@ DEB_PATCHDIRS := debian/patches/common debian/patches
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-include debian/debiandirs
diff --git a/debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/gwenview/debian/control b/debian/lenny/applications/gwenview/debian/control
index 7f170578e..b55471cb6 100644
--- a/debian/lenny/applications/gwenview/debian/control
+++ b/debian/lenny/applications/gwenview/debian/control
@@ -2,7 +2,7 @@ Source: gwenview-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6.0.0), kdelibs4-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, libmng-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6.0.0), quilt, kdelibs4-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, libmng-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://gwenview.sourceforge.net
diff --git a/debian/lenny/applications/kaffeine/debian/patches/.gitignore b/debian/lenny/applications/gwenview/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kaffeine/debian/patches/.gitignore
+++ b/debian/lenny/applications/gwenview/debian/patches/series
diff --git a/debian/lenny/applications/gwenview/debian/rules b/debian/lenny/applications/gwenview/debian/rules
index 9e06b4ce6..5f0d8a005 100755
--- a/debian/lenny/applications/gwenview/debian/rules
+++ b/debian/lenny/applications/gwenview/debian/rules
@@ -4,7 +4,7 @@ DEB_PATCHDIRS := debian/patches/common debian/patches
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/k3b/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/k3b/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/k3b/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/k3b/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/k3b/debian/control b/debian/lenny/applications/k3b/debian/control
index 1829d884a..3fc94d515 100644
--- a/debian/lenny/applications/k3b/debian/control
+++ b/debian/lenny/applications/k3b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), kdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), kdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://www.k3b.org
diff --git a/debian/lenny/applications/k3b/debian/patches/series b/debian/lenny/applications/k3b/debian/patches/series
new file mode 100644
index 000000000..bff63cb8c
--- /dev/null
+++ b/debian/lenny/applications/k3b/debian/patches/series
@@ -0,0 +1 @@
+111_advice_kubuntu_restricted_extras.diff
diff --git a/debian/lenny/applications/k3b/debian/rules b/debian/lenny/applications/k3b/debian/rules
index a441e55e1..2b9405abd 100755
--- a/debian/lenny/applications/k3b/debian/rules
+++ b/debian/lenny/applications/k3b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5
diff --git a/debian/lenny/applications/k9copy/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/k9copy/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/k9copy/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/k9copy/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/k9copy/debian/control b/debian/lenny/applications/k9copy/debian/control
index 3ab1187f6..80b0aa194 100644
--- a/debian/lenny/applications/k9copy/debian/control
+++ b/debian/lenny/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libhal-dev, libhal-storage-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libhal-dev, libhal-storage-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://k9copy.sourceforge.net/
diff --git a/debian/lenny/applications/katapult/debian/patches/.gitignore b/debian/lenny/applications/k9copy/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/katapult/debian/patches/.gitignore
+++ b/debian/lenny/applications/k9copy/debian/patches/series
diff --git a/debian/lenny/applications/k9copy/debian/rules b/debian/lenny/applications/k9copy/debian/rules
index 35960c577..ffc38cd83 100755
--- a/debian/lenny/applications/k9copy/debian/rules
+++ b/debian/lenny/applications/k9copy/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kaffeine/debian/control b/debian/lenny/applications/kaffeine/debian/control
index 2c3bdce06..344b488a5 100644
--- a/debian/lenny/applications/kaffeine/debian/control
+++ b/debian/lenny/applications/kaffeine/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Riku Voipio <riku.voipio@iki.fi>, Fathi Boudra <fboudra@free.fr>,
Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev,
libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev,
libxtst-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev,
libcdio-cdda-dev, libcdio-paranoia-dev,
diff --git a/debian/lenny/applications/kbfx/debian/patches/.gitignore b/debian/lenny/applications/kaffeine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kbfx/debian/patches/.gitignore
+++ b/debian/lenny/applications/kaffeine/debian/patches/series
diff --git a/debian/lenny/applications/kaffeine/debian/rules b/debian/lenny/applications/kaffeine/debian/rules
index 27c2f5b08..8b3094571 100755
--- a/debian/lenny/applications/kaffeine/debian/rules
+++ b/debian/lenny/applications/kaffeine/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/katapult/debian/control b/debian/lenny/applications/katapult/debian/control
index b43c2565e..083574c75 100644
--- a/debian/lenny/applications/katapult/debian/control
+++ b/debian/lenny/applications/katapult/debian/control
@@ -2,7 +2,7 @@ Source: katapult-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), kdelibs4-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: katapult-trinity
diff --git a/debian/lenny/applications/kbookreader/debian/patches/.gitignore b/debian/lenny/applications/katapult/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kbookreader/debian/patches/.gitignore
+++ b/debian/lenny/applications/katapult/debian/patches/series
diff --git a/debian/lenny/applications/katapult/debian/rules b/debian/lenny/applications/katapult/debian/rules
index 70524295d..1d5785aef 100755
--- a/debian/lenny/applications/katapult/debian/rules
+++ b/debian/lenny/applications/katapult/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/debian/lenny/applications/kbarcode/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kbfx/debian/control b/debian/lenny/applications/kbfx/debian/control
index dfa9d2054..299c9fba0 100644
--- a/debian/lenny/applications/kbfx/debian/control
+++ b/debian/lenny/applications/kbfx/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), cmake, kdelibs4-trinity-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, cmake, kdelibs4-trinity-dev
Standards-Version: 3.8.4
Package: kbfx-trinity
diff --git a/debian/lenny/applications/kde-guidance/debian/patches/.gitignore b/debian/lenny/applications/kbfx/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kde-guidance/debian/patches/.gitignore
+++ b/debian/lenny/applications/kbfx/debian/patches/series
diff --git a/debian/lenny/applications/kbfx/debian/rules b/debian/lenny/applications/kbfx/debian/rules
index 658c8aaac..8f0da9ac1 100755
--- a/debian/lenny/applications/kbfx/debian/rules
+++ b/debian/lenny/applications/kbfx/debian/rules
@@ -11,7 +11,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
include debian/cmake.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
#include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kbiff/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kbiff/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/debian/lenny/applications/kbiff/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kbiff/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
#include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kbookreader/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kbookreader/debian/control b/debian/lenny/applications/kbookreader/debian/control
index 8ac579805..60a19cafd 100644
--- a/debian/lenny/applications/kbookreader/debian/control
+++ b/debian/lenny/applications/kbookreader/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://k9copy.sourceforge.net/
diff --git a/debian/lenny/applications/kde-style-qtcurve/debian/patches/.gitignore b/debian/lenny/applications/kbookreader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kde-style-qtcurve/debian/patches/.gitignore
+++ b/debian/lenny/applications/kbookreader/debian/patches/series
diff --git a/debian/lenny/applications/kbookreader/debian/rules b/debian/lenny/applications/kbookreader/debian/rules
index 065dcfd33..35979766b 100755
--- a/debian/lenny/applications/kbookreader/debian/rules
+++ b/debian/lenny/applications/kbookreader/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/kcpuload/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
#include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kde-guidance/debian/control b/debian/lenny/applications/kde-guidance/debian/control
index 454cdfd58..c40fe98b6 100644
--- a/debian/lenny/applications/kde-guidance/debian/control
+++ b/debian/lenny/applications/kde-guidance/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), chrpath, kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, kdelibs4-trinity-dev,
libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
pykdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata
diff --git a/debian/lenny/applications/kde-systemsettings/debian/patches/.gitignore b/debian/lenny/applications/kde-guidance/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kde-systemsettings/debian/patches/.gitignore
+++ b/debian/lenny/applications/kde-guidance/debian/patches/series
diff --git a/debian/lenny/applications/kde-guidance/debian/rules b/debian/lenny/applications/kde-guidance/debian/rules
index 2510b9aaa..af3ef58e1 100755
--- a/debian/lenny/applications/kde-guidance/debian/rules
+++ b/debian/lenny/applications/kde-guidance/debian/rules
@@ -5,7 +5,7 @@ DEB_PYTHON_SYSTEM = pysupport
include /usr/share/cdbs/1/rules/debhelper.mk
#include /usr/share/cdbs/1/class/python-distutils.mk
include debian/python-distutils-jaunty.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
diff --git a/debian/lenny/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/debian/lenny/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kde-style-qtcurve/debian/control b/debian/lenny/applications/kde-style-qtcurve/debian/control
index 7b20ea4da..a3d34e10a 100644
--- a/debian/lenny/applications/kde-style-qtcurve/debian/control
+++ b/debian/lenny/applications/kde-style-qtcurve/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: debhelper (>= 5), kdelibs4-trinity-dev, cmake, cdbs
+Build-Depends: debhelper (>= 5), quilt, kdelibs4-trinity-dev, cmake, cdbs
Standards-Version: 3.8.4
Package: kde-style-qtcurve-trinity
diff --git a/debian/lenny/applications/kdesudo/debian/patches/.gitignore b/debian/lenny/applications/kde-style-qtcurve/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kdesudo/debian/patches/.gitignore
+++ b/debian/lenny/applications/kde-style-qtcurve/debian/patches/series
diff --git a/debian/lenny/applications/kde-style-qtcurve/debian/rules b/debian/lenny/applications/kde-style-qtcurve/debian/rules
index 685703a85..f697a7e99 100755
--- a/debian/lenny/applications/kde-style-qtcurve/debian/rules
+++ b/debian/lenny/applications/kde-style-qtcurve/debian/rules
@@ -13,7 +13,7 @@ export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kde-systemsettings/debian/control b/debian/lenny/applications/kde-systemsettings/debian/control
index 6d3d022c9..c92920c50 100644
--- a/debian/lenny/applications/kde-systemsettings/debian/control
+++ b/debian/lenny/applications/kde-systemsettings/debian/control
@@ -2,7 +2,7 @@ Source: kde-systemsettings-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), patchutils (>= 0.2.25), kdelibs4-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), quilt, patchutils (>= 0.2.25), kdelibs4-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kde-systemsettings-trinity
diff --git a/debian/lenny/applications/kdirstat/debian/patches/.gitignore b/debian/lenny/applications/kde-systemsettings/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kdirstat/debian/patches/.gitignore
+++ b/debian/lenny/applications/kde-systemsettings/debian/patches/series
diff --git a/debian/lenny/applications/kde-systemsettings/debian/rules b/debian/lenny/applications/kde-systemsettings/debian/rules
index fbfdf7a42..71831d1ad 100755
--- a/debian/lenny/applications/kde-systemsettings/debian/rules
+++ b/debian/lenny/applications/kde-systemsettings/debian/rules
@@ -3,7 +3,7 @@
cdbs_kde_enable_debug = --disable-debug
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/kdesudo/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdesudo/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kdesudo/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kdesudo/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kdesudo/debian/control b/debian/lenny/applications/kdesudo/debian/control
index f14497994..6d5b74a48 100644
--- a/debian/lenny/applications/kdesudo/debian/control
+++ b/debian/lenny/applications/kdesudo/debian/control
@@ -2,7 +2,7 @@ Source: kdesudo-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 5), cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 5), quilt, cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdesudo-trinity
diff --git a/debian/lenny/applications/kdpkg/debian/patches/.gitignore b/debian/lenny/applications/kdesudo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kdpkg/debian/patches/.gitignore
+++ b/debian/lenny/applications/kdesudo/debian/patches/series
diff --git a/debian/lenny/applications/kdesudo/debian/rules b/debian/lenny/applications/kdesudo/debian/rules
index 1f131406e..da76f8d08 100755
--- a/debian/lenny/applications/kdesudo/debian/rules
+++ b/debian/lenny/applications/kdesudo/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/kdesvn/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdesvn/debian/cdbs/debian-qt-kde.mk
index 856fa4932..1d366e492 100644
--- a/debian/lenny/applications/kdesvn/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kdesvn/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kdesvn/debian/rules b/debian/lenny/applications/kdesvn/debian/rules
index d85c8bf6a..4da14a393 100755
--- a/debian/lenny/applications/kdesvn/debian/rules
+++ b/debian/lenny/applications/kdesvn/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/kdiff3/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kdirstat/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kdirstat/debian/control b/debian/lenny/applications/kdirstat/debian/control
index 4071787f7..f9068bab6 100644
--- a/debian/lenny/applications/kdirstat/debian/control
+++ b/debian/lenny/applications/kdirstat/debian/control
@@ -2,7 +2,7 @@ Source: kdirstat-trinity
Section: misc
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), quilt, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://kdirstat.sourceforge.net/
diff --git a/debian/lenny/applications/kio-apt/debian/patches/.gitignore b/debian/lenny/applications/kdirstat/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kio-apt/debian/patches/.gitignore
+++ b/debian/lenny/applications/kdirstat/debian/patches/series
diff --git a/debian/lenny/applications/kdirstat/debian/rules b/debian/lenny/applications/kdirstat/debian/rules
index 201ba1594..90cbae40e 100755
--- a/debian/lenny/applications/kdirstat/debian/rules
+++ b/debian/lenny/applications/kdirstat/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/debian/lenny/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kdpkg/debian/control b/debian/lenny/applications/kdpkg/debian/control
index 96dd69e74..adf1773a5 100644
--- a/debian/lenny/applications/kdpkg/debian/control
+++ b/debian/lenny/applications/kdpkg/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Alexander Kopf <kopf-alexander@gmx.de>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, gettext, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, gettext, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdpkg-trinity
diff --git a/debian/lenny/applications/kio-umountwrapper/debian/patches/.gitignore b/debian/lenny/applications/kdpkg/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kio-umountwrapper/debian/patches/.gitignore
+++ b/debian/lenny/applications/kdpkg/debian/patches/series
diff --git a/debian/lenny/applications/kdpkg/debian/rules b/debian/lenny/applications/kdpkg/debian/rules
index 1c07fcb5f..1e590de5f 100755
--- a/debian/lenny/applications/kdpkg/debian/rules
+++ b/debian/lenny/applications/kdpkg/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/debian/lenny/applications/keep/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/keep/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/keep/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/keep/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/keep/debian/control b/debian/lenny/applications/keep/debian/control
index 76681aa87..8b8071a0a 100644
--- a/debian/lenny/applications/keep/debian/control
+++ b/debian/lenny/applications/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: keep-trinity
diff --git a/debian/lenny/applications/keep/debian/patches/series b/debian/lenny/applications/keep/debian/patches/series
new file mode 100644
index 000000000..9ccf4a125
--- /dev/null
+++ b/debian/lenny/applications/keep/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_01_kdepot.diff
diff --git a/debian/lenny/applications/keep/debian/rules b/debian/lenny/applications/keep/debian/rules
index c6fa8833d..12e8fd743 100755
--- a/debian/lenny/applications/keep/debian/rules
+++ b/debian/lenny/applications/keep/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kerry/debian/control b/debian/lenny/applications/kerry/debian/control
index a88165323..50a7b8707 100644
--- a/debian/lenny/applications/kerry/debian/control
+++ b/debian/lenny/applications/kerry/debian/control
@@ -2,7 +2,7 @@ Source: kerry-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev
Homepage: http://en.opensuse.org/Kerry
Standards-Version: 3.8.4
diff --git a/debian/lenny/applications/kiosktool/debian/patches/.gitignore b/debian/lenny/applications/kerry/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kiosktool/debian/patches/.gitignore
+++ b/debian/lenny/applications/kerry/debian/patches/series
diff --git a/debian/lenny/applications/kerry/debian/rules b/debian/lenny/applications/kerry/debian/rules
index 4cbb0340e..b00341b4b 100755
--- a/debian/lenny/applications/kerry/debian/rules
+++ b/debian/lenny/applications/kerry/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# include /usr/share/cdbs/1/class/kde.mk
include debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/debian/lenny/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kgtk-qt3/debian/control b/debian/lenny/applications/kgtk-qt3/debian/control
index 67715ac0f..d8b21e720 100644
--- a/debian/lenny/applications/kgtk-qt3/debian/control
+++ b/debian/lenny/applications/kgtk-qt3/debian/control
@@ -2,7 +2,7 @@ Source: kgtk-qt3-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7), cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
+Build-Depends: debhelper (>= 7), quilt, cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
Standards-Version: 3.8.4
Homepage: http://trinity.pearsoncomputing.net
diff --git a/debian/lenny/applications/kmplayer/debian/patches/.gitignore b/debian/lenny/applications/kgtk-qt3/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kmplayer/debian/patches/.gitignore
+++ b/debian/lenny/applications/kgtk-qt3/debian/patches/series
diff --git a/debian/lenny/applications/kgtk-qt3/debian/rules b/debian/lenny/applications/kgtk-qt3/debian/rules
index b4cb7a953..91c8ec995 100755
--- a/debian/lenny/applications/kgtk-qt3/debian/rules
+++ b/debian/lenny/applications/kgtk-qt3/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/kile/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kile/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kile/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kile/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kio-apt/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kio-apt/debian/control b/debian/lenny/applications/kio-apt/debian/control
index 793a97da7..3340b7670 100644
--- a/debian/lenny/applications/kio-apt/debian/control
+++ b/debian/lenny/applications/kio-apt/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Emmanuel Bouthenot <kolter@openics.org>
-Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kio-apt-trinity
diff --git a/debian/lenny/applications/knemo/debian/patches/.gitignore b/debian/lenny/applications/kio-apt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/knemo/debian/patches/.gitignore
+++ b/debian/lenny/applications/kio-apt/debian/patches/series
diff --git a/debian/lenny/applications/kio-apt/debian/rules b/debian/lenny/applications/kio-apt/debian/rules
index 394819b8a..e9afe96d6 100755
--- a/debian/lenny/applications/kio-apt/debian/rules
+++ b/debian/lenny/applications/kio-apt/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/kio-locate/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/debian/lenny/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kio-locate/debian/control b/debian/lenny/applications/kio-locate/debian/control
index 44c5cbfa8..944c5800b 100644
--- a/debian/lenny/applications/kio-locate/debian/control
+++ b/debian/lenny/applications/kio-locate/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, bzip2, python (>= 2.3), cmake
+Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, bzip2, python (>= 2.3), cmake
Standards-Version: 3.8.4
Package: kio-locate-trinity
diff --git a/debian/lenny/applications/knetstats/debian/patches/.gitignore b/debian/lenny/applications/kio-locate/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/knetstats/debian/patches/.gitignore
+++ b/debian/lenny/applications/kio-locate/debian/patches/series
diff --git a/debian/lenny/applications/kio-locate/debian/rules b/debian/lenny/applications/kio-locate/debian/rules
index ecf59da08..4d6404d6c 100755
--- a/debian/lenny/applications/kio-locate/debian/rules
+++ b/debian/lenny/applications/kio-locate/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kio-umountwrapper/debian/control b/debian/lenny/applications/kio-umountwrapper/debian/control
index 8c760573e..489dac991 100644
--- a/debian/lenny/applications/kio-umountwrapper/debian/control
+++ b/debian/lenny/applications/kio-umountwrapper/debian/control
@@ -2,7 +2,7 @@ Source: kio-umountwrapper-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 5), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 5), quilt, cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kio-umountwrapper-trinity
diff --git a/debian/lenny/applications/koffice/debian/patches/.gitignore b/debian/lenny/applications/kio-umountwrapper/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/koffice/debian/patches/.gitignore
+++ b/debian/lenny/applications/kio-umountwrapper/debian/patches/series
diff --git a/debian/lenny/applications/kio-umountwrapper/debian/rules b/debian/lenny/applications/kio-umountwrapper/debian/rules
index 8a83b84a6..325e30125 100755
--- a/debian/lenny/applications/kio-umountwrapper/debian/rules
+++ b/debian/lenny/applications/kio-umountwrapper/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kiosktool/debian/control b/debian/lenny/applications/kiosktool/debian/control
index bbf9a457f..9e8a6636d 100644
--- a/debian/lenny/applications/kiosktool/debian/control
+++ b/debian/lenny/applications/kiosktool/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.1.0), quilt, cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kiosktool-trinity
diff --git a/debian/lenny/applications/kpowersave.cmake/debian/patches/.gitignore b/debian/lenny/applications/kiosktool/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/patches/.gitignore
+++ b/debian/lenny/applications/kiosktool/debian/patches/series
diff --git a/debian/lenny/applications/kiosktool/debian/rules b/debian/lenny/applications/kiosktool/debian/rules
index 43179510b..f29b20b10 100755
--- a/debian/lenny/applications/kiosktool/debian/rules
+++ b/debian/lenny/applications/kiosktool/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/kmplayer/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kmplayer/debian/control b/debian/lenny/applications/kmplayer/debian/control
index ae42b94a5..0959f65a4 100644
--- a/debian/lenny/applications/kmplayer/debian/control
+++ b/debian/lenny/applications/kmplayer/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev,
libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev,
libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, docbook2x,
automake, autoconf, libtool, libltdl-dev
diff --git a/debian/lenny/applications/kpowersave/debian/patches/.gitignore b/debian/lenny/applications/kmplayer/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kpowersave/debian/patches/.gitignore
+++ b/debian/lenny/applications/kmplayer/debian/patches/series
diff --git a/debian/lenny/applications/kmplayer/debian/rules b/debian/lenny/applications/kmplayer/debian/rules
index aefb53e38..51f7c5e62 100755
--- a/debian/lenny/applications/kmplayer/debian/rules
+++ b/debian/lenny/applications/kmplayer/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/utils.mk
diff --git a/debian/lenny/applications/kmymoney/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kmymoney/debian/control b/debian/lenny/applications/kmymoney/debian/control
index 2ca999c49..156707ea3 100644
--- a/debian/lenny/applications/kmymoney/debian/control
+++ b/debian/lenny/applications/kmymoney/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), cdbs, chrpath, automake, libtool, kdelibs4-trinity-dev, libofx-dev, libsqlite3-dev, recode, html2ps
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, chrpath, automake, libtool, kdelibs4-trinity-dev, libofx-dev, libsqlite3-dev, recode, html2ps
Standards-Version: 3.8.4
Package: kmymoney2-trinity
diff --git a/debian/lenny/applications/krusader/debian/patches/.gitignore b/debian/lenny/applications/kmymoney/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/krusader/debian/patches/.gitignore
+++ b/debian/lenny/applications/kmymoney/debian/patches/series
diff --git a/debian/lenny/applications/kmymoney/debian/rules b/debian/lenny/applications/kmymoney/debian/rules
index 0ed3de40c..338d1373f 100755
--- a/debian/lenny/applications/kmymoney/debian/rules
+++ b/debian/lenny/applications/kmymoney/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/debian/lenny/applications/knemo/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knemo/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/knemo/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/knemo/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/knemo/debian/control b/debian/lenny/applications/knemo/debian/control
index 500b81dfc..6f15573b5 100644
--- a/debian/lenny/applications/knemo/debian/control
+++ b/debian/lenny/applications/knemo/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>> 4.1), cdbs, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 4.1), quilt, cdbs, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: knemo-trinity
diff --git a/debian/lenny/applications/ksystemlog/debian/patches/.gitignore b/debian/lenny/applications/knemo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/ksystemlog/debian/patches/.gitignore
+++ b/debian/lenny/applications/knemo/debian/patches/series
diff --git a/debian/lenny/applications/knemo/debian/rules b/debian/lenny/applications/knemo/debian/rules
index adb950752..a1a0015ad 100755
--- a/debian/lenny/applications/knemo/debian/rules
+++ b/debian/lenny/applications/knemo/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/knetstats/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetstats/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/knetstats/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/knetstats/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/knetstats/debian/control b/debian/lenny/applications/knetstats/debian/control
index c2f2f6429..fb660c633 100644
--- a/debian/lenny/applications/knetstats/debian/control
+++ b/debian/lenny/applications/knetstats/debian/control
@@ -2,7 +2,7 @@ Source: knetstats-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5.0), cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), quilt, cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://knetstats.sourceforge.net/
diff --git a/debian/lenny/applications/ktorrent/debian/patches/.gitignore b/debian/lenny/applications/knetstats/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/ktorrent/debian/patches/.gitignore
+++ b/debian/lenny/applications/knetstats/debian/patches/series
diff --git a/debian/lenny/applications/knetstats/debian/rules b/debian/lenny/applications/knetstats/debian/rules
index 948def121..603171a4b 100755
--- a/debian/lenny/applications/knetstats/debian/rules
+++ b/debian/lenny/applications/knetstats/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/rules b/debian/lenny/applications/knetworkmanager.cmake/debian/rules
index 5043dd652..7b801da5f 100755
--- a/debian/lenny/applications/knetworkmanager.cmake/debian/rules
+++ b/debian/lenny/applications/knetworkmanager.cmake/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk
index b93e7c154..a803f50d6 100644
--- a/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/koffice/debian/control b/debian/lenny/applications/koffice/debian/control
index 1af407ae6..8608af09d 100644
--- a/debian/lenny/applications/koffice/debian/control
+++ b/debian/lenny/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Raúl Sánchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
Standards-Version: 3.8.4
Homepage: http://www.koffice.org
diff --git a/debian/lenny/applications/kvirc/debian/patches/.gitignore b/debian/lenny/applications/koffice/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kvirc/debian/patches/.gitignore
+++ b/debian/lenny/applications/koffice/debian/patches/series
diff --git a/debian/lenny/applications/koffice/debian/rules b/debian/lenny/applications/koffice/debian/rules
index 597adca91..a80a266df 100755
--- a/debian/lenny/applications/koffice/debian/rules
+++ b/debian/lenny/applications/koffice/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/konversation/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/konversation/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/konversation/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/konversation/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kpilot/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kpilot/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kpilot/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kpilot/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kpowersave.cmake/debian/control b/debian/lenny/applications/kpowersave.cmake/debian/control
index 430ad6cb1..b5aed9d71 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/control
+++ b/debian/lenny/applications/kpowersave.cmake/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
Standards-Version: 3.8.4
Homepage: http://sourceforge.net/projects/powersave/
diff --git a/debian/lenny/applications/kwin-style-crystal/debian/patches/.gitignore b/debian/lenny/applications/kpowersave.cmake/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kwin-style-crystal/debian/patches/.gitignore
+++ b/debian/lenny/applications/kpowersave.cmake/debian/patches/series
diff --git a/debian/lenny/applications/kpowersave.cmake/debian/rules b/debian/lenny/applications/kpowersave.cmake/debian/rules
index 0d2383bae..6d3ac5584 100755
--- a/debian/lenny/applications/kpowersave.cmake/debian/rules
+++ b/debian/lenny/applications/kpowersave.cmake/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kpowersave/debian/control b/debian/lenny/applications/kpowersave/debian/control
index faaac13d0..8abf3510b 100644
--- a/debian/lenny/applications/kpowersave/debian/control
+++ b/debian/lenny/applications/kpowersave/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
Build-Conflicts: autoconf2.13
Standards-Version: 3.8.4
Homepage: http://sourceforge.net/projects/powersave/
diff --git a/debian/lenny/applications/piklab/debian/patches/.gitignore b/debian/lenny/applications/kpowersave/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/piklab/debian/patches/.gitignore
+++ b/debian/lenny/applications/kpowersave/debian/patches/series
diff --git a/debian/lenny/applications/kpowersave/debian/rules b/debian/lenny/applications/kpowersave/debian/rules
index 484f52352..a194aaad3 100755
--- a/debian/lenny/applications/kpowersave/debian/rules
+++ b/debian/lenny/applications/kpowersave/debian/rules
@@ -2,7 +2,7 @@
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/debian/lenny/applications/krename/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/krename/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/krename/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/krename/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/krename/debian/control b/debian/lenny/applications/krename/debian/control
index 29e40ed70..f278a8051 100644
--- a/debian/lenny/applications/krename/debian/control
+++ b/debian/lenny/applications/krename/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Richard A. Johnson <nixternal@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: krename-trinity
diff --git a/debian/lenny/applications/rosegarden/debian/patches/.gitignore b/debian/lenny/applications/krename/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/rosegarden/debian/patches/.gitignore
+++ b/debian/lenny/applications/krename/debian/patches/series
diff --git a/debian/lenny/applications/krename/debian/rules b/debian/lenny/applications/krename/debian/rules
index 3888eea1b..8f3290ed2 100755
--- a/debian/lenny/applications/krename/debian/rules
+++ b/debian/lenny/applications/krename/debian/rules
@@ -4,7 +4,7 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/debian/lenny/applications/krusader/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/krusader/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/krusader/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/krusader/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/krusader/debian/control b/debian/lenny/applications/krusader/debian/control
index 80e187bea..aac4f0d9f 100644
--- a/debian/lenny/applications/krusader/debian/control
+++ b/debian/lenny/applications/krusader/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://krusader.sourceforge.net
diff --git a/debian/lenny/applications/wlassistant/debian/patches/.gitignore b/debian/lenny/applications/krusader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/wlassistant/debian/patches/.gitignore
+++ b/debian/lenny/applications/krusader/debian/patches/series
diff --git a/debian/lenny/applications/krusader/debian/rules b/debian/lenny/applications/krusader/debian/rules
index f413f4d3a..fa96d831d 100755
--- a/debian/lenny/applications/krusader/debian/rules
+++ b/debian/lenny/applications/krusader/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/ksystemlog/debian/control b/debian/lenny/applications/ksystemlog/debian/control
index d818029c1..3948d02c9 100644
--- a/debian/lenny/applications/ksystemlog/debian/control
+++ b/debian/lenny/applications/ksystemlog/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: ksystemlog-trinity
diff --git a/debian/lenny/kdegraphics/debian/patches/.gitignore b/debian/lenny/applications/ksystemlog/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/kdegraphics/debian/patches/.gitignore
+++ b/debian/lenny/applications/ksystemlog/debian/patches/series
diff --git a/debian/lenny/applications/ksystemlog/debian/rules b/debian/lenny/applications/ksystemlog/debian/rules
index e26e7d22c..5efd2e313 100755
--- a/debian/lenny/applications/ksystemlog/debian/rules
+++ b/debian/lenny/applications/ksystemlog/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index b93e7c154..a803f50d6 100644
--- a/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/ktorrent/debian/control b/debian/lenny/applications/ktorrent/debian/control
index e22709c7b..02a745894 100644
--- a/debian/lenny/applications/ktorrent/debian/control
+++ b/debian/lenny/applications/ktorrent/debian/control
@@ -2,7 +2,7 @@ Source: ktorrent-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, kdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), quilt, cdbs, docbook2x, kdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: ktorrent-trinity
diff --git a/debian/lenny/kdepim/debian/patches/.gitignore b/debian/lenny/applications/ktorrent/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/kdepim/debian/patches/.gitignore
+++ b/debian/lenny/applications/ktorrent/debian/patches/series
diff --git a/debian/lenny/applications/ktorrent/debian/rules b/debian/lenny/applications/ktorrent/debian/rules
index 853b79b3f..8b87031cb 100755
--- a/debian/lenny/applications/ktorrent/debian/rules
+++ b/debian/lenny/applications/ktorrent/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/debian-qt-kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/kuickshow/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kuickshow/debian/control b/debian/lenny/applications/kuickshow/debian/control
index 58a19c6c9..0c8890be4 100644
--- a/debian/lenny/applications/kuickshow/debian/control
+++ b/debian/lenny/applications/kuickshow/debian/control
@@ -2,7 +2,7 @@ Source: kuickshow-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, kdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, kdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kuickshow-trinity
diff --git a/debian/lenny/libraries/libkipi/debian/patches/.gitignore b/debian/lenny/applications/kuickshow/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/libraries/libkipi/debian/patches/.gitignore
+++ b/debian/lenny/applications/kuickshow/debian/patches/series
diff --git a/debian/lenny/applications/kuickshow/debian/rules b/debian/lenny/applications/kuickshow/debian/rules
index b751ebfe5..1132acaac 100755
--- a/debian/lenny/applications/kuickshow/debian/rules
+++ b/debian/lenny/applications/kuickshow/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/debian/lenny/applications/kvirc/debian/control b/debian/lenny/applications/kvirc/debian/control
index 4dc24713a..fc58a788a 100644
--- a/debian/lenny/applications/kvirc/debian/control
+++ b/debian/lenny/applications/kvirc/debian/control
@@ -1,5 +1,5 @@
Source: kvirc-trinity
-Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), kdelibs4-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), quilt, kdelibs4-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool, libltdl-dev
Section: net
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
diff --git a/debian/squeeze/applications/adept/debian/patches/.gitignore b/debian/lenny/applications/kvirc/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/adept/debian/patches/.gitignore
+++ b/debian/lenny/applications/kvirc/debian/patches/series
diff --git a/debian/lenny/applications/kvirc/debian/rules b/debian/lenny/applications/kvirc/debian/rules
index cb7bb0c9a..eefb7c18b 100755
--- a/debian/lenny/applications/kvirc/debian/rules
+++ b/debian/lenny/applications/kvirc/debian/rules
@@ -15,7 +15,7 @@ common-configure-impl::
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/debian/lenny/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/kwin-style-crystal/debian/control b/debian/lenny/applications/kwin-style-crystal/debian/control
index 0f61547f5..c503a6b12 100644
--- a/debian/lenny/applications/kwin-style-crystal/debian/control
+++ b/debian/lenny/applications/kwin-style-crystal/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
-Build-Depends: debhelper (>= 5.0.0), cdbs, kdebase-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, kdebase-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kwin-style-crystal-trinity
diff --git a/debian/squeeze/applications/bibletime/debian/patches/.gitignore b/debian/lenny/applications/kwin-style-crystal/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/bibletime/debian/patches/.gitignore
+++ b/debian/lenny/applications/kwin-style-crystal/debian/patches/series
diff --git a/debian/lenny/applications/kwin-style-crystal/debian/rules b/debian/lenny/applications/kwin-style-crystal/debian/rules
index 967c93592..f75d9ba60 100755
--- a/debian/lenny/applications/kwin-style-crystal/debian/rules
+++ b/debian/lenny/applications/kwin-style-crystal/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/debian/lenny/applications/piklab/debian/control b/debian/lenny/applications/piklab/debian/control
index 2e8d8ffda..72ab578b2 100644
--- a/debian/lenny/applications/piklab/debian/control
+++ b/debian/lenny/applications/piklab/debian/control
@@ -2,7 +2,7 @@ Source: piklab-trinity
Section: electronics
Priority: extra
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), autotools-dev, quilt, chrpath,
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, quilt, chrpath,
libusb-dev, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://piklab.sourceforge.net/
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/patches/.gitignore b/debian/lenny/applications/piklab/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/patches/.gitignore
+++ b/debian/lenny/applications/piklab/debian/patches/series
diff --git a/debian/lenny/applications/piklab/debian/rules b/debian/lenny/applications/piklab/debian/rules
index 31c8548d3..650dfcc80 100755
--- a/debian/lenny/applications/piklab/debian/rules
+++ b/debian/lenny/applications/piklab/debian/rules
@@ -26,7 +26,9 @@ else
CFLAGS += -O2
endif
-config: config-stamp
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+config: post-patches config-stamp
config-stamp: configure
dh_testdir
@@ -39,8 +41,6 @@ config-stamp: configure
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
- $(MAKE) -f /usr/share/quilt/quilt.make patch
-
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
@@ -62,7 +62,7 @@ build-stamp: config-stamp
#docbook-to-man debian/piklab.sgml > piklab.1
touch $@
-clean:
+clean::
dh_testdir
dh_testroot
@@ -80,7 +80,6 @@ clean:
rm -f po/*.gmo
rm -f src/common/global/svn_revision/svn_revision.h
rm -f config.sub config.guess config.status config.log
- $(MAKE) -f /usr/share/quilt/quilt.make unpatch
dh_clean
install: build-stamp
diff --git a/debian/lenny/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
index 856fa4932..1d366e492 100644
--- a/debian/lenny/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/rosegarden/debian/control b/debian/lenny/applications/rosegarden/debian/control
index 62bb14e30..bfa8fbc1f 100644
--- a/debian/lenny/applications/rosegarden/debian/control
+++ b/debian/lenny/applications/rosegarden/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org>
Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org>
-Build-Depends: debhelper (>> 5.0.0), cdbs, cmake, kdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
+Build-Depends: debhelper (>> 5.0.0), quilt, cdbs, cmake, kdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev
Standards-Version: 3.8.4
Homepage: http://www.rosegardenmusic.com/
diff --git a/debian/squeeze/applications/digikam/debian/patches/.gitignore b/debian/lenny/applications/rosegarden/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/digikam/debian/patches/.gitignore
+++ b/debian/lenny/applications/rosegarden/debian/patches/series
diff --git a/debian/lenny/applications/rosegarden/debian/rules b/debian/lenny/applications/rosegarden/debian/rules
index d554585f6..cc6b1a29a 100755
--- a/debian/lenny/applications/rosegarden/debian/rules
+++ b/debian/lenny/applications/rosegarden/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/smb4k/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/smb4k/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/smb4k/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/smb4k/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/wlassistant/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/debian/lenny/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/applications/wlassistant/debian/control b/debian/lenny/applications/wlassistant/debian/control
index d3c8ba9c9..b0e391a33 100644
--- a/debian/lenny/applications/wlassistant/debian/control
+++ b/debian/lenny/applications/wlassistant/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>= 4.1.0), cmake, cdbs, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: debhelper (>= 4.1.0), quilt, cmake, cdbs, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev
Standards-Version: 3.8.4
Package: wlassistant-trinity
diff --git a/debian/squeeze/applications/dolphin/debian/patches/.gitignore b/debian/lenny/applications/wlassistant/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/dolphin/debian/patches/.gitignore
+++ b/debian/lenny/applications/wlassistant/debian/patches/series
diff --git a/debian/lenny/applications/wlassistant/debian/rules b/debian/lenny/applications/wlassistant/debian/rules
index 1a8fdeafb..5e6564e64 100755
--- a/debian/lenny/applications/wlassistant/debian/rules
+++ b/debian/lenny/applications/wlassistant/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/yakuake/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/yakuake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/yakuake/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/dependencies/arts/debian/control b/debian/lenny/dependencies/arts/debian/control
index fcdd49cff..371c8efc3 100644
--- a/debian/lenny/dependencies/arts/debian/control
+++ b/debian/lenny/dependencies/arts/debian/control
@@ -4,7 +4,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/TDE Maintainers <debian-qt-tde@lists.debian.org>
Priority: optional
Uploaders: Adeodato Simó <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6),
+Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), quilt,
docbook-to-man, gawk, gettext, sharutils, texinfo,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libmad0-dev,
diff --git a/debian/lenny/dependencies/arts/debian/patches/series b/debian/lenny/dependencies/arts/debian/patches/series
new file mode 100644
index 000000000..59e055db8
--- /dev/null
+++ b/debian/lenny/dependencies/arts/debian/patches/series
@@ -0,0 +1 @@
+12_cleanup_artsc-config.diff
diff --git a/debian/lenny/dependencies/arts/debian/rules b/debian/lenny/dependencies/arts/debian/rules
index 4c8adccc6..496fc2ad4 100755
--- a/debian/lenny/dependencies/arts/debian/rules
+++ b/debian/lenny/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/lenny/dependencies/dbus-1-tqt/debian/control b/debian/lenny/dependencies/dbus-1-tqt/debian/control
index 9a6e652a4..87a4a7d4e 100644
--- a/debian/lenny/dependencies/dbus-1-tqt/debian/control
+++ b/debian/lenny/dependencies/dbus-1-tqt/debian/control
@@ -2,7 +2,7 @@ Source: dbus-1-tqt
Section: devel
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
Standards-Version: 3.8.3
Package: libdbus-1-tqt-dev
diff --git a/debian/squeeze/applications/fusion-icon/debian/patches/.gitignore b/debian/lenny/dependencies/dbus-1-tqt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/fusion-icon/debian/patches/.gitignore
+++ b/debian/lenny/dependencies/dbus-1-tqt/debian/patches/series
diff --git a/debian/lenny/dependencies/dbus-1-tqt/debian/rules b/debian/lenny/dependencies/dbus-1-tqt/debian/rules
index 3b86de7db..0585b8d86 100755
--- a/debian/lenny/dependencies/dbus-1-tqt/debian/rules
+++ b/debian/lenny/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/lenny/dependencies/dbus-tqt/debian/control b/debian/lenny/dependencies/dbus-tqt/debian/control
index ca76e783a..bf5949881 100644
--- a/debian/lenny/dependencies/dbus-tqt/debian/control
+++ b/debian/lenny/dependencies/dbus-tqt/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Dröge <slomo@ubuntu.com>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
Standards-Version: 3.8.3
Package: libdbus-tqt-1-dev
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/patches/.gitignore b/debian/lenny/dependencies/dbus-tqt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/patches/.gitignore
+++ b/debian/lenny/dependencies/dbus-tqt/debian/patches/series
diff --git a/debian/lenny/dependencies/dbus-tqt/debian/rules b/debian/lenny/dependencies/dbus-tqt/debian/rules
index a59bed76e..26bf6c196 100755
--- a/debian/lenny/dependencies/dbus-tqt/debian/rules
+++ b/debian/lenny/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/lenny/dependencies/qt3/debian/control b/debian/lenny/dependencies/qt3/debian/control
index d469c66cf..aee89f140 100644
--- a/debian/lenny/dependencies/qt3/debian/control
+++ b/debian/lenny/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/lenny/dependencies/qt3/debian/rules b/debian/lenny/dependencies/qt3/debian/rules
index e3e754911..c526c0750 100755
--- a/debian/lenny/dependencies/qt3/debian/rules
+++ b/debian/lenny/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/lenny/dependencies/tqtinterface/debian/control b/debian/lenny/dependencies/tqtinterface/debian/control
index c7717809b..312dc7ee2 100644
--- a/debian/lenny/dependencies/tqtinterface/debian/control
+++ b/debian/lenny/dependencies/tqtinterface/debian/control
@@ -2,7 +2,7 @@ Source: libtqtinterface
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, qt3-apps-dev, cmake, cdbs
+Build-Depends: debhelper (>> 4.0.0), quilt, libqt3-mt-dev, qt3-apps-dev, cmake, cdbs
Standards-Version: 3.8.4
Package: libtqtinterface
diff --git a/debian/squeeze/applications/gwenview/debian/patches/.gitignore b/debian/lenny/dependencies/tqtinterface/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/gwenview/debian/patches/.gitignore
+++ b/debian/lenny/dependencies/tqtinterface/debian/patches/series
diff --git a/debian/lenny/dependencies/tqtinterface/debian/rules b/debian/lenny/dependencies/tqtinterface/debian/rules
index 208d4bed4..e93b85777 100755
--- a/debian/lenny/dependencies/tqtinterface/debian/rules
+++ b/debian/lenny/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/lenny/kdeaccessibility/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/lenny/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdeaccessibility/debian/control b/debian/lenny/kdeaccessibility/debian/control
index 9334124f4..f4f93754d 100644
--- a/debian/lenny/kdeaccessibility/debian/control
+++ b/debian/lenny/kdeaccessibility/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, gettext, groff-base, kdelibs4-trinity-dev, kdemultimedia-trinity-dev, libakode-dev, libxtst-dev, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, gettext, groff-base, kdelibs4-trinity-dev, kdemultimedia-trinity-dev, libakode-dev, libxtst-dev, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdeaccessibility-trinity
diff --git a/debian/lenny/kdeaccessibility/debian/patches/series b/debian/lenny/kdeaccessibility/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/lenny/kdeaccessibility/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/debian/lenny/kdeaccessibility/debian/rules b/debian/lenny/kdeaccessibility/debian/rules
index d77421956..67cb3b57b 100755
--- a/debian/lenny/kdeaccessibility/debian/rules
+++ b/debian/lenny/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/lenny/kdeaddons/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdeaddons/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/lenny/kdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdeaddons/debian/control b/debian/lenny/kdeaddons/debian/control
index 84a8d3f3e..9af497de2 100644
--- a/debian/lenny/kdeaddons/debian/control
+++ b/debian/lenny/kdeaddons/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdeaddons-trinity
diff --git a/debian/lenny/kdeaddons/debian/patches/series b/debian/lenny/kdeaddons/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/lenny/kdeaddons/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/debian/lenny/kdeaddons/debian/rules b/debian/lenny/kdeaddons/debian/rules
index ef36a4389..794a84314 100755
--- a/debian/lenny/kdeaddons/debian/rules
+++ b/debian/lenny/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/lenny/kdeadmin/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdeadmin/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/lenny/kdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdeadmin/debian/control b/debian/lenny/kdeadmin/debian/control
index f22e58a51..e1ee74e35 100644
--- a/debian/lenny/kdeadmin/debian/control
+++ b/debian/lenny/kdeadmin/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), quilt, docbook-to-man, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdeadmin-trinity
diff --git a/debian/lenny/kdeadmin/debian/patches/series b/debian/lenny/kdeadmin/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/lenny/kdeadmin/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/debian/lenny/kdeadmin/debian/rules b/debian/lenny/kdeadmin/debian/rules
index a486a60b6..e02e486c9 100755
--- a/debian/lenny/kdeadmin/debian/rules
+++ b/debian/lenny/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/lenny/kdeartwork/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdeartwork/debian/cdbs/debian-qt-kde.mk
index 497be9751..425264528 100644
--- a/debian/lenny/kdeartwork/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdeartwork/debian/control b/debian/lenny/kdeartwork/debian/control
index 355552222..e781da0b3 100644
--- a/debian/lenny/kdeartwork/debian/control
+++ b/debian/lenny/kdeartwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, kdelibs4-trinity-dev, gawk, gettext, sharutils, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, kdelibs4-trinity-dev, gawk, gettext, sharutils, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
Build-Conflicts: autoconf2.13, nvidia-glx
Standards-Version: 3.8.4
diff --git a/debian/squeeze/applications/k9copy/debian/patches/.gitignore b/debian/lenny/kdeartwork/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/k9copy/debian/patches/.gitignore
+++ b/debian/lenny/kdeartwork/debian/patches/series
diff --git a/debian/lenny/kdeartwork/debian/rules b/debian/lenny/kdeartwork/debian/rules
index ee24e8b57..ec322feed 100755
--- a/debian/lenny/kdeartwork/debian/rules
+++ b/debian/lenny/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/lenny/kdebase/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdebase/debian/cdbs/debian-qt-kde.mk
index fa0d532f4..ec89756bb 100644
--- a/debian/lenny/kdebase/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdebase/debian/control b/debian/lenny/kdebase/debian/control
index 8d30e3771..b7c5b4d2e 100644
--- a/debian/lenny/kdebase/debian/control
+++ b/debian/lenny/kdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, kdelibs4c2a-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libart-2.0-dev (>= 2.3.17), libtool, libltdl-dev, binutils-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, kdelibs4c2a-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libart-2.0-dev (>= 2.3.17), libtool, libltdl-dev, binutils-dev, cmake
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, kdelibs4-trinity-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.8.4
diff --git a/debian/lenny/kdebase/debian/patches/series b/debian/lenny/kdebase/debian/patches/series
new file mode 100644
index 000000000..4a73e65ce
--- /dev/null
+++ b/debian/lenny/kdebase/debian/patches/series
@@ -0,0 +1,2 @@
+disable_default_tdm_theme.diff
+disable_startkde_wallpaper.diff
diff --git a/debian/lenny/kdebase/debian/rules b/debian/lenny/kdebase/debian/rules
index 7e01d7a6c..13dc16789 100755
--- a/debian/lenny/kdebase/debian/rules
+++ b/debian/lenny/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/lenny/kdebindings/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdebindings/debian/cdbs/debian-qt-kde.mk
index 2a219d60a..1e862f623 100644
--- a/debian/lenny/kdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdeedu/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdeedu/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/lenny/kdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdeedu/debian/control b/debian/lenny/kdeedu/debian/control
index ba5a07f87..8cb17a378 100644
--- a/debian/lenny/kdeedu/debian/control
+++ b/debian/lenny/kdeedu/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdeedu-trinity
diff --git a/debian/lenny/kdeedu/debian/patches/series b/debian/lenny/kdeedu/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/lenny/kdeedu/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/debian/lenny/kdeedu/debian/rules b/debian/lenny/kdeedu/debian/rules
index a449d17a7..bdc78e81f 100755
--- a/debian/lenny/kdeedu/debian/rules
+++ b/debian/lenny/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/lenny/kdegames/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdegames/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/lenny/kdegames/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdegames/debian/control b/debian/lenny/kdegames/debian/control
index eb69d4440..731688384 100644
--- a/debian/lenny/kdegames/debian/control
+++ b/debian/lenny/kdegames/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), kdemultimedia-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), kdemultimedia-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, kdelibs4-trinity-doc
Standards-Version: 3.8.4
diff --git a/debian/lenny/kdegames/debian/patches/series b/debian/lenny/kdegames/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/lenny/kdegames/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/debian/lenny/kdegames/debian/rules b/debian/lenny/kdegames/debian/rules
index bbfa34c23..e904160f8 100755
--- a/debian/lenny/kdegames/debian/rules
+++ b/debian/lenny/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/lenny/kdegraphics/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdegraphics/debian/cdbs/debian-qt-kde.mk
index df08f2d37..7c7e6d56c 100644
--- a/debian/lenny/kdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdegraphics/debian/control b/debian/lenny/kdegraphics/debian/control
index 5fe79a0a0..3459595e1 100644
--- a/debian/lenny/kdegraphics/debian/control
+++ b/debian/lenny/kdegraphics/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdegraphics-trinity
diff --git a/debian/lenny/kdegraphics/debian/patches/series b/debian/lenny/kdegraphics/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/lenny/kdegraphics/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/debian/lenny/kdegraphics/debian/rules b/debian/lenny/kdegraphics/debian/rules
index 415843290..0d263cda3 100755
--- a/debian/lenny/kdegraphics/debian/rules
+++ b/debian/lenny/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/lenny/kdelibs/debian/control b/debian/lenny/kdelibs/debian/control
index 6de9a85da..ac1e69230 100644
--- a/debian/lenny/kdelibs/debian/control
+++ b/debian/lenny/kdelibs/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Adeodato Simó <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
+Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-dev,
binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, gawk, gettext,
libart-2.0-dev (>= 2.3.17), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
diff --git a/debian/squeeze/applications/kaffeine/debian/patches/.gitignore b/debian/lenny/kdelibs/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kaffeine/debian/patches/.gitignore
+++ b/debian/lenny/kdelibs/debian/patches/series
diff --git a/debian/lenny/kdelibs/debian/rules b/debian/lenny/kdelibs/debian/rules
index a798672ed..e395bc976 100755
--- a/debian/lenny/kdelibs/debian/rules
+++ b/debian/lenny/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/lenny/kdemultimedia/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdemultimedia/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/lenny/kdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdemultimedia/debian/control b/debian/lenny/kdemultimedia/debian/control
index c4d03be2a..d40bc857f 100644
--- a/debian/lenny/kdemultimedia/debian/control
+++ b/debian/lenny/kdemultimedia/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, cdparanoia, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdemultimedia-trinity
diff --git a/debian/lenny/kdemultimedia/debian/patches/series b/debian/lenny/kdemultimedia/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/lenny/kdemultimedia/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/debian/lenny/kdemultimedia/debian/rules b/debian/lenny/kdemultimedia/debian/rules
index 3239a3df0..25da76ce2 100755
--- a/debian/lenny/kdemultimedia/debian/rules
+++ b/debian/lenny/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/lenny/kdenetwork/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdenetwork/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/debian/lenny/kdenetwork/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdenetwork/debian/control b/debian/lenny/kdenetwork/debian/control
index 0cd482f39..6d243b5f9 100644
--- a/debian/lenny/kdenetwork/debian/control
+++ b/debian/lenny/kdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdenetwork-trinity
diff --git a/debian/lenny/kdenetwork/debian/patches/series b/debian/lenny/kdenetwork/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/lenny/kdenetwork/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/debian/lenny/kdenetwork/debian/rules b/debian/lenny/kdenetwork/debian/rules
index d677a6762..ec28e1149 100755
--- a/debian/lenny/kdenetwork/debian/rules
+++ b/debian/lenny/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/lenny/kdepim/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdepim/debian/cdbs/debian-qt-kde.mk
index fa0d532f4..ec89756bb 100644
--- a/debian/lenny/kdepim/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdepim/debian/control b/debian/lenny/kdepim/debian/control
index 8df599fb0..51155541c 100644
--- a/debian/lenny/kdepim/debian/control
+++ b/debian/lenny/kdepim/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31),
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt,
cdparanoia, gawk, gettext, kdelibs4-trinity-dev, bison, byacc, bzip2,
flex, groff-base, libopensync0-dev, libogg-dev,
libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-dev,
diff --git a/debian/squeeze/applications/katapult/debian/patches/.gitignore b/debian/lenny/kdepim/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/katapult/debian/patches/.gitignore
+++ b/debian/lenny/kdepim/debian/patches/series
diff --git a/debian/lenny/kdepim/debian/rules b/debian/lenny/kdepim/debian/rules
index 73d43ef3c..b69eab4eb 100755
--- a/debian/lenny/kdepim/debian/rules
+++ b/debian/lenny/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/lenny/kdesdk/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdesdk/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/debian/lenny/kdesdk/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdesdk/debian/control b/debian/lenny/kdesdk/debian/control
index 3241d3613..4e9edd3bc 100644
--- a/debian/lenny/kdesdk/debian/control
+++ b/debian/lenny/kdesdk/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, gawk,
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, gawk,
gettext, pkg-config, kdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
kdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10),
libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev,
diff --git a/debian/lenny/kdesdk/debian/patches/series b/debian/lenny/kdesdk/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/lenny/kdesdk/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/debian/lenny/kdesdk/debian/rules b/debian/lenny/kdesdk/debian/rules
index cb41a8b51..36a19ea1d 100755
--- a/debian/lenny/kdesdk/debian/rules
+++ b/debian/lenny/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/lenny/kdetoys/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdetoys/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/debian/lenny/kdetoys/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdetoys/debian/control b/debian/lenny/kdetoys/debian/control
index 72b4fde14..9c549ba80 100644
--- a/debian/lenny/kdetoys/debian/control
+++ b/debian/lenny/kdetoys/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdetoys-trinity
diff --git a/debian/lenny/kdetoys/debian/patches/series b/debian/lenny/kdetoys/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/lenny/kdetoys/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/debian/lenny/kdetoys/debian/rules b/debian/lenny/kdetoys/debian/rules
index 1e3cc9f16..377649682 100755
--- a/debian/lenny/kdetoys/debian/rules
+++ b/debian/lenny/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/lenny/kdeutils/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdeutils/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/debian/lenny/kdeutils/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdeutils/debian/control b/debian/lenny/kdeutils/debian/control
index c99bea1f0..3863461aa 100644
--- a/debian/lenny/kdeutils/debian/control
+++ b/debian/lenny/kdeutils/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), kdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), kdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, kdelibs4-trinity-doc
Standards-Version: 3.8.4
diff --git a/debian/lenny/kdeutils/debian/patches/series b/debian/lenny/kdeutils/debian/patches/series
new file mode 100644
index 000000000..f4421a4c2
--- /dev/null
+++ b/debian/lenny/kdeutils/debian/patches/series
@@ -0,0 +1,5 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
+
+01-klaptopdaemon-setuphandler.diff
diff --git a/debian/lenny/kdeutils/debian/rules b/debian/lenny/kdeutils/debian/rules
index 59d9b2492..b86b6b570 100755
--- a/debian/lenny/kdeutils/debian/rules
+++ b/debian/lenny/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/lenny/kdevelop/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdevelop/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/debian/lenny/kdevelop/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdevelop/debian/control b/debian/lenny/kdevelop/debian/control
index 0a60be945..280afc505 100644
--- a/debian/lenny/kdevelop/debian/control
+++ b/debian/lenny/kdevelop/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Jeremy Lainé <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), cmake, kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), quilt, cmake, kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdevelop-trinity
diff --git a/debian/lenny/kdevelop/debian/patches/series b/debian/lenny/kdevelop/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/lenny/kdevelop/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/debian/lenny/kdevelop/debian/rules b/debian/lenny/kdevelop/debian/rules
index 99667d1b3..cfaa4a957 100755
--- a/debian/lenny/kdevelop/debian/rules
+++ b/debian/lenny/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/lenny/kdewebdev/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdewebdev/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/lenny/kdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/kdewebdev/debian/control b/debian/lenny/kdewebdev/debian/control
index 498a082fd..6bdc292cb 100644
--- a/debian/lenny/kdewebdev/debian/control
+++ b/debian/lenny/kdewebdev/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Adeodato Simó <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://trinity.pearsoncomputing.net
diff --git a/debian/lenny/kdewebdev/debian/patches/series b/debian/lenny/kdewebdev/debian/patches/series
new file mode 100644
index 000000000..8f8f0bd6b
--- /dev/null
+++ b/debian/lenny/kdewebdev/debian/patches/series
@@ -0,0 +1 @@
+common/kubuntu_01_kdepot.diff
diff --git a/debian/lenny/kdewebdev/debian/rules b/debian/lenny/kdewebdev/debian/rules
index 9aede760c..39263b863 100755
--- a/debian/lenny/kdewebdev/debian/rules
+++ b/debian/lenny/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/lenny/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk b/debian/lenny/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk b/debian/lenny/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk b/debian/lenny/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/libraries/libkipi/debian/cdbs/debian-qt-kde.mk b/debian/lenny/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/lenny/libraries/libkipi/debian/control b/debian/lenny/libraries/libkipi/debian/control
index 8c14304f7..d466c5c9d 100644
--- a/debian/lenny/libraries/libkipi/debian/control
+++ b/debian/lenny/libraries/libkipi/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, kdelibs4-trinity-dev (>= 4:3.4.3-2), automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, libexif-dev, kdelibs4-trinity-dev (>= 4:3.4.3-2), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: libkipi0-trinity-dev
diff --git a/debian/squeeze/applications/kbfx/debian/patches/.gitignore b/debian/lenny/libraries/libkipi/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kbfx/debian/patches/.gitignore
+++ b/debian/lenny/libraries/libkipi/debian/patches/series
diff --git a/debian/lenny/libraries/libkipi/debian/rules b/debian/lenny/libraries/libkipi/debian/rules
index 6b549284b..df0760b56 100755
--- a/debian/lenny/libraries/libkipi/debian/rules
+++ b/debian/lenny/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
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/kbookreader/debian/patches/.gitignore b/debian/squeeze/applications/abakus/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kbookreader/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/kde-guidance/debian/patches/.gitignore b/debian/squeeze/applications/bibletime/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kde-guidance/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/kde-style-qtcurve/debian/patches/.gitignore b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/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/kde-systemsettings/debian/patches/.gitignore b/debian/squeeze/applications/digikam/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kde-systemsettings/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/kdesudo/debian/patches/.gitignore b/debian/squeeze/applications/dolphin/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kdesudo/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/kdirstat/debian/patches/.gitignore b/debian/squeeze/applications/filelight-l10n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kdirstat/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/kdpkg/debian/patches/.gitignore b/debian/squeeze/applications/fusion-icon/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kdpkg/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/kio-apt/debian/patches/.gitignore b/debian/squeeze/applications/gtk-qt-engine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kio-apt/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/kio-umountwrapper/debian/patches/.gitignore b/debian/squeeze/applications/gwenview-i18n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kio-umountwrapper/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/kiosktool/debian/patches/.gitignore b/debian/squeeze/applications/gwenview/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kiosktool/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/kmplayer/debian/patches/.gitignore b/debian/squeeze/applications/k9copy/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kmplayer/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/knemo/debian/patches/.gitignore b/debian/squeeze/applications/kaffeine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/knemo/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/knetstats/debian/patches/.gitignore b/debian/squeeze/applications/katapult/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/knetstats/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/koffice/debian/patches/.gitignore b/debian/squeeze/applications/kbfx/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/koffice/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/kpowersave.cmake/debian/patches/.gitignore b/debian/squeeze/applications/kbookreader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kpowersave.cmake/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/kpowersave/debian/patches/.gitignore b/debian/squeeze/applications/kde-guidance/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kpowersave/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/krusader/debian/patches/.gitignore b/debian/squeeze/applications/kde-style-qtcurve/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/krusader/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/ksystemlog/debian/patches/.gitignore b/debian/squeeze/applications/kde-systemsettings/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/ksystemlog/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/ktorrent/debian/patches/.gitignore b/debian/squeeze/applications/kdesudo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/ktorrent/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/kvirc/debian/patches/.gitignore b/debian/squeeze/applications/kdirstat/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kvirc/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/kwin-style-crystal/debian/patches/.gitignore b/debian/squeeze/applications/kdpkg/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kwin-style-crystal/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/piklab/debian/patches/.gitignore b/debian/squeeze/applications/kerry/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/piklab/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/rosegarden/debian/patches/.gitignore b/debian/squeeze/applications/kgtk-qt3/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/rosegarden/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/wlassistant/debian/patches/.gitignore b/debian/squeeze/applications/kio-apt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/wlassistant/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/kdegraphics/debian/patches/.gitignore b/debian/squeeze/applications/kio-locate/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/kdegraphics/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/kdepim/debian/patches/.gitignore b/debian/squeeze/applications/kio-umountwrapper/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/kdepim/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/libraries/libkipi/debian/patches/.gitignore b/debian/squeeze/applications/kiosktool/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/libraries/libkipi/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/ubuntu/maverick/applications/adept/debian/patches/.gitignore b/debian/squeeze/applications/kmplayer/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/adept/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/ubuntu/maverick/applications/bibletime/debian/patches/.gitignore b/debian/squeeze/applications/kmymoney/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/bibletime/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/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/.gitignore b/debian/squeeze/applications/knemo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/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/ubuntu/maverick/applications/digikam/debian/patches/.gitignore b/debian/squeeze/applications/knetstats/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/digikam/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/ubuntu/maverick/applications/dolphin/debian/patches/.gitignore b/debian/squeeze/applications/koffice/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/dolphin/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/ubuntu/maverick/applications/fusion-icon/debian/patches/.gitignore b/debian/squeeze/applications/kpowersave.cmake/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/fusion-icon/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/ubuntu/maverick/applications/gtk-qt-engine/debian/patches/.gitignore b/debian/squeeze/applications/kpowersave/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/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/ubuntu/maverick/applications/gwenview/debian/patches/.gitignore b/debian/squeeze/applications/krename/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/gwenview/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/ubuntu/maverick/applications/k9copy/debian/patches/.gitignore b/debian/squeeze/applications/krusader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/k9copy/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/ubuntu/maverick/applications/kaffeine/debian/patches/.gitignore b/debian/squeeze/applications/ksystemlog/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kaffeine/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/ubuntu/maverick/applications/katapult/debian/patches/.gitignore b/debian/squeeze/applications/ktorrent/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/katapult/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/ubuntu/maverick/applications/kbfx/debian/patches/.gitignore b/debian/squeeze/applications/kuickshow/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kbfx/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/ubuntu/maverick/applications/kbookreader/debian/patches/.gitignore b/debian/squeeze/applications/kvirc/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/patches/.gitignore
+++ 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/ubuntu/maverick/applications/kde-guidance/debian/patches/.gitignore b/debian/squeeze/applications/kwin-style-crystal/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/patches/.gitignore
+++ 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/ubuntu/maverick/applications/kde-style-qtcurve/debian/patches/.gitignore b/debian/squeeze/applications/piklab/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/patches/.gitignore
+++ 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/ubuntu/maverick/applications/kde-systemsettings/debian/patches/.gitignore b/debian/squeeze/applications/rosegarden/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/patches/.gitignore
+++ 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/ubuntu/maverick/applications/kdesudo/debian/patches/.gitignore b/debian/squeeze/applications/wlassistant/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/patches/.gitignore
+++ 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/ubuntu/maverick/applications/kdirstat/debian/patches/.gitignore b/debian/squeeze/dependencies/dbus-1-tqt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/patches/.gitignore
+++ 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/ubuntu/maverick/applications/kdpkg/debian/patches/.gitignore b/debian/squeeze/dependencies/dbus-tqt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/patches/.gitignore
+++ 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/ubuntu/maverick/applications/kio-apt/debian/patches/.gitignore b/debian/squeeze/dependencies/tqtinterface/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/patches/.gitignore
+++ 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/ubuntu/maverick/applications/kio-umountwrapper/debian/patches/.gitignore b/debian/squeeze/kdelibs/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/patches/.gitignore
+++ 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/ubuntu/maverick/applications/kmplayer/debian/patches/.gitignore b/debian/squeeze/kdepim/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/patches/.gitignore
+++ 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/ubuntu/maverick/applications/knemo/debian/patches/.gitignore b/debian/squeeze/libraries/libkipi/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/knemo/debian/patches/.gitignore
+++ 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
diff --git a/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/knetstats/debian/patches/.gitignore b/ubuntu/maverick/applications/abakus/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/knetstats/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/abakus/debian/patches/series
diff --git a/ubuntu/maverick/applications/abakus/debian/rules b/ubuntu/maverick/applications/abakus/debian/rules
index 36bb62fb5..7f037b23e 100755
--- a/ubuntu/maverick/applications/abakus/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/koffice/debian/patches/.gitignore b/ubuntu/maverick/applications/adept/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/koffice/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/adept/debian/patches/series
diff --git a/ubuntu/maverick/applications/adept/debian/rules b/ubuntu/maverick/applications/adept/debian/rules
index aa5a629a7..2618af2fc 100755
--- a/ubuntu/maverick/applications/adept/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/amarok.cmake/debian/rules b/ubuntu/maverick/applications/amarok.cmake/debian/rules
index 4fd9a743d..ae58dd49c 100755
--- a/ubuntu/maverick/applications/amarok.cmake/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/basket/debian/control b/ubuntu/maverick/applications/basket/debian/control
index 901f4c9e3..f87a18da9 100644
--- a/ubuntu/maverick/applications/basket/debian/control
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/basket/debian/rules b/ubuntu/maverick/applications/basket/debian/rules
index 2cfda511e..1de38c154 100755
--- a/ubuntu/maverick/applications/basket/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/.gitignore b/ubuntu/maverick/applications/bibletime/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/bibletime/debian/patches/series
diff --git a/ubuntu/maverick/applications/bibletime/debian/rules b/ubuntu/maverick/applications/bibletime/debian/rules
index fdd90c2b3..c57001178 100755
--- a/ubuntu/maverick/applications/bibletime/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kpowersave/debian/patches/.gitignore b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/series
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules
index 943412831..cbb918dcb 100755
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/krusader/debian/patches/.gitignore b/ubuntu/maverick/applications/digikam/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/krusader/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/digikam/debian/patches/series
diff --git a/ubuntu/maverick/applications/digikam/debian/rules b/ubuntu/maverick/applications/digikam/debian/rules
index 046053e54..2d85649a6 100755
--- a/ubuntu/maverick/applications/digikam/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/ksystemlog/debian/patches/.gitignore b/ubuntu/maverick/applications/dolphin/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/dolphin/debian/patches/series
diff --git a/ubuntu/maverick/applications/dolphin/debian/rules b/ubuntu/maverick/applications/dolphin/debian/rules
index 33e949961..7b4528041 100755
--- a/ubuntu/maverick/applications/dolphin/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/filelight-l10n/debian/control b/ubuntu/maverick/applications/filelight-l10n/debian/control
index 920f19f0c..c0ca7d22c 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/control
+++ b/ubuntu/maverick/applications/filelight-l10n/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Ral Snchez 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/ubuntu/maverick/applications/ktorrent/debian/patches/.gitignore b/ubuntu/maverick/applications/filelight-l10n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/filelight-l10n/debian/patches/series
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/rules b/ubuntu/maverick/applications/filelight-l10n/debian/rules
index bc018d11c..5d3cc2a77 100755
--- a/ubuntu/maverick/applications/filelight-l10n/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kvirc/debian/patches/.gitignore b/ubuntu/maverick/applications/fusion-icon/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kvirc/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/fusion-icon/debian/patches/series
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/rules b/ubuntu/maverick/applications/fusion-icon/debian/rules
index 207573dea..88040a563 100755
--- a/ubuntu/maverick/applications/fusion-icon/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kwin-style-crystal/debian/patches/.gitignore b/ubuntu/maverick/applications/gtk-qt-engine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/patches/series
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/rules b/ubuntu/maverick/applications/gtk-qt-engine/debian/rules
index bf8de0fc0..4e6f9181d 100755
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
index fa0d532f4..ec89756bb 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/piklab/debian/patches/.gitignore b/ubuntu/maverick/applications/gwenview-i18n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/piklab/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/gwenview-i18n/debian/patches/series
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/rules b/ubuntu/maverick/applications/gwenview-i18n/debian/rules
index 02b4fd146..05b674469 100755
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/rosegarden/debian/patches/.gitignore b/ubuntu/maverick/applications/gwenview/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/gwenview/debian/patches/series
diff --git a/ubuntu/maverick/applications/gwenview/debian/rules b/ubuntu/maverick/applications/gwenview/debian/rules
index b6b642662..11548ae60 100755
--- a/ubuntu/maverick/applications/gwenview/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/k3b/debian/rules b/ubuntu/maverick/applications/k3b/debian/rules
index db76176bd..f4f5b0012 100755
--- a/ubuntu/maverick/applications/k3b/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/wlassistant/debian/patches/.gitignore b/ubuntu/maverick/applications/k9copy/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/k9copy/debian/patches/series
diff --git a/ubuntu/maverick/applications/k9copy/debian/rules b/ubuntu/maverick/applications/k9copy/debian/rules
index 46d6822df..6761a0c33 100755
--- a/ubuntu/maverick/applications/k9copy/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdegraphics/debian/patches/.gitignore b/ubuntu/maverick/applications/kaffeine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/kdegraphics/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kaffeine/debian/patches/series
diff --git a/ubuntu/maverick/applications/kaffeine/debian/rules b/ubuntu/maverick/applications/kaffeine/debian/rules
index fd4a2e53e..1add9ec5d 100755
--- a/ubuntu/maverick/applications/kaffeine/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdepim/debian/patches/.gitignore b/ubuntu/maverick/applications/katapult/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/kdepim/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/katapult/debian/patches/series
diff --git a/ubuntu/maverick/applications/katapult/debian/rules b/ubuntu/maverick/applications/katapult/debian/rules
index 642ce1550..da2411aad 100755
--- a/ubuntu/maverick/applications/katapult/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore b/ubuntu/maverick/applications/kbfx/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kbfx/debian/patches/series
diff --git a/ubuntu/maverick/applications/kbfx/debian/rules b/ubuntu/maverick/applications/kbfx/debian/rules
index ac0d219bc..e839edd42 100755
--- a/ubuntu/maverick/applications/kbfx/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kbiff/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbiff/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/kbiff/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/libraries/libkipi/debian/patches/.gitignore b/ubuntu/maverick/applications/kbookreader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kbookreader/debian/patches/series
diff --git a/ubuntu/maverick/applications/kbookreader/debian/rules b/ubuntu/maverick/applications/kbookreader/debian/rules
index 20b42f646..780803d59 100755
--- a/ubuntu/maverick/applications/kbookreader/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kde-guidance/debian/patches/series b/ubuntu/maverick/applications/kde-guidance/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/patches/series
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/rules b/ubuntu/maverick/applications/kde-guidance/debian/rules
index a3a9cae35..48e5e31d7 100755
--- a/ubuntu/maverick/applications/kde-guidance/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kde-style-qtcurve/debian/patches/series b/ubuntu/maverick/applications/kde-style-qtcurve/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-style-qtcurve/debian/patches/series
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/rules b/ubuntu/maverick/applications/kde-style-qtcurve/debian/rules
index ad341b5e0..52bf17ae4 100755
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kde-systemsettings/debian/patches/series b/ubuntu/maverick/applications/kde-systemsettings/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-systemsettings/debian/patches/series
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/rules b/ubuntu/maverick/applications/kde-systemsettings/debian/rules
index 6ba108e8a..e1f09b5cc 100755
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdesudo/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdesudo/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdesudo/debian/patches/series b/ubuntu/maverick/applications/kdesudo/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kdesudo/debian/patches/series
diff --git a/ubuntu/maverick/applications/kdesudo/debian/rules b/ubuntu/maverick/applications/kdesudo/debian/rules
index df41bc83d..f5cd38f63 100755
--- a/ubuntu/maverick/applications/kdesudo/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdesvn/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdesvn/debian/cdbs/debian-qt-kde.mk
index 856fa4932..1d366e492 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdesvn/debian/rules b/ubuntu/maverick/applications/kdesvn/debian/rules
index d85c8bf6a..74c5fe7ec 100755
--- a/ubuntu/maverick/applications/kdesvn/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdirstat/debian/control b/ubuntu/maverick/applications/kdirstat/debian/control
index 14cded95b..c094ac054 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/control
+++ b/ubuntu/maverick/applications/kdirstat/debian/control
@@ -2,7 +2,7 @@ Source: kdirstat-trinity
Section: misc
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.41), quilt, debhelper (>= 5), kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), quilt, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://kdirstat.sourceforge.net/
diff --git a/ubuntu/maverick/applications/kdirstat/debian/patches/series b/ubuntu/maverick/applications/kdirstat/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kdirstat/debian/patches/series
diff --git a/ubuntu/maverick/applications/kdirstat/debian/rules b/ubuntu/maverick/applications/kdirstat/debian/rules
index e05262ec0..1e16df51a 100755
--- a/ubuntu/maverick/applications/kdirstat/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdpkg/debian/patches/series b/ubuntu/maverick/applications/kdpkg/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kdpkg/debian/patches/series
diff --git a/ubuntu/maverick/applications/kdpkg/debian/rules b/ubuntu/maverick/applications/kdpkg/debian/rules
index d5ac50b42..8293bfe64 100755
--- a/ubuntu/maverick/applications/kdpkg/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/keep/debian/rules b/ubuntu/maverick/applications/keep/debian/rules
index 9e498f345..e2718e364 100755
--- a/ubuntu/maverick/applications/keep/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
index 189982f00..4ee3f268e 100644
--- a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
+++ b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
@@ -1,6 +1,7 @@
-diff -Nur kerry-0.2.1/kerry/src/Makefile.am kerry-0.2.1.new/kerry/src/Makefile.am
---- kerry-0.2.1/kerry/src/Makefile.am 2006-12-05 18:28:31.000000000 +0100
-+++ kerry-0.2.1.new/kerry/src/Makefile.am 2006-12-05 18:28:53.000000000 +0100
+Index: b/kerry/src/Makefile.am
+===================================================================
+--- a/kerry/src/Makefile.am
++++ b/kerry/src/Makefile.am
@@ -31,7 +31,7 @@
kerry_la_LIBADD = -lkio -lkonq $(LIB_KDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) -lDCOP $(LIB_QT) $(LIB_KDECORE)
diff --git a/ubuntu/maverick/applications/kerry/debian/rules b/ubuntu/maverick/applications/kerry/debian/rules
index f254c8044..d86250261 100755
--- a/ubuntu/maverick/applications/kerry/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kgtk-qt3/debian/patches/series b/ubuntu/maverick/applications/kgtk-qt3/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kgtk-qt3/debian/patches/series
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/rules b/ubuntu/maverick/applications/kgtk-qt3/debian/rules
index 7511e74b3..df246e2ae 100755
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kio-apt/debian/patches/series b/ubuntu/maverick/applications/kio-apt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kio-apt/debian/patches/series
diff --git a/ubuntu/maverick/applications/kio-apt/debian/rules b/ubuntu/maverick/applications/kio-apt/debian/rules
index f4c04e6ed..db5da700b 100755
--- a/ubuntu/maverick/applications/kio-apt/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kio-locate/debian/patches/series b/ubuntu/maverick/applications/kio-locate/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kio-locate/debian/patches/series
diff --git a/ubuntu/maverick/applications/kio-locate/debian/rules b/ubuntu/maverick/applications/kio-locate/debian/rules
index c75119f72..09b22dcb0 100755
--- a/ubuntu/maverick/applications/kio-locate/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kio-umountwrapper/debian/patches/series b/ubuntu/maverick/applications/kio-umountwrapper/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/patches/series
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules b/ubuntu/maverick/applications/kio-umountwrapper/debian/rules
index 24f8e63c2..5fd992d85 100755
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kiosktool/debian/rules b/ubuntu/maverick/applications/kiosktool/debian/rules
index bdce983e0..677edd830 100755
--- a/ubuntu/maverick/applications/kiosktool/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kmplayer/debian/patches/series b/ubuntu/maverick/applications/kmplayer/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kmplayer/debian/patches/series
diff --git a/ubuntu/maverick/applications/kmplayer/debian/rules b/ubuntu/maverick/applications/kmplayer/debian/rules
index 9384ba114..5327ea0ac 100755
--- a/ubuntu/maverick/applications/kmplayer/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kmymoney/debian/patches/series b/ubuntu/maverick/applications/kmymoney/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kmymoney/debian/patches/series
diff --git a/ubuntu/maverick/applications/kmymoney/debian/rules b/ubuntu/maverick/applications/kmymoney/debian/rules
index 9eb4ec3ad..31b6f6332 100755
--- a/ubuntu/maverick/applications/kmymoney/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/knemo/debian/patches/series b/ubuntu/maverick/applications/knemo/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/knemo/debian/patches/series
diff --git a/ubuntu/maverick/applications/knemo/debian/rules b/ubuntu/maverick/applications/knemo/debian/rules
index bb89aadc5..3b66fe478 100755
--- a/ubuntu/maverick/applications/knemo/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/knetstats/debian/patches/series b/ubuntu/maverick/applications/knetstats/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/knetstats/debian/patches/series
diff --git a/ubuntu/maverick/applications/knetstats/debian/rules b/ubuntu/maverick/applications/knetstats/debian/rules
index 1505e8e8e..a19b60c8d 100755
--- a/ubuntu/maverick/applications/knetstats/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/knetworkmanager.cmake/debian/rules b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/rules
index 5043dd652..4a5e56fb5 100755
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
index b93e7c154..a803f50d6 100644
--- a/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/koffice/debian/patches/series b/ubuntu/maverick/applications/koffice/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/koffice/debian/patches/series
diff --git a/ubuntu/maverick/applications/koffice/debian/rules b/ubuntu/maverick/applications/koffice/debian/rules
index a5825d047..372998f85 100755
--- a/ubuntu/maverick/applications/koffice/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kpowersave.cmake/debian/control b/ubuntu/maverick/applications/kpowersave.cmake/debian/control
index c30049699..7a4166104 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/control
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/series b/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/series
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/rules b/ubuntu/maverick/applications/kpowersave.cmake/debian/rules
index 0d2383bae..f84c79ba9 100755
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kpowersave/debian/patches/series b/ubuntu/maverick/applications/kpowersave/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave/debian/patches/series
diff --git a/ubuntu/maverick/applications/kpowersave/debian/rules b/ubuntu/maverick/applications/kpowersave/debian/rules
index 16dc75082..1575fca96 100755
--- a/ubuntu/maverick/applications/kpowersave/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/krename/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/krename/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/krename/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/krename/debian/patches/series b/ubuntu/maverick/applications/krename/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/krename/debian/patches/series
diff --git a/ubuntu/maverick/applications/krename/debian/rules b/ubuntu/maverick/applications/krename/debian/rules
index 0df91fd2c..404787210 100755
--- a/ubuntu/maverick/applications/krename/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/krusader/debian/patches/series b/ubuntu/maverick/applications/krusader/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/krusader/debian/patches/series
diff --git a/ubuntu/maverick/applications/krusader/debian/rules b/ubuntu/maverick/applications/krusader/debian/rules
index 3095cca3c..eb772b614 100755
--- a/ubuntu/maverick/applications/krusader/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/ksystemlog/debian/patches/series b/ubuntu/maverick/applications/ksystemlog/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/ksystemlog/debian/patches/series
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/rules b/ubuntu/maverick/applications/ksystemlog/debian/rules
index 6e41ea3f6..2ba30f9a0 100755
--- a/ubuntu/maverick/applications/ksystemlog/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index b93e7c154..a803f50d6 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/ktorrent/debian/patches/series b/ubuntu/maverick/applications/ktorrent/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/ktorrent/debian/patches/series
diff --git a/ubuntu/maverick/applications/ktorrent/debian/rules b/ubuntu/maverick/applications/ktorrent/debian/rules
index 191e61381..df3bef893 100755
--- a/ubuntu/maverick/applications/ktorrent/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kuickshow/debian/patches/series b/ubuntu/maverick/applications/kuickshow/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kuickshow/debian/patches/series
diff --git a/ubuntu/maverick/applications/kuickshow/debian/rules b/ubuntu/maverick/applications/kuickshow/debian/rules
index c8061ea29..e8c53e5db 100755
--- a/ubuntu/maverick/applications/kuickshow/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kvirc/debian/patches/series b/ubuntu/maverick/applications/kvirc/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kvirc/debian/patches/series
diff --git a/ubuntu/maverick/applications/kvirc/debian/rules b/ubuntu/maverick/applications/kvirc/debian/rules
index 96984bd79..3a8490e65 100755
--- a/ubuntu/maverick/applications/kvirc/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kwin-style-crystal/debian/patches/series b/ubuntu/maverick/applications/kwin-style-crystal/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kwin-style-crystal/debian/patches/series
diff --git a/ubuntu/maverick/applications/kwin-style-crystal/debian/rules b/ubuntu/maverick/applications/kwin-style-crystal/debian/rules
index 6e735f5dc..2546c8657 100755
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/piklab/debian/control b/ubuntu/maverick/applications/piklab/debian/control
index e2a7e9628..5b3665b73 100644
--- a/ubuntu/maverick/applications/piklab/debian/control
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/piklab/debian/patches/series b/ubuntu/maverick/applications/piklab/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/piklab/debian/patches/series
diff --git a/ubuntu/maverick/applications/piklab/debian/rules b/ubuntu/maverick/applications/piklab/debian/rules
index 5edcb99ef..416588f8a 100755
--- a/ubuntu/maverick/applications/piklab/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
index 856fa4932..1d366e492 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/rosegarden/debian/control b/ubuntu/maverick/applications/rosegarden/debian/control
index 47838a22e..1aa4b4543 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/control
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/rosegarden/debian/patches/series b/ubuntu/maverick/applications/rosegarden/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/rosegarden/debian/patches/series
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rules b/ubuntu/maverick/applications/rosegarden/debian/rules
index d554585f6..03a24f92b 100755
--- a/ubuntu/maverick/applications/rosegarden/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/wlassistant/debian/patches/series b/ubuntu/maverick/applications/wlassistant/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/wlassistant/debian/patches/series
diff --git a/ubuntu/maverick/applications/wlassistant/debian/rules b/ubuntu/maverick/applications/wlassistant/debian/rules
index f9260b34c..13db5ab65 100755
--- a/ubuntu/maverick/applications/wlassistant/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/dependencies/arts/debian/rules b/ubuntu/maverick/dependencies/arts/debian/rules
index 9c6b3f289..2e7e5c14f 100755
--- a/ubuntu/maverick/dependencies/arts/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules
index 6a0f5bbed..ffe1bf6e7 100755
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series b/ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules b/ubuntu/maverick/dependencies/dbus-tqt/debian/rules
index 3edd7c59c..71f625c30 100755
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/dependencies/qt3/debian/control b/ubuntu/maverick/dependencies/qt3/debian/control
index 6095ea953..d6215cbc3 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/control
+++ b/ubuntu/maverick/dependencies/qt3/debian/control
@@ -2,7 +2,7 @@ Source: qt-x11-free
Maintainer: Kubuntu 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/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules
index 09124ab8b..1b4954261 100755
--- a/ubuntu/maverick/dependencies/qt3/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/dependencies/tqtinterface/debian/patches/series b/ubuntu/maverick/dependencies/tqtinterface/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/rules b/ubuntu/maverick/dependencies/tqtinterface/debian/rules
index ed3f07a6d..464100180 100755
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdeaccessibility/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdeaccessibility/debian/rules b/ubuntu/maverick/kdeaccessibility/debian/rules
index 3cdcff750..40438cdd6 100755
--- a/ubuntu/maverick/kdeaccessibility/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdeaddons/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdeaddons/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/kdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdeaddons/debian/rules b/ubuntu/maverick/kdeaddons/debian/rules
index 27866a5e6..7c1c683e5 100755
--- a/ubuntu/maverick/kdeaddons/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdeadmin/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdeadmin/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/kdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdeadmin/debian/rules b/ubuntu/maverick/kdeadmin/debian/rules
index 52fa58219..9a3c17683 100755
--- a/ubuntu/maverick/kdeadmin/debian/rules
+++ b/ubuntu/maverick/kdeadmin/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/ubuntu/maverick/kdeartwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdeartwork/debian/cdbs/debian-qt-kde.mk
index 497be9751..425264528 100644
--- a/ubuntu/maverick/kdeartwork/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdeartwork/debian/rules b/ubuntu/maverick/kdeartwork/debian/rules
index 150859d96..3c40130e7 100755
--- a/ubuntu/maverick/kdeartwork/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdebase/debian/cdbs/debian-qt-kde.mk
index fa0d532f4..ec89756bb 100644
--- a/ubuntu/maverick/kdebase/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff b/ubuntu/maverick/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
index f9c8e628c..a82001d03 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
+++ b/ubuntu/maverick/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
@@ -1,7 +1,9 @@
---- kdebase/konsole/konsolesu.desktop
-+++ kdebase/konsole/konsolesu.desktop
-@@ -81,3 +81,4 @@
- Name[zh_TW]=終端機程式 - 超級使用者模式
+Index: b/konsole/konsolesu.desktop
+===================================================================
+--- a/konsole/konsolesu.desktop
++++ b/konsole/konsolesu.desktop
+@@ -82,3 +82,4 @@
+ GenericName[zh_TW]=終端機程式 - 超級使用者模式
X-KDE-AuthorizeAction=shell_access
Categories=Qt;KDE;X-KDE-System-su;
+NoDisplay=true
diff --git a/ubuntu/maverick/kdebase/debian/rules b/ubuntu/maverick/kdebase/debian/rules
index 839ab4439..aef6791dc 100755
--- a/ubuntu/maverick/kdebase/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebindings/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdebindings/debian/cdbs/debian-qt-kde.mk
index 2a219d60a..1e862f623 100644
--- a/ubuntu/maverick/kdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdeedu/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdeedu/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/kdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdeedu/debian/rules b/ubuntu/maverick/kdeedu/debian/rules
index acf638002..cb62b898c 100755
--- a/ubuntu/maverick/kdeedu/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdegames/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdegames/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/kdegames/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdegames/debian/rules b/ubuntu/maverick/kdegames/debian/rules
index 96f768ec9..d63ea6d30 100755
--- a/ubuntu/maverick/kdegames/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
index df08f2d37..7c7e6d56c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdegraphics.automake/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/ubuntu/maverick/kdegraphics.automake/debian/control b/ubuntu/maverick/kdegraphics.automake/debian/control
index 79c0ed074..0d54be8a7 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/control
+++ b/ubuntu/maverick/kdegraphics.automake/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], automake, autoconf, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdegraphics-trinity
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/patches/series b/ubuntu/maverick/kdegraphics.automake/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/kdegraphics.automake/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/rules b/ubuntu/maverick/kdegraphics.automake/debian/rules
index dc67d38f0..0f73112ef 100755
--- a/ubuntu/maverick/kdegraphics.automake/debian/rules
+++ b/ubuntu/maverick/kdegraphics.automake/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/ubuntu/maverick/kdegraphics/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdegraphics/debian/cdbs/debian-qt-kde.mk
index df08f2d37..7c7e6d56c 100644
--- a/ubuntu/maverick/kdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdegraphics/debian/rules b/ubuntu/maverick/kdegraphics/debian/rules
index ab2877e0c..3a69a6d97 100755
--- a/ubuntu/maverick/kdegraphics/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdelibs/debian/rules b/ubuntu/maverick/kdelibs/debian/rules
index 71f4bb879..394c28a97 100755
--- a/ubuntu/maverick/kdelibs/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdemultimedia/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdemultimedia/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/kdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdemultimedia/debian/rules b/ubuntu/maverick/kdemultimedia/debian/rules
index 178e42e96..c7bbdcd71 100755
--- a/ubuntu/maverick/kdemultimedia/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdenetwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdenetwork/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/ubuntu/maverick/kdenetwork/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdenetwork/debian/rules b/ubuntu/maverick/kdenetwork/debian/rules
index 169b64e66..101d91a2c 100755
--- a/ubuntu/maverick/kdenetwork/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk
index fa0d532f4..ec89756bb 100644
--- a/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdepim/debian/patches/series b/ubuntu/maverick/kdepim/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/kdepim/debian/patches/series
diff --git a/ubuntu/maverick/kdepim/debian/rules b/ubuntu/maverick/kdepim/debian/rules
index 4c8d36cb3..23a00eba7 100755
--- a/ubuntu/maverick/kdepim/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdesdk/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdesdk/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/ubuntu/maverick/kdesdk/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdesdk/debian/rules b/ubuntu/maverick/kdesdk/debian/rules
index f85a4bf86..b382ba355 100755
--- a/ubuntu/maverick/kdesdk/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdetoys/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdetoys/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/ubuntu/maverick/kdetoys/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdetoys/debian/rules b/ubuntu/maverick/kdetoys/debian/rules
index dc7b40efd..96f3778ee 100755
--- a/ubuntu/maverick/kdetoys/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdeutils/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdeutils/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/ubuntu/maverick/kdeutils/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdeutils/debian/rules b/ubuntu/maverick/kdeutils/debian/rules
index 9cae10e9b..cdb529f2e 100755
--- a/ubuntu/maverick/kdeutils/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdevelop.cmake/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/ubuntu/maverick/kdevelop.cmake/debian/control b/ubuntu/maverick/kdevelop.cmake/debian/control
index fe8eec312..306735c66 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/control
+++ b/ubuntu/maverick/kdevelop.cmake/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), qt3-apps-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, qt3-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, cmake, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), quilt, qt3-apps-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, qt3-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, cmake, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdevelop-trinity
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/patches/series b/ubuntu/maverick/kdevelop.cmake/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/kdevelop.cmake/debian/patches/series
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/rules b/ubuntu/maverick/kdevelop.cmake/debian/rules
index 0bf8bfe14..11117a1b3 100755
--- a/ubuntu/maverick/kdevelop.cmake/debian/rules
+++ b/ubuntu/maverick/kdevelop.cmake/debian/rules
@@ -6,7 +6,7 @@ makebuilddir::
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/ubuntu/maverick/kdevelop/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdevelop/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/ubuntu/maverick/kdevelop/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdevelop/debian/rules b/ubuntu/maverick/kdevelop/debian/rules
index 6c70c4b46..2e5fb0268 100755
--- a/ubuntu/maverick/kdevelop/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdewebdev/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdewebdev/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/kdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdewebdev/debian/rules b/ubuntu/maverick/kdewebdev/debian/rules
index 7c1c6306f..9cbfc111e 100755
--- a/ubuntu/maverick/kdewebdev/debian/rules
+++ b/ubuntu/maverick/kdewebdev/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/libraries/libkipi/debian/patches/series b/ubuntu/maverick/libraries/libkipi/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/libraries/libkipi/debian/patches/series
diff --git a/ubuntu/maverick/libraries/libkipi/debian/rules b/ubuntu/maverick/libraries/libkipi/debian/rules
index 3eccc3266..ee0b9c258 100755
--- a/ubuntu/maverick/libraries/libkipi/debian/rules
+++ b/ubuntu/maverick/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