From f025c10ab2c705f3b86669b3dae1817c0cdd6d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 15 Sep 2013 20:29:47 +0200 Subject: Switch patch system from simple to quilt on Debian and Ubuntu (cherry picked from commit f24915471ea396c53670df51b2affc4af74373bf) --- .../maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/abakus/debian/patches/series | 0 ubuntu/maverick/applications/abakus/debian/rules | 2 +- .../maverick/applications/adept/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/adept/debian/patches/.gitignore | 0 ubuntu/maverick/applications/adept/debian/patches/series | 0 ubuntu/maverick/applications/adept/debian/rules | 2 +- .../applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/amarok.cmake/debian/rules | 2 +- .../maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/basket/debian/control | 2 +- ubuntu/maverick/applications/basket/debian/rules | 6 +++--- .../applications/bibletime/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/bibletime/debian/patches/.gitignore | 0 ubuntu/maverick/applications/bibletime/debian/patches/series | 0 ubuntu/maverick/applications/bibletime/debian/rules | 2 +- .../compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk | 2 ++ .../compizconfig-backend-kconfig/debian/patches/.gitignore | 0 .../compizconfig-backend-kconfig/debian/patches/series | 0 .../applications/compizconfig-backend-kconfig/debian/rules | 2 +- .../maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/digikam/debian/patches/.gitignore | 0 ubuntu/maverick/applications/digikam/debian/patches/series | 0 ubuntu/maverick/applications/digikam/debian/rules | 2 +- .../maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/dolphin/debian/patches/.gitignore | 0 ubuntu/maverick/applications/dolphin/debian/patches/series | 0 ubuntu/maverick/applications/dolphin/debian/rules | 2 +- .../applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/filelight-l10n/debian/control | 2 +- .../maverick/applications/filelight-l10n/debian/patches/series | 0 ubuntu/maverick/applications/filelight-l10n/debian/rules | 2 +- .../applications/filelight/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/fusion-icon/debian/patches/.gitignore | 0 ubuntu/maverick/applications/fusion-icon/debian/patches/series | 0 ubuntu/maverick/applications/fusion-icon/debian/rules | 2 +- .../applications/gtk-qt-engine/debian/patches/.gitignore | 0 .../maverick/applications/gtk-qt-engine/debian/patches/series | 0 ubuntu/maverick/applications/gtk-qt-engine/debian/rules | 2 +- .../applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/gwenview-i18n/debian/patches/series | 0 ubuntu/maverick/applications/gwenview-i18n/debian/rules | 2 +- .../applications/gwenview/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/gwenview/debian/patches/.gitignore | 0 ubuntu/maverick/applications/gwenview/debian/patches/series | 0 ubuntu/maverick/applications/gwenview/debian/rules | 2 +- ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/k3b/debian/rules | 2 +- .../maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/k9copy/debian/patches/.gitignore | 0 ubuntu/maverick/applications/k9copy/debian/patches/series | 0 ubuntu/maverick/applications/k9copy/debian/rules | 2 +- .../applications/kaffeine/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/kaffeine/debian/patches/.gitignore | 0 ubuntu/maverick/applications/kaffeine/debian/patches/series | 0 ubuntu/maverick/applications/kaffeine/debian/rules | 2 +- .../applications/katapult/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/katapult/debian/patches/.gitignore | 0 ubuntu/maverick/applications/katapult/debian/patches/series | 0 ubuntu/maverick/applications/katapult/debian/rules | 2 +- .../applications/kbarcode/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kbfx/debian/patches/.gitignore | 0 ubuntu/maverick/applications/kbfx/debian/patches/series | 0 ubuntu/maverick/applications/kbfx/debian/rules | 2 +- .../maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/kbiff/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/kbookreader/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/kbookreader/debian/patches/.gitignore | 0 ubuntu/maverick/applications/kbookreader/debian/patches/series | 0 ubuntu/maverick/applications/kbookreader/debian/rules | 2 +- .../applications/kcpuload/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk | 2 ++ .../kdbusnotification/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/kde-guidance/debian/patches/.gitignore | 0 .../maverick/applications/kde-guidance/debian/patches/series | 0 ubuntu/maverick/applications/kde-guidance/debian/rules | 2 +- .../kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/kde-style-qtcurve/debian/patches/.gitignore | 0 .../applications/kde-style-qtcurve/debian/patches/series | 0 ubuntu/maverick/applications/kde-style-qtcurve/debian/rules | 2 +- .../kde-systemsettings/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/kde-systemsettings/debian/patches/.gitignore | 0 .../applications/kde-systemsettings/debian/patches/series | 0 ubuntu/maverick/applications/kde-systemsettings/debian/rules | 2 +- .../maverick/applications/kdesudo/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kdesudo/debian/patches/.gitignore | 0 ubuntu/maverick/applications/kdesudo/debian/patches/series | 0 ubuntu/maverick/applications/kdesudo/debian/rules | 2 +- .../maverick/applications/kdesvn/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kdesvn/debian/rules | 2 +- .../maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/kdirstat/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kdirstat/debian/control | 2 +- .../maverick/applications/kdirstat/debian/patches/.gitignore | 0 ubuntu/maverick/applications/kdirstat/debian/patches/series | 0 ubuntu/maverick/applications/kdirstat/debian/rules | 2 +- .../applications/kdmtheme/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kdpkg/debian/patches/.gitignore | 0 ubuntu/maverick/applications/kdpkg/debian/patches/series | 0 ubuntu/maverick/applications/kdpkg/debian/rules | 2 +- ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/keep/debian/rules | 2 +- .../maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk | 2 ++ .../kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch | 7 ++++--- ubuntu/maverick/applications/kerry/debian/rules | 2 +- .../applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kgtk-qt3/debian/patches/series | 0 ubuntu/maverick/applications/kgtk-qt3/debian/rules | 2 +- ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kio-apt/debian/patches/.gitignore | 0 ubuntu/maverick/applications/kio-apt/debian/patches/series | 0 ubuntu/maverick/applications/kio-apt/debian/rules | 2 +- .../applications/kio-locate/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kio-locate/debian/patches/series | 0 ubuntu/maverick/applications/kio-locate/debian/rules | 2 +- .../kio-umountwrapper/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/kio-umountwrapper/debian/patches/.gitignore | 0 .../applications/kio-umountwrapper/debian/patches/series | 0 ubuntu/maverick/applications/kio-umountwrapper/debian/rules | 2 +- .../applications/kiosktool/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kiosktool/debian/rules | 2 +- .../applications/kmplayer/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/kmplayer/debian/patches/.gitignore | 0 ubuntu/maverick/applications/kmplayer/debian/patches/series | 0 ubuntu/maverick/applications/kmplayer/debian/rules | 2 +- .../applications/kmymoney/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kmymoney/debian/patches/series | 0 ubuntu/maverick/applications/kmymoney/debian/rules | 2 +- .../maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/knemo/debian/patches/.gitignore | 0 ubuntu/maverick/applications/knemo/debian/patches/series | 0 ubuntu/maverick/applications/knemo/debian/rules | 2 +- .../applications/knetstats/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/knetstats/debian/patches/.gitignore | 0 ubuntu/maverick/applications/knetstats/debian/patches/series | 0 ubuntu/maverick/applications/knetstats/debian/rules | 2 +- .../knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/knetworkmanager.cmake/debian/rules | 2 +- .../applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/koffice/debian/patches/.gitignore | 0 ubuntu/maverick/applications/koffice/debian/patches/series | 0 ubuntu/maverick/applications/koffice/debian/rules | 2 +- .../applications/konversation/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/kopete-otr/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kpowersave.cmake/debian/control | 2 +- .../applications/kpowersave.cmake/debian/patches/.gitignore | 0 .../applications/kpowersave.cmake/debian/patches/series | 0 ubuntu/maverick/applications/kpowersave.cmake/debian/rules | 2 +- .../applications/kpowersave/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/kpowersave/debian/patches/.gitignore | 0 ubuntu/maverick/applications/kpowersave/debian/patches/series | 0 ubuntu/maverick/applications/kpowersave/debian/rules | 2 +- .../maverick/applications/krename/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/krename/debian/patches/series | 0 ubuntu/maverick/applications/krename/debian/rules | 2 +- .../applications/krusader/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/krusader/debian/patches/.gitignore | 0 ubuntu/maverick/applications/krusader/debian/patches/series | 0 ubuntu/maverick/applications/krusader/debian/rules | 2 +- .../applications/ksystemlog/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/ksystemlog/debian/patches/.gitignore | 0 ubuntu/maverick/applications/ksystemlog/debian/patches/series | 0 ubuntu/maverick/applications/ksystemlog/debian/rules | 2 +- .../applications/ktorrent/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/applications/ktorrent/debian/patches/.gitignore | 0 ubuntu/maverick/applications/ktorrent/debian/patches/series | 0 ubuntu/maverick/applications/ktorrent/debian/rules | 2 +- .../applications/kuickshow/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kuickshow/debian/patches/series | 0 ubuntu/maverick/applications/kuickshow/debian/rules | 2 +- ubuntu/maverick/applications/kvirc/debian/patches/.gitignore | 0 ubuntu/maverick/applications/kvirc/debian/patches/series | 0 ubuntu/maverick/applications/kvirc/debian/rules | 2 +- .../kwin-style-crystal/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/kwin-style-crystal/debian/patches/.gitignore | 0 .../applications/kwin-style-crystal/debian/patches/series | 0 ubuntu/maverick/applications/kwin-style-crystal/debian/rules | 2 +- ubuntu/maverick/applications/piklab/debian/control | 2 +- ubuntu/maverick/applications/piklab/debian/patches/.gitignore | 0 ubuntu/maverick/applications/piklab/debian/patches/series | 0 ubuntu/maverick/applications/piklab/debian/rules | 9 ++++----- .../applications/rosegarden/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/rosegarden/debian/control | 2 +- .../maverick/applications/rosegarden/debian/patches/.gitignore | 0 ubuntu/maverick/applications/rosegarden/debian/patches/series | 0 ubuntu/maverick/applications/rosegarden/debian/rules | 2 +- .../maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/soundkonverter/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/wlassistant/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/wlassistant/debian/patches/.gitignore | 0 ubuntu/maverick/applications/wlassistant/debian/patches/series | 0 ubuntu/maverick/applications/wlassistant/debian/rules | 2 +- .../maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/dependencies/arts/debian/rules | 2 +- ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series | 0 ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules | 2 +- ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series | 0 ubuntu/maverick/dependencies/dbus-tqt/debian/rules | 2 +- ubuntu/maverick/dependencies/qt3/debian/control | 2 +- ubuntu/maverick/dependencies/qt3/debian/rules | 8 ++++---- .../maverick/dependencies/tqtinterface/debian/patches/series | 0 ubuntu/maverick/dependencies/tqtinterface/debian/rules | 2 +- ubuntu/maverick/kdeaccessibility/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdeaccessibility/debian/rules | 2 +- ubuntu/maverick/kdeaddons/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdeaddons/debian/rules | 2 +- ubuntu/maverick/kdeadmin/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdeadmin/debian/rules | 2 +- ubuntu/maverick/kdeartwork/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdeartwork/debian/rules | 2 +- ubuntu/maverick/kdebase/debian/cdbs/debian-qt-kde.mk | 2 ++ .../debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff | 10 ++++++---- ubuntu/maverick/kdebase/debian/rules | 2 +- ubuntu/maverick/kdebindings/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdeedu/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdeedu/debian/rules | 2 +- ubuntu/maverick/kdegames/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdegames/debian/rules | 2 +- .../maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdegraphics.automake/debian/control | 2 +- ubuntu/maverick/kdegraphics.automake/debian/patches/series | 3 +++ ubuntu/maverick/kdegraphics.automake/debian/rules | 2 +- ubuntu/maverick/kdegraphics/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdegraphics/debian/patches/.gitignore | 0 ubuntu/maverick/kdegraphics/debian/rules | 2 +- ubuntu/maverick/kdelibs/debian/rules | 2 +- ubuntu/maverick/kdemultimedia/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdemultimedia/debian/rules | 2 +- ubuntu/maverick/kdenetwork/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdenetwork/debian/rules | 2 +- ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdepim/debian/patches/.gitignore | 0 ubuntu/maverick/kdepim/debian/patches/series | 0 ubuntu/maverick/kdepim/debian/rules | 2 +- ubuntu/maverick/kdesdk/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdesdk/debian/rules | 2 +- ubuntu/maverick/kdetoys/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdetoys/debian/rules | 2 +- ubuntu/maverick/kdeutils/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdeutils/debian/rules | 2 +- ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdevelop.cmake/debian/control | 2 +- ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore | 0 ubuntu/maverick/kdevelop.cmake/debian/patches/series | 0 ubuntu/maverick/kdevelop.cmake/debian/rules | 2 +- ubuntu/maverick/kdevelop/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdevelop/debian/rules | 2 +- ubuntu/maverick/kdewebdev/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdewebdev/debian/rules | 2 +- .../libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk | 2 ++ .../maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/libraries/libkipi/debian/patches/.gitignore | 0 ubuntu/maverick/libraries/libkipi/debian/patches/series | 0 ubuntu/maverick/libraries/libkipi/debian/rules | 2 +- 260 files changed, 274 insertions(+), 101 deletions(-) create mode 100644 ubuntu/maverick/applications/abakus/debian/patches/series delete mode 100644 ubuntu/maverick/applications/adept/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/adept/debian/patches/series delete mode 100644 ubuntu/maverick/applications/bibletime/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/bibletime/debian/patches/series delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/series delete mode 100644 ubuntu/maverick/applications/digikam/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/digikam/debian/patches/series delete mode 100644 ubuntu/maverick/applications/dolphin/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/dolphin/debian/patches/series create mode 100644 ubuntu/maverick/applications/filelight-l10n/debian/patches/series delete mode 100644 ubuntu/maverick/applications/fusion-icon/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/fusion-icon/debian/patches/series delete mode 100644 ubuntu/maverick/applications/gtk-qt-engine/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/gtk-qt-engine/debian/patches/series create mode 100644 ubuntu/maverick/applications/gwenview-i18n/debian/patches/series delete mode 100644 ubuntu/maverick/applications/gwenview/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/gwenview/debian/patches/series delete mode 100644 ubuntu/maverick/applications/k9copy/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/k9copy/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kaffeine/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kaffeine/debian/patches/series delete mode 100644 ubuntu/maverick/applications/katapult/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/katapult/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kbfx/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kbfx/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kbookreader/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kbookreader/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kde-guidance/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kde-guidance/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kde-style-qtcurve/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kde-style-qtcurve/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kde-systemsettings/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kde-systemsettings/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kdesudo/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kdesudo/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kdirstat/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kdirstat/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kdpkg/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kdpkg/debian/patches/series create mode 100644 ubuntu/maverick/applications/kgtk-qt3/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kio-apt/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kio-apt/debian/patches/series create mode 100644 ubuntu/maverick/applications/kio-locate/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kio-umountwrapper/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kio-umountwrapper/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kmplayer/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kmplayer/debian/patches/series create mode 100644 ubuntu/maverick/applications/kmymoney/debian/patches/series delete mode 100644 ubuntu/maverick/applications/knemo/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/knemo/debian/patches/series delete mode 100644 ubuntu/maverick/applications/knetstats/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/knetstats/debian/patches/series delete mode 100644 ubuntu/maverick/applications/koffice/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/koffice/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kpowersave.cmake/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kpowersave.cmake/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kpowersave/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kpowersave/debian/patches/series create mode 100644 ubuntu/maverick/applications/krename/debian/patches/series delete mode 100644 ubuntu/maverick/applications/krusader/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/krusader/debian/patches/series delete mode 100644 ubuntu/maverick/applications/ksystemlog/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/ksystemlog/debian/patches/series delete mode 100644 ubuntu/maverick/applications/ktorrent/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/ktorrent/debian/patches/series create mode 100644 ubuntu/maverick/applications/kuickshow/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kvirc/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kvirc/debian/patches/series delete mode 100644 ubuntu/maverick/applications/kwin-style-crystal/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/kwin-style-crystal/debian/patches/series delete mode 100644 ubuntu/maverick/applications/piklab/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/piklab/debian/patches/series delete mode 100644 ubuntu/maverick/applications/rosegarden/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/rosegarden/debian/patches/series delete mode 100644 ubuntu/maverick/applications/wlassistant/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/wlassistant/debian/patches/series create mode 100644 ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series create mode 100644 ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series create mode 100644 ubuntu/maverick/dependencies/tqtinterface/debian/patches/series create mode 100644 ubuntu/maverick/kdegraphics.automake/debian/patches/series delete mode 100644 ubuntu/maverick/kdegraphics/debian/patches/.gitignore delete mode 100644 ubuntu/maverick/kdepim/debian/patches/.gitignore create mode 100644 ubuntu/maverick/kdepim/debian/patches/series delete mode 100644 ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore create mode 100644 ubuntu/maverick/kdevelop.cmake/debian/patches/series delete mode 100644 ubuntu/maverick/libraries/libkipi/debian/patches/.gitignore create mode 100644 ubuntu/maverick/libraries/libkipi/debian/patches/series (limited to 'ubuntu') 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/abakus/debian/patches/series b/ubuntu/maverick/applications/abakus/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/adept/debian/patches/.gitignore b/ubuntu/maverick/applications/adept/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/adept/debian/patches/series b/ubuntu/maverick/applications/adept/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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 XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Ana Beatriz Guerrero Lopez , Sune Vuorela -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/bibletime/debian/patches/.gitignore b/ubuntu/maverick/applications/bibletime/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/bibletime/debian/patches/series b/ubuntu/maverick/applications/bibletime/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/compizconfig-backend-kconfig/debian/patches/.gitignore b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/series b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/digikam/debian/patches/.gitignore b/ubuntu/maverick/applications/digikam/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/digikam/debian/patches/series b/ubuntu/maverick/applications/digikam/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/dolphin/debian/patches/.gitignore b/ubuntu/maverick/applications/dolphin/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/dolphin/debian/patches/series b/ubuntu/maverick/applications/dolphin/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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 Uploaders: Ral Snchez Siles -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/filelight-l10n/debian/patches/series b/ubuntu/maverick/applications/filelight-l10n/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/fusion-icon/debian/patches/.gitignore b/ubuntu/maverick/applications/fusion-icon/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/fusion-icon/debian/patches/series b/ubuntu/maverick/applications/fusion-icon/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/gtk-qt-engine/debian/patches/.gitignore b/ubuntu/maverick/applications/gtk-qt-engine/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/patches/series b/ubuntu/maverick/applications/gtk-qt-engine/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/gwenview-i18n/debian/patches/series b/ubuntu/maverick/applications/gwenview-i18n/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/gwenview/debian/patches/.gitignore b/ubuntu/maverick/applications/gwenview/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/gwenview/debian/patches/series b/ubuntu/maverick/applications/gwenview/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/k9copy/debian/patches/.gitignore b/ubuntu/maverick/applications/k9copy/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/k9copy/debian/patches/series b/ubuntu/maverick/applications/k9copy/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/applications/kaffeine/debian/patches/.gitignore b/ubuntu/maverick/applications/kaffeine/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/kaffeine/debian/patches/series b/ubuntu/maverick/applications/kaffeine/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/applications/katapult/debian/patches/.gitignore b/ubuntu/maverick/applications/katapult/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/katapult/debian/patches/series b/ubuntu/maverick/applications/katapult/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/applications/kbfx/debian/patches/.gitignore b/ubuntu/maverick/applications/kbfx/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/kbfx/debian/patches/series b/ubuntu/maverick/applications/kbfx/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/applications/kbookreader/debian/patches/.gitignore b/ubuntu/maverick/applications/kbookreader/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/kbookreader/debian/patches/series b/ubuntu/maverick/applications/kbookreader/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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/.gitignore b/ubuntu/maverick/applications/kde-guidance/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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/.gitignore b/ubuntu/maverick/applications/kde-style-qtcurve/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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/.gitignore b/ubuntu/maverick/applications/kde-systemsettings/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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/.gitignore b/ubuntu/maverick/applications/kdesudo/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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 -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/.gitignore b/ubuntu/maverick/applications/kdirstat/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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/.gitignore b/ubuntu/maverick/applications/kdpkg/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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 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/.gitignore b/ubuntu/maverick/applications/kio-apt/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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 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/.gitignore b/ubuntu/maverick/applications/kio-umountwrapper/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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/.gitignore b/ubuntu/maverick/applications/kmplayer/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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 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/.gitignore b/ubuntu/maverick/applications/knemo/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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/.gitignore b/ubuntu/maverick/applications/knetstats/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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/.gitignore b/ubuntu/maverick/applications/koffice/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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 XSBC-Original-Maintainer: Michael Biebl -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/.gitignore b/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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/.gitignore b/ubuntu/maverick/applications/kpowersave/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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 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/.gitignore b/ubuntu/maverick/applications/krusader/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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/.gitignore b/ubuntu/maverick/applications/ksystemlog/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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/.gitignore b/ubuntu/maverick/applications/ktorrent/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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 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/.gitignore b/ubuntu/maverick/applications/kvirc/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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/.gitignore b/ubuntu/maverick/applications/kwin-style-crystal/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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 -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/.gitignore b/ubuntu/maverick/applications/piklab/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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 XSBC-Original-Maintainer: Debian Multimedia Team Uploaders: Mike O'Connor , Free Ekanayaka -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/.gitignore b/ubuntu/maverick/applications/rosegarden/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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/.gitignore b/ubuntu/maverick/applications/wlassistant/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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 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 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 # Copyright 2006 Sjoerd Simons -#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 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Sune Vuorela , Fathi Boudra , Modestas Vainius -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 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 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Francesco Pedrini , Josh Metzler , Sune Vuorela -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/patches/.gitignore b/ubuntu/maverick/kdegraphics/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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/.gitignore b/ubuntu/maverick/kdepim/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/kdepim/debian/patches/series b/ubuntu/maverick/kdepim/debian/patches/series new file mode 100644 index 000000000..e69de29bb 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 XSBC-Original-Maintainer: Jeremy Lain -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/.gitignore b/ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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/.gitignore b/ubuntu/maverick/libraries/libkipi/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 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 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 -- cgit v1.2.3