From f24915471ea396c53670df51b2affc4af74373bf 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 --- debian/wheezy/applications/abakus/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/abakus/debian/control | 2 +- debian/wheezy/applications/abakus/debian/patches/series | 0 debian/wheezy/applications/abakus/debian/rules | 2 +- debian/wheezy/applications/adept/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/adept/debian/control | 2 +- debian/wheezy/applications/adept/debian/patches/.gitignore | 0 debian/wheezy/applications/adept/debian/patches/series | 1 + debian/wheezy/applications/adept/debian/rules | 2 +- .../applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/amarok.cmake/debian/rules | 2 +- debian/wheezy/applications/amarok/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/basket/debian/control | 2 +- debian/wheezy/applications/basket/debian/rules | 6 +++--- .../wheezy/applications/bibletime/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/bibletime/debian/patches/.gitignore | 0 debian/wheezy/applications/bibletime/debian/patches/series | 0 debian/wheezy/applications/bibletime/debian/rules | 2 +- .../compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/compizconfig-backend-tdeconfig/debian/control | 2 +- .../compizconfig-backend-tdeconfig/debian/patches/.gitignore | 0 .../compizconfig-backend-tdeconfig/debian/patches/series | 0 .../applications/compizconfig-backend-tdeconfig/debian/rules | 2 +- debian/wheezy/applications/digikam/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/digikam/debian/control | 2 +- debian/wheezy/applications/digikam/debian/patches/.gitignore | 0 debian/wheezy/applications/digikam/debian/patches/series | 0 debian/wheezy/applications/digikam/debian/rules | 2 +- debian/wheezy/applications/dolphin/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/dolphin/debian/control | 2 +- debian/wheezy/applications/dolphin/debian/patches/.gitignore | 0 debian/wheezy/applications/dolphin/debian/patches/series | 0 debian/wheezy/applications/dolphin/debian/rules | 2 +- .../applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/filelight-l10n/debian/control | 2 +- debian/wheezy/applications/filelight-l10n/debian/patches/series | 0 debian/wheezy/applications/filelight-l10n/debian/rules | 2 +- .../wheezy/applications/filelight/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/fusion-icon/debian/control | 2 +- debian/wheezy/applications/fusion-icon/debian/patches/.gitignore | 0 debian/wheezy/applications/fusion-icon/debian/patches/series | 0 debian/wheezy/applications/fusion-icon/debian/rules | 2 +- debian/wheezy/applications/gtk-qt-engine/debian/control | 2 +- .../wheezy/applications/gtk-qt-engine/debian/patches/.gitignore | 0 debian/wheezy/applications/gtk-qt-engine/debian/patches/series | 0 debian/wheezy/applications/gtk-qt-engine/debian/rules | 2 +- debian/wheezy/applications/gtk3-tqt-engine/debian/control | 2 +- debian/wheezy/applications/gtk3-tqt-engine/debian/patches/series | 0 debian/wheezy/applications/gtk3-tqt-engine/debian/rules | 2 +- .../applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/gwenview-i18n/debian/patches/series | 0 debian/wheezy/applications/gwenview-i18n/debian/rules | 2 +- debian/wheezy/applications/gwenview/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/gwenview/debian/control | 2 +- debian/wheezy/applications/gwenview/debian/patches/.gitignore | 0 debian/wheezy/applications/gwenview/debian/patches/series | 0 debian/wheezy/applications/gwenview/debian/rules | 2 +- debian/wheezy/applications/k3b/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/k3b/debian/control | 2 +- debian/wheezy/applications/k3b/debian/patches/series | 1 + debian/wheezy/applications/k3b/debian/rules | 2 +- debian/wheezy/applications/k9copy/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/k9copy/debian/control | 2 +- debian/wheezy/applications/k9copy/debian/patches/.gitignore | 0 debian/wheezy/applications/k9copy/debian/patches/series | 0 debian/wheezy/applications/k9copy/debian/rules | 2 +- debian/wheezy/applications/kaffeine/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kaffeine/debian/control | 2 +- debian/wheezy/applications/kaffeine/debian/patches/.gitignore | 0 debian/wheezy/applications/kaffeine/debian/patches/series | 0 debian/wheezy/applications/kaffeine/debian/rules | 2 +- .../wheezy/applications/kasablanca/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kasablanca/debian/control | 2 +- debian/wheezy/applications/kasablanca/debian/patches/series | 2 ++ debian/wheezy/applications/kasablanca/debian/rules | 2 +- debian/wheezy/applications/katapult/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/katapult/debian/control | 2 +- debian/wheezy/applications/katapult/debian/patches/.gitignore | 0 debian/wheezy/applications/katapult/debian/patches/series | 0 debian/wheezy/applications/katapult/debian/rules | 2 +- debian/wheezy/applications/kbarcode/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kbfx/debian/control | 2 +- debian/wheezy/applications/kbfx/debian/patches/.gitignore | 0 debian/wheezy/applications/kbfx/debian/patches/series | 0 debian/wheezy/applications/kbfx/debian/rules | 2 +- debian/wheezy/applications/kbibtex/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kbiff/debian/cdbs/debian-qt-kde.mk | 2 ++ .../wheezy/applications/kbookreader/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kbookreader/debian/control | 2 +- debian/wheezy/applications/kbookreader/debian/patches/.gitignore | 0 debian/wheezy/applications/kbookreader/debian/patches/series | 0 debian/wheezy/applications/kbookreader/debian/rules | 2 +- debian/wheezy/applications/kcmautostart/debian/control | 2 +- debian/wheezy/applications/kcmautostart/debian/patches/series | 0 debian/wheezy/applications/kcmautostart/debian/rules | 2 +- debian/wheezy/applications/kcmldap/debian/control | 2 +- debian/wheezy/applications/kcmldap/debian/patches/series | 0 debian/wheezy/applications/kcmldap/debian/rules | 2 +- debian/wheezy/applications/kcmldapcontroller/debian/control | 2 +- .../wheezy/applications/kcmldapcontroller/debian/patches/series | 0 debian/wheezy/applications/kcmldapcontroller/debian/rules | 2 +- debian/wheezy/applications/kcmldapmanager/debian/control | 2 +- debian/wheezy/applications/kcmldapmanager/debian/patches/series | 0 debian/wheezy/applications/kcmldapmanager/debian/rules | 2 +- debian/wheezy/applications/kcpuload/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kdbg/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kdiff3/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kdirstat/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kdirstat/debian/control | 2 +- debian/wheezy/applications/kdirstat/debian/patches/.gitignore | 0 debian/wheezy/applications/kdirstat/debian/patches/series | 0 debian/wheezy/applications/kdirstat/debian/rules | 2 +- debian/wheezy/applications/kdpkg/debian/control | 2 +- debian/wheezy/applications/kdpkg/debian/patches/.gitignore | 0 debian/wheezy/applications/kdpkg/debian/patches/series | 0 debian/wheezy/applications/kdpkg/debian/rules | 2 +- debian/wheezy/applications/keep/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/keep/debian/control | 2 +- debian/wheezy/applications/keep/debian/patches/series | 1 + debian/wheezy/applications/keep/debian/rules | 2 +- debian/wheezy/applications/kerberostray/debian/control | 2 +- debian/wheezy/applications/kerberostray/debian/patches/series | 0 debian/wheezy/applications/kerberostray/debian/rules | 2 +- debian/wheezy/applications/kerry/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kerry/debian/control | 2 +- debian/wheezy/applications/kerry/debian/patches/series | 0 debian/wheezy/applications/kerry/debian/rules | 2 +- .../wheezy/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kftpgrabber/debian/control | 2 +- debian/wheezy/applications/kftpgrabber/debian/patches/series | 0 debian/wheezy/applications/kftpgrabber/debian/rules | 2 +- debian/wheezy/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kgtk-qt3/debian/control | 2 +- debian/wheezy/applications/kgtk-qt3/debian/patches/series | 0 debian/wheezy/applications/kgtk-qt3/debian/rules | 2 +- debian/wheezy/applications/kile/debian/cdbs/debian-qt-kde.mk | 2 ++ .../wheezy/applications/kiosktool/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kiosktool/debian/control | 2 +- debian/wheezy/applications/kiosktool/debian/patches/.gitignore | 0 debian/wheezy/applications/kiosktool/debian/patches/series | 0 debian/wheezy/applications/kiosktool/debian/rules | 2 +- .../wheezy/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk | 2 ++ .../wheezy/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kmplayer/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kmplayer/debian/control | 2 +- debian/wheezy/applications/kmplayer/debian/patches/.gitignore | 0 debian/wheezy/applications/kmplayer/debian/patches/series | 0 debian/wheezy/applications/kmplayer/debian/rules | 2 +- debian/wheezy/applications/kmymoney/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kmymoney/debian/control | 2 +- debian/wheezy/applications/kmymoney/debian/patches/series | 0 debian/wheezy/applications/kmymoney/debian/rules | 2 +- debian/wheezy/applications/knemo/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/knemo/debian/control | 2 +- debian/wheezy/applications/knemo/debian/patches/.gitignore | 0 debian/wheezy/applications/knemo/debian/patches/series | 0 debian/wheezy/applications/knemo/debian/rules | 2 +- .../wheezy/applications/knetstats/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/knetstats/debian/control | 2 +- debian/wheezy/applications/knetstats/debian/patches/.gitignore | 0 debian/wheezy/applications/knetstats/debian/patches/series | 0 debian/wheezy/applications/knetstats/debian/rules | 2 +- .../knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/knetworkmanager.cmake/debian/rules | 2 +- .../applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/knmap/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/knmap/debian/control | 2 +- debian/wheezy/applications/knmap/debian/patches/series | 0 debian/wheezy/applications/knmap/debian/rules | 2 +- debian/wheezy/applications/koffice/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/koffice/debian/control | 2 +- debian/wheezy/applications/koffice/debian/patches/.gitignore | 0 debian/wheezy/applications/koffice/debian/patches/series | 0 debian/wheezy/applications/koffice/debian/rules | 2 +- .../applications/konversation/debian/cdbs/debian-qt-kde.mk | 2 ++ .../wheezy/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kpilot/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kpowersave.cmake/debian/control | 2 +- .../applications/kpowersave.cmake/debian/patches/.gitignore | 0 .../wheezy/applications/kpowersave.cmake/debian/patches/series | 0 debian/wheezy/applications/kpowersave.cmake/debian/rules | 2 +- .../wheezy/applications/kpowersave/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kpowersave/debian/control | 2 +- debian/wheezy/applications/kpowersave/debian/patches/.gitignore | 0 debian/wheezy/applications/kpowersave/debian/patches/series | 0 debian/wheezy/applications/kpowersave/debian/rules | 2 +- debian/wheezy/applications/krecipes/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/krename/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/krename/debian/control | 2 +- debian/wheezy/applications/krename/debian/patches/series | 0 debian/wheezy/applications/krename/debian/rules | 2 +- debian/wheezy/applications/krusader/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/krusader/debian/control | 2 +- debian/wheezy/applications/krusader/debian/patches/.gitignore | 0 debian/wheezy/applications/krusader/debian/patches/series | 0 debian/wheezy/applications/krusader/debian/rules | 2 +- debian/wheezy/applications/ksensors/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/ksensors/debian/control | 2 +- debian/wheezy/applications/ksensors/debian/patches/series | 0 debian/wheezy/applications/ksensors/debian/rules | 2 +- .../wheezy/applications/kshowmail/debian/cdbs/debian-qt-kde.mk | 2 ++ .../wheezy/applications/kshutdown/debian/cdbs/debian-qt-kde.mk | 2 ++ .../wheezy/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/ksystemlog/debian/control | 2 +- debian/wheezy/applications/ksystemlog/debian/patches/.gitignore | 0 debian/wheezy/applications/ksystemlog/debian/patches/series | 0 debian/wheezy/applications/ksystemlog/debian/rules | 2 +- debian/wheezy/applications/ktorrent/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/ktorrent/debian/control | 2 +- debian/wheezy/applications/ktorrent/debian/patches/.gitignore | 0 debian/wheezy/applications/ktorrent/debian/patches/series | 0 debian/wheezy/applications/ktorrent/debian/rules | 2 +- .../wheezy/applications/kuickshow/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kuickshow/debian/control | 2 +- debian/wheezy/applications/kuickshow/debian/patches/series | 0 debian/wheezy/applications/kuickshow/debian/rules | 2 +- debian/wheezy/applications/kvirc/debian/control | 2 +- debian/wheezy/applications/kvirc/debian/patches/.gitignore | 0 debian/wheezy/applications/kvirc/debian/patches/series | 0 debian/wheezy/applications/kvirc/debian/rules | 2 +- debian/wheezy/applications/kvkbd/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/kvkbd/debian/control | 2 +- debian/wheezy/applications/kvkbd/debian/patches/.gitignore | 0 debian/wheezy/applications/kvkbd/debian/patches/series | 0 debian/wheezy/applications/kvkbd/debian/rules | 2 +- .../applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/piklab/debian/control | 2 +- debian/wheezy/applications/piklab/debian/patches/.gitignore | 0 debian/wheezy/applications/piklab/debian/patches/series | 0 debian/wheezy/applications/piklab/debian/rules | 9 ++++----- debian/wheezy/applications/qt4-tqt-theme-engine/debian/control | 2 +- .../applications/qt4-tqt-theme-engine/debian/patches/series | 0 debian/wheezy/applications/qt4-tqt-theme-engine/debian/rules | 2 +- .../wheezy/applications/rosegarden/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/rosegarden/debian/control | 2 +- debian/wheezy/applications/rosegarden/debian/patches/.gitignore | 0 debian/wheezy/applications/rosegarden/debian/patches/series | 0 debian/wheezy/applications/rosegarden/debian/rules | 2 +- debian/wheezy/applications/smb4k/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/soundkonverter/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/tde-guidance/debian/control | 2 +- .../wheezy/applications/tde-guidance/debian/patches/.gitignore | 0 debian/wheezy/applications/tde-guidance/debian/patches/series | 0 debian/wheezy/applications/tde-guidance/debian/rules | 2 +- .../applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/tde-style-qtcurve/debian/control | 2 +- .../applications/tde-style-qtcurve/debian/patches/.gitignore | 0 .../wheezy/applications/tde-style-qtcurve/debian/patches/series | 0 debian/wheezy/applications/tde-style-qtcurve/debian/rules | 2 +- .../applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/tde-systemsettings/debian/control | 2 +- .../applications/tde-systemsettings/debian/patches/.gitignore | 0 .../wheezy/applications/tde-systemsettings/debian/patches/series | 0 debian/wheezy/applications/tde-systemsettings/debian/rules | 2 +- .../wheezy/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/tdeio-apt/debian/control | 2 +- debian/wheezy/applications/tdeio-apt/debian/patches/.gitignore | 0 debian/wheezy/applications/tdeio-apt/debian/patches/series | 0 debian/wheezy/applications/tdeio-apt/debian/rules | 2 +- .../wheezy/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/tdeio-locate/debian/control | 2 +- debian/wheezy/applications/tdeio-locate/debian/patches/series | 0 debian/wheezy/applications/tdeio-locate/debian/rules | 2 +- .../tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/tdeio-umountwrapper/debian/control | 2 +- .../applications/tdeio-umountwrapper/debian/patches/.gitignore | 0 .../applications/tdeio-umountwrapper/debian/patches/series | 0 debian/wheezy/applications/tdeio-umountwrapper/debian/rules | 2 +- .../applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/tdenetworkmanager/debian/rules | 2 +- .../applications/tdepowersave/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/tdepowersave/debian/control | 2 +- .../wheezy/applications/tdepowersave/debian/patches/.gitignore | 0 debian/wheezy/applications/tdepowersave/debian/patches/series | 0 debian/wheezy/applications/tdepowersave/debian/rules | 2 +- debian/wheezy/applications/tdesudo/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/tdesudo/debian/control | 2 +- debian/wheezy/applications/tdesudo/debian/patches/.gitignore | 0 debian/wheezy/applications/tdesudo/debian/patches/series | 0 debian/wheezy/applications/tdesudo/debian/rules | 2 +- debian/wheezy/applications/tdesvn/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/tdesvn/debian/rules | 2 +- debian/wheezy/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/tork/debian/cdbs/debian-qt-kde.mk | 2 ++ .../applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/twin-style-crystal/debian/control | 2 +- .../applications/twin-style-crystal/debian/patches/.gitignore | 0 .../wheezy/applications/twin-style-crystal/debian/patches/series | 0 debian/wheezy/applications/twin-style-crystal/debian/rules | 2 +- .../wheezy/applications/wlassistant/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/wheezy/applications/wlassistant/debian/control | 2 +- debian/wheezy/applications/wlassistant/debian/patches/.gitignore | 0 debian/wheezy/applications/wlassistant/debian/patches/series | 0 debian/wheezy/applications/wlassistant/debian/rules | 2 +- debian/wheezy/applications/yakuake/debian/cdbs/debian-qt-kde.mk | 2 ++ 298 files changed, 286 insertions(+), 130 deletions(-) create mode 100644 debian/wheezy/applications/abakus/debian/patches/series delete mode 100644 debian/wheezy/applications/adept/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/adept/debian/patches/series delete mode 100644 debian/wheezy/applications/bibletime/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/bibletime/debian/patches/series delete mode 100644 debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/patches/series delete mode 100644 debian/wheezy/applications/digikam/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/digikam/debian/patches/series delete mode 100644 debian/wheezy/applications/dolphin/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/dolphin/debian/patches/series create mode 100644 debian/wheezy/applications/filelight-l10n/debian/patches/series delete mode 100644 debian/wheezy/applications/fusion-icon/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/fusion-icon/debian/patches/series delete mode 100644 debian/wheezy/applications/gtk-qt-engine/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/gtk-qt-engine/debian/patches/series create mode 100644 debian/wheezy/applications/gtk3-tqt-engine/debian/patches/series create mode 100644 debian/wheezy/applications/gwenview-i18n/debian/patches/series delete mode 100644 debian/wheezy/applications/gwenview/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/gwenview/debian/patches/series create mode 100644 debian/wheezy/applications/k3b/debian/patches/series delete mode 100644 debian/wheezy/applications/k9copy/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/k9copy/debian/patches/series delete mode 100644 debian/wheezy/applications/kaffeine/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/kaffeine/debian/patches/series create mode 100644 debian/wheezy/applications/kasablanca/debian/patches/series delete mode 100644 debian/wheezy/applications/katapult/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/katapult/debian/patches/series delete mode 100644 debian/wheezy/applications/kbfx/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/kbfx/debian/patches/series delete mode 100644 debian/wheezy/applications/kbookreader/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/kbookreader/debian/patches/series create mode 100644 debian/wheezy/applications/kcmautostart/debian/patches/series create mode 100644 debian/wheezy/applications/kcmldap/debian/patches/series create mode 100644 debian/wheezy/applications/kcmldapcontroller/debian/patches/series create mode 100644 debian/wheezy/applications/kcmldapmanager/debian/patches/series delete mode 100644 debian/wheezy/applications/kdirstat/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/kdirstat/debian/patches/series delete mode 100644 debian/wheezy/applications/kdpkg/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/kdpkg/debian/patches/series create mode 100644 debian/wheezy/applications/keep/debian/patches/series create mode 100644 debian/wheezy/applications/kerberostray/debian/patches/series create mode 100644 debian/wheezy/applications/kerry/debian/patches/series create mode 100644 debian/wheezy/applications/kftpgrabber/debian/patches/series create mode 100644 debian/wheezy/applications/kgtk-qt3/debian/patches/series delete mode 100644 debian/wheezy/applications/kiosktool/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/kiosktool/debian/patches/series delete mode 100644 debian/wheezy/applications/kmplayer/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/kmplayer/debian/patches/series create mode 100644 debian/wheezy/applications/kmymoney/debian/patches/series delete mode 100644 debian/wheezy/applications/knemo/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/knemo/debian/patches/series delete mode 100644 debian/wheezy/applications/knetstats/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/knetstats/debian/patches/series create mode 100644 debian/wheezy/applications/knmap/debian/patches/series delete mode 100644 debian/wheezy/applications/koffice/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/koffice/debian/patches/series delete mode 100644 debian/wheezy/applications/kpowersave.cmake/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/kpowersave.cmake/debian/patches/series delete mode 100644 debian/wheezy/applications/kpowersave/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/kpowersave/debian/patches/series create mode 100644 debian/wheezy/applications/krename/debian/patches/series delete mode 100644 debian/wheezy/applications/krusader/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/krusader/debian/patches/series create mode 100644 debian/wheezy/applications/ksensors/debian/patches/series delete mode 100644 debian/wheezy/applications/ksystemlog/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/ksystemlog/debian/patches/series delete mode 100644 debian/wheezy/applications/ktorrent/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/ktorrent/debian/patches/series create mode 100644 debian/wheezy/applications/kuickshow/debian/patches/series delete mode 100644 debian/wheezy/applications/kvirc/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/kvirc/debian/patches/series delete mode 100644 debian/wheezy/applications/kvkbd/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/kvkbd/debian/patches/series delete mode 100644 debian/wheezy/applications/piklab/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/piklab/debian/patches/series create mode 100644 debian/wheezy/applications/qt4-tqt-theme-engine/debian/patches/series delete mode 100644 debian/wheezy/applications/rosegarden/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/rosegarden/debian/patches/series delete mode 100644 debian/wheezy/applications/tde-guidance/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/tde-guidance/debian/patches/series delete mode 100644 debian/wheezy/applications/tde-style-qtcurve/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/tde-style-qtcurve/debian/patches/series delete mode 100644 debian/wheezy/applications/tde-systemsettings/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/tde-systemsettings/debian/patches/series delete mode 100644 debian/wheezy/applications/tdeio-apt/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/tdeio-apt/debian/patches/series create mode 100644 debian/wheezy/applications/tdeio-locate/debian/patches/series delete mode 100644 debian/wheezy/applications/tdeio-umountwrapper/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/tdeio-umountwrapper/debian/patches/series delete mode 100644 debian/wheezy/applications/tdepowersave/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/tdepowersave/debian/patches/series delete mode 100644 debian/wheezy/applications/tdesudo/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/tdesudo/debian/patches/series delete mode 100644 debian/wheezy/applications/twin-style-crystal/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/twin-style-crystal/debian/patches/series delete mode 100644 debian/wheezy/applications/wlassistant/debian/patches/.gitignore create mode 100644 debian/wheezy/applications/wlassistant/debian/patches/series (limited to 'debian/wheezy/applications') diff --git a/debian/wheezy/applications/abakus/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/abakus/debian/cdbs/debian-qt-kde.mk index 5e704aa4a..c5d8ecfd3 100644 --- a/debian/wheezy/applications/abakus/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/abakus/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/abakus/debian/control b/debian/wheezy/applications/abakus/debian/control index 0fbc2fdb5..d3c0c5279 100644 --- a/debian/wheezy/applications/abakus/debian/control +++ b/debian/wheezy/applications/abakus/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Steffen Joeris -Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex +Build-Depends: autotools-dev, debhelper (>= 4.1.0), quilt, cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex Standards-Version: 3.8.4 Package: abakus-trinity diff --git a/debian/wheezy/applications/abakus/debian/patches/series b/debian/wheezy/applications/abakus/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/abakus/debian/rules b/debian/wheezy/applications/abakus/debian/rules index c856f7cae..83d7d7fb4 100755 --- a/debian/wheezy/applications/abakus/debian/rules +++ b/debian/wheezy/applications/abakus/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/adept/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/adept/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/adept/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/adept/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/adept/debian/control b/debian/wheezy/applications/adept/debian/control index 12796cfa7..95fee8d1e 100644 --- a/debian/wheezy/applications/adept/debian/control +++ b/debian/wheezy/applications/adept/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Peter Rockai Uploaders: Isaac Clerencia , Enrico Zini -Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>> 4.1), quilt, dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: adept-trinity diff --git a/debian/wheezy/applications/adept/debian/patches/.gitignore b/debian/wheezy/applications/adept/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/adept/debian/patches/series b/debian/wheezy/applications/adept/debian/patches/series new file mode 100644 index 000000000..ad5b05138 --- /dev/null +++ b/debian/wheezy/applications/adept/debian/patches/series @@ -0,0 +1 @@ +remove_apport.diff diff --git a/debian/wheezy/applications/adept/debian/rules b/debian/wheezy/applications/adept/debian/rules index 742307eb6..0e554102b 100755 --- a/debian/wheezy/applications/adept/debian/rules +++ b/debian/wheezy/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/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk index 345cc0a61..fb36ac52f 100644 --- a/debian/wheezy/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/amarok.cmake/debian/rules b/debian/wheezy/applications/amarok.cmake/debian/rules index 4fd9a743d..7f157aa03 100755 --- a/debian/wheezy/applications/amarok.cmake/debian/rules +++ b/debian/wheezy/applications/amarok.cmake/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/amarok/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/amarok/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/amarok/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/amarok/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/basket/debian/control b/debian/wheezy/applications/basket/debian/control index 8b485c191..33cb331ad 100644 --- a/debian/wheezy/applications/basket/debian/control +++ b/debian/wheezy/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), tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs, debhelper (>= 5), tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: basket-trinity diff --git a/debian/wheezy/applications/basket/debian/rules b/debian/wheezy/applications/basket/debian/rules index d3cf5255e..4afb63bdd 100755 --- a/debian/wheezy/applications/basket/debian/rules +++ b/debian/wheezy/applications/basket/debian/rules @@ -26,10 +26,10 @@ else CFLAGS += -O2 endif -include /usr/share/quilt/quilt.make +include /usr/share/cdbs/1/rules/patchsys-quilt.mk -config.status: $(QUILT_STAMPFN) +config.status: post-patches dh_testdir test -e config.sub -a -L config.sub || \ ln -sf /usr/share/misc/config.sub config.sub @@ -59,7 +59,7 @@ build-stamp: config.status touch build-stamp -clean: unpatch +clean:: dh_testdir dh_testroot diff --git a/debian/wheezy/applications/bibletime/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/bibletime/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/bibletime/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/bibletime/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/bibletime/debian/patches/.gitignore b/debian/wheezy/applications/bibletime/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/bibletime/debian/patches/series b/debian/wheezy/applications/bibletime/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/bibletime/debian/rules b/debian/wheezy/applications/bibletime/debian/rules index 4106bf0f4..9e134b1f7 100755 --- a/debian/wheezy/applications/bibletime/debian/rules +++ b/debian/wheezy/applications/bibletime/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_DH_INSTALL_SOURCEDIR := debian diff --git a/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/control b/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/control index febf1777d..591e61775 100644 --- a/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/control +++ b/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/control @@ -2,7 +2,7 @@ Source: compizconfig-backend-tdeconfig-trinity Section: libs Priority: extra Maintainer: Timothy Pearosn -Build-Depends: cdbs, debhelper (>= 5), compiz-trinity-dev, pkg-config, intltool, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, compiz-trinity-dev, pkg-config, intltool, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: compizconfig-backend-tdeconfig-trinity diff --git a/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/patches/.gitignore b/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/patches/series b/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/rules b/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/rules index 85efaa2fa..eb681a06a 100755 --- a/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/rules +++ b/debian/wheezy/applications/compizconfig-backend-tdeconfig/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/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/digikam/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/digikam/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/digikam/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/digikam/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/digikam/debian/control b/debian/wheezy/applications/digikam/debian/control index 67ba409c4..2c4f978c3 100644 --- a/debian/wheezy/applications/digikam/debian/control +++ b/debian/wheezy/applications/digikam/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Achim Bohnet , Mark Purcell , Fathi Boudra -Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev, libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6), libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev, diff --git a/debian/wheezy/applications/digikam/debian/patches/.gitignore b/debian/wheezy/applications/digikam/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/digikam/debian/patches/series b/debian/wheezy/applications/digikam/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/digikam/debian/rules b/debian/wheezy/applications/digikam/debian/rules index 76fa321bc..cc9992ad3 100755 --- a/debian/wheezy/applications/digikam/debian/rules +++ b/debian/wheezy/applications/digikam/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk diff --git a/debian/wheezy/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/dolphin/debian/cdbs/debian-qt-kde.mk index 345cc0a61..fb36ac52f 100644 --- a/debian/wheezy/applications/dolphin/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/dolphin/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/dolphin/debian/control b/debian/wheezy/applications/dolphin/debian/control index 4893570ea..8fc8f23d2 100644 --- a/debian/wheezy/applications/dolphin/debian/control +++ b/debian/wheezy/applications/dolphin/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Anthony Mercatante -Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake +Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake Standards-Version: 3.8.4 Package: dolphin-trinity diff --git a/debian/wheezy/applications/dolphin/debian/patches/.gitignore b/debian/wheezy/applications/dolphin/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/dolphin/debian/patches/series b/debian/wheezy/applications/dolphin/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/dolphin/debian/rules b/debian/wheezy/applications/dolphin/debian/rules index 66ea98891..f978c418e 100755 --- a/debian/wheezy/applications/dolphin/debian/rules +++ b/debian/wheezy/applications/dolphin/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/filelight-l10n/debian/control b/debian/wheezy/applications/filelight-l10n/debian/control index 812a4a68f..0cbcfc3ef 100644 --- a/debian/wheezy/applications/filelight-l10n/debian/control +++ b/debian/wheezy/applications/filelight-l10n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Ral Snchez Siles -Build-Depends: tdelibs14-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake, autoconf, libtool, libltdl-dev +Build-Depends: tdelibs14-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.methylblue.com/filelight/ diff --git a/debian/wheezy/applications/filelight-l10n/debian/patches/series b/debian/wheezy/applications/filelight-l10n/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/filelight-l10n/debian/rules b/debian/wheezy/applications/filelight-l10n/debian/rules index 84a2f4975..6d6088aad 100755 --- a/debian/wheezy/applications/filelight-l10n/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/filelight/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/filelight/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/filelight/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/filelight/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/fusion-icon/debian/control b/debian/wheezy/applications/fusion-icon/debian/control index 992d74863..2b6f86ef6 100644 --- a/debian/wheezy/applications/fusion-icon/debian/control +++ b/debian/wheezy/applications/fusion-icon/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson Uploaders: Python Applications Packaging Team XS-Python-Version: all -Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), pkg-config, python-all-dev +Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), quilt, pkg-config, python-all-dev Build-Depends-Indep: python-support (>= 0.6), intltool Standards-Version: 3.8.4 diff --git a/debian/wheezy/applications/fusion-icon/debian/patches/.gitignore b/debian/wheezy/applications/fusion-icon/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/fusion-icon/debian/patches/series b/debian/wheezy/applications/fusion-icon/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/fusion-icon/debian/rules b/debian/wheezy/applications/fusion-icon/debian/rules index 2b780a204..3c129a596 100755 --- a/debian/wheezy/applications/fusion-icon/debian/rules +++ b/debian/wheezy/applications/fusion-icon/debian/rules @@ -5,7 +5,7 @@ DEB_PYTHON_SYSTEM=pysupport include /usr/share/cdbs/1/rules/debhelper.mk # include /usr/share/cdbs/1/class/python-distutils.mk include debian/python-distutils-custom.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) diff --git a/debian/wheezy/applications/gtk-qt-engine/debian/control b/debian/wheezy/applications/gtk-qt-engine/debian/control index cf970f8fa..9ab358185 100644 --- a/debian/wheezy/applications/gtk-qt-engine/debian/control +++ b/debian/wheezy/applications/gtk-qt-engine/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Bastian Venthur -Build-Depends: debhelper (>= 5.0), cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1) +Build-Depends: debhelper (>= 5.0), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1) Standards-Version: 3.8.4 Package: gtk-qt-engine-trinity diff --git a/debian/wheezy/applications/gtk-qt-engine/debian/patches/.gitignore b/debian/wheezy/applications/gtk-qt-engine/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/gtk-qt-engine/debian/patches/series b/debian/wheezy/applications/gtk-qt-engine/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/gtk-qt-engine/debian/rules b/debian/wheezy/applications/gtk-qt-engine/debian/rules index 8c78b986c..64a42472c 100755 --- a/debian/wheezy/applications/gtk-qt-engine/debian/rules +++ b/debian/wheezy/applications/gtk-qt-engine/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/gtk3-tqt-engine/debian/control b/debian/wheezy/applications/gtk3-tqt-engine/debian/control index a192c467e..4acce9a2e 100644 --- a/debian/wheezy/applications/gtk3-tqt-engine/debian/control +++ b/debian/wheezy/applications/gtk3-tqt-engine/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Raphaël Pinson -Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: gtk3-tqt-engine-trinity diff --git a/debian/wheezy/applications/gtk3-tqt-engine/debian/patches/series b/debian/wheezy/applications/gtk3-tqt-engine/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/gtk3-tqt-engine/debian/rules b/debian/wheezy/applications/gtk3-tqt-engine/debian/rules index 9bed17b05..e4abe53af 100755 --- a/debian/wheezy/applications/gtk3-tqt-engine/debian/rules +++ b/debian/wheezy/applications/gtk3-tqt-engine/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/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk diff --git a/debian/wheezy/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk index fa0d532f4..ec89756bb 100644 --- a/debian/wheezy/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/gwenview-i18n/debian/patches/series b/debian/wheezy/applications/gwenview-i18n/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/gwenview-i18n/debian/rules b/debian/wheezy/applications/gwenview-i18n/debian/rules index 3070a9c9d..045fcc43f 100755 --- a/debian/wheezy/applications/gwenview-i18n/debian/rules +++ b/debian/wheezy/applications/gwenview-i18n/debian/rules @@ -4,7 +4,7 @@ DEB_PATCHDIRS := debian/patches/common debian/patches include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -include debian/debiandirs diff --git a/debian/wheezy/applications/gwenview/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/gwenview/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/gwenview/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/gwenview/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/gwenview/debian/control b/debian/wheezy/applications/gwenview/debian/control index 359bad80c..296502cdb 100644 --- a/debian/wheezy/applications/gwenview/debian/control +++ b/debian/wheezy/applications/gwenview/debian/control @@ -2,7 +2,7 @@ Source: gwenview-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6.0.0), tdelibs14-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, libmng-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6.0.0), quilt, tdelibs14-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, libmng-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://gwenview.sourceforge.net diff --git a/debian/wheezy/applications/gwenview/debian/patches/.gitignore b/debian/wheezy/applications/gwenview/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/gwenview/debian/patches/series b/debian/wheezy/applications/gwenview/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/gwenview/debian/rules b/debian/wheezy/applications/gwenview/debian/rules index 2fca00e50..943f33d55 100755 --- a/debian/wheezy/applications/gwenview/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/k3b/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/k3b/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/k3b/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/k3b/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/k3b/debian/control b/debian/wheezy/applications/k3b/debian/control index f77c83db2..1d7188cb2 100644 --- a/debian/wheezy/applications/k3b/debian/control +++ b/debian/wheezy/applications/k3b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Francois Marier , Fathi Boudra -Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.k3b.org diff --git a/debian/wheezy/applications/k3b/debian/patches/series b/debian/wheezy/applications/k3b/debian/patches/series new file mode 100644 index 000000000..bff63cb8c --- /dev/null +++ b/debian/wheezy/applications/k3b/debian/patches/series @@ -0,0 +1 @@ +111_advice_kubuntu_restricted_extras.diff diff --git a/debian/wheezy/applications/k3b/debian/rules b/debian/wheezy/applications/k3b/debian/rules index cc895cd83..f3d017250 100755 --- a/debian/wheezy/applications/k3b/debian/rules +++ b/debian/wheezy/applications/k3b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5 diff --git a/debian/wheezy/applications/k9copy/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/k9copy/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/k9copy/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/k9copy/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/k9copy/debian/control b/debian/wheezy/applications/k9copy/debian/control index b166a14fd..5b895ca12 100644 --- a/debian/wheezy/applications/k9copy/debian/control +++ b/debian/wheezy/applications/k9copy/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Anthony Mercatante -Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: k9copy-trinity diff --git a/debian/wheezy/applications/k9copy/debian/patches/.gitignore b/debian/wheezy/applications/k9copy/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/k9copy/debian/patches/series b/debian/wheezy/applications/k9copy/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/k9copy/debian/rules b/debian/wheezy/applications/k9copy/debian/rules index 9d406d017..365bf8ac6 100755 --- a/debian/wheezy/applications/k9copy/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kaffeine/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kaffeine/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kaffeine/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kaffeine/debian/control b/debian/wheezy/applications/kaffeine/debian/control index f16c8de4a..f7cd853c3 100644 --- a/debian/wheezy/applications/kaffeine/debian/control +++ b/debian/wheezy/applications/kaffeine/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Riku Voipio , Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev, libxtst-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libcdio-cdda-dev, libcdio-paranoia-dev, diff --git a/debian/wheezy/applications/kaffeine/debian/patches/.gitignore b/debian/wheezy/applications/kaffeine/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/kaffeine/debian/patches/series b/debian/wheezy/applications/kaffeine/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kaffeine/debian/rules b/debian/wheezy/applications/kaffeine/debian/rules index 5087a0863..3afb59271 100755 --- a/debian/wheezy/applications/kaffeine/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kasablanca/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/kasablanca/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kasablanca/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kasablanca/debian/control b/debian/wheezy/applications/kasablanca/debian/control index 0e8aed6ad..01515bd06 100644 --- a/debian/wheezy/applications/kasablanca/debian/control +++ b/debian/wheezy/applications/kasablanca/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Debian TDE Extras Team Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 5), automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml +Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml Standards-Version: 3.8.3 Package: kasablanca-trinity diff --git a/debian/wheezy/applications/kasablanca/debian/patches/series b/debian/wheezy/applications/kasablanca/debian/patches/series new file mode 100644 index 000000000..b8743ddd9 --- /dev/null +++ b/debian/wheezy/applications/kasablanca/debian/patches/series @@ -0,0 +1,2 @@ +04_am_maintainer_mode.diff +06_disable_no_undefined.diff diff --git a/debian/wheezy/applications/kasablanca/debian/rules b/debian/wheezy/applications/kasablanca/debian/rules index 76e30e3f1..e12e8b448 100755 --- a/debian/wheezy/applications/kasablanca/debian/rules +++ b/debian/wheezy/applications/kasablanca/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 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/katapult/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/katapult/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/katapult/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/katapult/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/katapult/debian/control b/debian/wheezy/applications/katapult/debian/control index afe221266..9250caf9d 100644 --- a/debian/wheezy/applications/katapult/debian/control +++ b/debian/wheezy/applications/katapult/debian/control @@ -2,7 +2,7 @@ Source: katapult-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), tdelibs14-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: katapult-trinity diff --git a/debian/wheezy/applications/katapult/debian/patches/.gitignore b/debian/wheezy/applications/katapult/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/katapult/debian/patches/series b/debian/wheezy/applications/katapult/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/katapult/debian/rules b/debian/wheezy/applications/katapult/debian/rules index 779671876..8f2dd7642 100755 --- a/debian/wheezy/applications/katapult/debian/rules +++ b/debian/wheezy/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/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/kbarcode/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kbarcode/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kbarcode/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kbarcode/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kbfx/debian/control b/debian/wheezy/applications/kbfx/debian/control index 0f89b49de..9ecf9699b 100644 --- a/debian/wheezy/applications/kbfx/debian/control +++ b/debian/wheezy/applications/kbfx/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 5), cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, cmake, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kbfx-trinity diff --git a/debian/wheezy/applications/kbfx/debian/patches/.gitignore b/debian/wheezy/applications/kbfx/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/kbfx/debian/patches/series b/debian/wheezy/applications/kbfx/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kbfx/debian/rules b/debian/wheezy/applications/kbfx/debian/rules index 7c57eacb9..ddf86b0bb 100755 --- a/debian/wheezy/applications/kbfx/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/kbibtex/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kbibtex/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/kbibtex/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kbibtex/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kbiff/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kbiff/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/kbiff/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kbiff/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kbookreader/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kbookreader/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kbookreader/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kbookreader/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kbookreader/debian/control b/debian/wheezy/applications/kbookreader/debian/control index 34a8fec43..b36c96220 100644 --- a/debian/wheezy/applications/kbookreader/debian/control +++ b/debian/wheezy/applications/kbookreader/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Anthony Mercatante -Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://k9copy.sourceforge.net/ diff --git a/debian/wheezy/applications/kbookreader/debian/patches/.gitignore b/debian/wheezy/applications/kbookreader/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/kbookreader/debian/patches/series b/debian/wheezy/applications/kbookreader/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kbookreader/debian/rules b/debian/wheezy/applications/kbookreader/debian/rules index 53794c4fe..ef1dd49ff 100755 --- a/debian/wheezy/applications/kbookreader/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/kcmautostart/debian/control b/debian/wheezy/applications/kcmautostart/debian/control index 2eb9e9c3f..225c33269 100644 --- a/debian/wheezy/applications/kcmautostart/debian/control +++ b/debian/wheezy/applications/kcmautostart/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Raphaël Pinson -Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kcontrol-autostart-trinity diff --git a/debian/wheezy/applications/kcmautostart/debian/patches/series b/debian/wheezy/applications/kcmautostart/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kcmautostart/debian/rules b/debian/wheezy/applications/kcmautostart/debian/rules index 9bed17b05..e4abe53af 100755 --- a/debian/wheezy/applications/kcmautostart/debian/rules +++ b/debian/wheezy/applications/kcmautostart/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/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk diff --git a/debian/wheezy/applications/kcmldap/debian/control b/debian/wheezy/applications/kcmldap/debian/control index 5bdbbbe9c..77afbaf4a 100644 --- a/debian/wheezy/applications/kcmldap/debian/control +++ b/debian/wheezy/applications/kcmldap/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Raphaël Pinson -Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kcontrol-ldap-bonding-trinity diff --git a/debian/wheezy/applications/kcmldap/debian/patches/series b/debian/wheezy/applications/kcmldap/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kcmldap/debian/rules b/debian/wheezy/applications/kcmldap/debian/rules index 9bed17b05..e4abe53af 100755 --- a/debian/wheezy/applications/kcmldap/debian/rules +++ b/debian/wheezy/applications/kcmldap/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/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk diff --git a/debian/wheezy/applications/kcmldapcontroller/debian/control b/debian/wheezy/applications/kcmldapcontroller/debian/control index bd10bfa04..81a9a046d 100644 --- a/debian/wheezy/applications/kcmldapcontroller/debian/control +++ b/debian/wheezy/applications/kcmldapcontroller/debian/control @@ -2,7 +2,7 @@ Source: kcontrol-ldap-controller-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kcontrol-ldap-controller-trinity diff --git a/debian/wheezy/applications/kcmldapcontroller/debian/patches/series b/debian/wheezy/applications/kcmldapcontroller/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kcmldapcontroller/debian/rules b/debian/wheezy/applications/kcmldapcontroller/debian/rules index 9bed17b05..e4abe53af 100755 --- a/debian/wheezy/applications/kcmldapcontroller/debian/rules +++ b/debian/wheezy/applications/kcmldapcontroller/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/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk diff --git a/debian/wheezy/applications/kcmldapmanager/debian/control b/debian/wheezy/applications/kcmldapmanager/debian/control index 10551309e..70af95ae3 100644 --- a/debian/wheezy/applications/kcmldapmanager/debian/control +++ b/debian/wheezy/applications/kcmldapmanager/debian/control @@ -2,7 +2,7 @@ Source: kcontrol-ldap-manager-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kcontrol-ldap-manager-trinity diff --git a/debian/wheezy/applications/kcmldapmanager/debian/patches/series b/debian/wheezy/applications/kcmldapmanager/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kcmldapmanager/debian/rules b/debian/wheezy/applications/kcmldapmanager/debian/rules index 9bed17b05..e4abe53af 100755 --- a/debian/wheezy/applications/kcmldapmanager/debian/rules +++ b/debian/wheezy/applications/kcmldapmanager/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/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk diff --git a/debian/wheezy/applications/kcpuload/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kcpuload/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kcpuload/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kcpuload/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kdbg/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/kdbg/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kdbg/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kdiff3/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kdiff3/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kdiff3/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kdiff3/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kdirstat/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kdirstat/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kdirstat/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kdirstat/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kdirstat/debian/control b/debian/wheezy/applications/kdirstat/debian/control index 341097934..7f5a1b7ed 100644 --- a/debian/wheezy/applications/kdirstat/debian/control +++ b/debian/wheezy/applications/kdirstat/debian/control @@ -2,7 +2,7 @@ Source: kdirstat-trinity Section: misc Priority: optional Maintainer: Timothy Pearson -Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), quilt, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://kdirstat.sourceforge.net/ diff --git a/debian/wheezy/applications/kdirstat/debian/patches/.gitignore b/debian/wheezy/applications/kdirstat/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/kdirstat/debian/patches/series b/debian/wheezy/applications/kdirstat/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kdirstat/debian/rules b/debian/wheezy/applications/kdirstat/debian/rules index 8c0a950a3..afa7b060d 100755 --- a/debian/wheezy/applications/kdirstat/debian/rules +++ b/debian/wheezy/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/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/kdpkg/debian/control b/debian/wheezy/applications/kdpkg/debian/control index 3123a23f7..0fdcb9f25 100644 --- a/debian/wheezy/applications/kdpkg/debian/control +++ b/debian/wheezy/applications/kdpkg/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Alexander Kopf -Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, gettext, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, gettext, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kdpkg-trinity diff --git a/debian/wheezy/applications/kdpkg/debian/patches/.gitignore b/debian/wheezy/applications/kdpkg/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/kdpkg/debian/patches/series b/debian/wheezy/applications/kdpkg/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kdpkg/debian/rules b/debian/wheezy/applications/kdpkg/debian/rules index 455414f69..2ff6ee66f 100755 --- a/debian/wheezy/applications/kdpkg/debian/rules +++ b/debian/wheezy/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/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/keep/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/keep/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/keep/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/keep/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/keep/debian/control b/debian/wheezy/applications/keep/debian/control index 4f380fc56..4048f3218 100644 --- a/debian/wheezy/applications/keep/debian/control +++ b/debian/wheezy/applications/keep/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: keep-trinity diff --git a/debian/wheezy/applications/keep/debian/patches/series b/debian/wheezy/applications/keep/debian/patches/series new file mode 100644 index 000000000..9ccf4a125 --- /dev/null +++ b/debian/wheezy/applications/keep/debian/patches/series @@ -0,0 +1 @@ +kubuntu_01_kdepot.diff diff --git a/debian/wheezy/applications/keep/debian/rules b/debian/wheezy/applications/keep/debian/rules index c08262790..ae055a958 100755 --- a/debian/wheezy/applications/keep/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/kerberostray/debian/control b/debian/wheezy/applications/kerberostray/debian/control index 215814458..bf4d6c2e5 100644 --- a/debian/wheezy/applications/kerberostray/debian/control +++ b/debian/wheezy/applications/kerberostray/debian/control @@ -2,7 +2,7 @@ Source: kerberostray-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kerberostray-trinity diff --git a/debian/wheezy/applications/kerberostray/debian/patches/series b/debian/wheezy/applications/kerberostray/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kerberostray/debian/rules b/debian/wheezy/applications/kerberostray/debian/rules index 9bed17b05..e4abe53af 100755 --- a/debian/wheezy/applications/kerberostray/debian/rules +++ b/debian/wheezy/applications/kerberostray/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/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk diff --git a/debian/wheezy/applications/kerry/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kerry/debian/cdbs/debian-qt-kde.mk index 4a11bc028..6b7b16643 100644 --- a/debian/wheezy/applications/kerry/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kerry/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kerry/debian/control b/debian/wheezy/applications/kerry/debian/control index 432af377d..5f6563c67 100644 --- a/debian/wheezy/applications/kerry/debian/control +++ b/debian/wheezy/applications/kerry/debian/control @@ -2,7 +2,7 @@ Source: kerry-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 5.0.0), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev Homepage: http://en.opensuse.org/Kerry Standards-Version: 3.8.4 diff --git a/debian/wheezy/applications/kerry/debian/patches/series b/debian/wheezy/applications/kerry/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kerry/debian/rules b/debian/wheezy/applications/kerry/debian/rules index dea466c17..7b26c5eb5 100755 --- a/debian/wheezy/applications/kerry/debian/rules +++ b/debian/wheezy/applications/kerry/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk # include /usr/share/cdbs/1/class/kde.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kftpgrabber/debian/control b/debian/wheezy/applications/kftpgrabber/debian/control index eaa793711..3e06c17d3 100644 --- a/debian/wheezy/applications/kftpgrabber/debian/control +++ b/debian/wheezy/applications/kftpgrabber/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Debian TDE Extras Team Uploaders: Fathi Boudra , Mark Purcell , Michael Meskes -Build-Depends: cdbs, debhelper (>= 5), automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml +Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml Standards-Version: 3.8.3 Homepage: http://www.kftp.org diff --git a/debian/wheezy/applications/kftpgrabber/debian/patches/series b/debian/wheezy/applications/kftpgrabber/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kftpgrabber/debian/rules b/debian/wheezy/applications/kftpgrabber/debian/rules index 51e8bf7a9..64be165cd 100755 --- a/debian/wheezy/applications/kftpgrabber/debian/rules +++ b/debian/wheezy/applications/kftpgrabber/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 diff --git a/debian/wheezy/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk index 5e704aa4a..c5d8ecfd3 100644 --- a/debian/wheezy/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kgtk-qt3/debian/control b/debian/wheezy/applications/kgtk-qt3/debian/control index 253fe5cb6..fd84fc01c 100644 --- a/debian/wheezy/applications/kgtk-qt3/debian/control +++ b/debian/wheezy/applications/kgtk-qt3/debian/control @@ -2,7 +2,7 @@ Source: kgtk-qt3-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 7), cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake +Build-Depends: debhelper (>= 7), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake Standards-Version: 3.8.4 Homepage: http://trinity.pearsoncomputing.net diff --git a/debian/wheezy/applications/kgtk-qt3/debian/patches/series b/debian/wheezy/applications/kgtk-qt3/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kgtk-qt3/debian/rules b/debian/wheezy/applications/kgtk-qt3/debian/rules index b4cb7a953..91c8ec995 100755 --- a/debian/wheezy/applications/kgtk-qt3/debian/rules +++ b/debian/wheezy/applications/kgtk-qt3/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/kile/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kile/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kile/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kile/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kiosktool/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kiosktool/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kiosktool/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kiosktool/debian/control b/debian/wheezy/applications/kiosktool/debian/control index 322d2b3b4..6779d88ff 100644 --- a/debian/wheezy/applications/kiosktool/debian/control +++ b/debian/wheezy/applications/kiosktool/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Pedro Jurado Maqueda -Build-Depends: debhelper (>= 4.1.0), cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 4.1.0), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kiosktool-trinity diff --git a/debian/wheezy/applications/kiosktool/debian/patches/.gitignore b/debian/wheezy/applications/kiosktool/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/kiosktool/debian/patches/series b/debian/wheezy/applications/kiosktool/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kiosktool/debian/rules b/debian/wheezy/applications/kiosktool/debian/rules index 507e5a458..7e010577d 100755 --- a/debian/wheezy/applications/kiosktool/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kmplayer/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kmplayer/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kmplayer/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kmplayer/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kmplayer/debian/control b/debian/wheezy/applications/kmplayer/debian/control index 26e85a2ed..3843dc2b7 100644 --- a/debian/wheezy/applications/kmplayer/debian/control +++ b/debian/wheezy/applications/kmplayer/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev, libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, docbook2x, automake, autoconf, libtool, libltdl-dev diff --git a/debian/wheezy/applications/kmplayer/debian/patches/.gitignore b/debian/wheezy/applications/kmplayer/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/kmplayer/debian/patches/series b/debian/wheezy/applications/kmplayer/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kmplayer/debian/rules b/debian/wheezy/applications/kmplayer/debian/rules index 2c29e9b14..093944c34 100755 --- a/debian/wheezy/applications/kmplayer/debian/rules +++ b/debian/wheezy/applications/kmplayer/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/utils.mk diff --git a/debian/wheezy/applications/kmymoney/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kmymoney/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kmymoney/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kmymoney/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kmymoney/debian/control b/debian/wheezy/applications/kmymoney/debian/control index ef3eb2188..58d0cac2a 100644 --- a/debian/wheezy/applications/kmymoney/debian/control +++ b/debian/wheezy/applications/kmymoney/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Mark Purcell , Fathi Boudra -Build-Depends: debhelper (>= 7.0.50~), cdbs, chrpath, automake, libtool, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, recode, html2ps +Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, chrpath, automake, libtool, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, recode, html2ps Standards-Version: 3.8.4 Package: kmymoney2-trinity diff --git a/debian/wheezy/applications/kmymoney/debian/patches/series b/debian/wheezy/applications/kmymoney/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kmymoney/debian/rules b/debian/wheezy/applications/kmymoney/debian/rules index 4c3b55cb4..d636191c4 100755 --- a/debian/wheezy/applications/kmymoney/debian/rules +++ b/debian/wheezy/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/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/knemo/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/knemo/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/knemo/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/knemo/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/knemo/debian/control b/debian/wheezy/applications/knemo/debian/control index e92e60364..e11fc58c2 100644 --- a/debian/wheezy/applications/knemo/debian/control +++ b/debian/wheezy/applications/knemo/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Achim Bohnet , Mark Purcell -Build-Depends: debhelper (>> 4.1), cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>> 4.1), quilt, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: knemo-trinity diff --git a/debian/wheezy/applications/knemo/debian/patches/.gitignore b/debian/wheezy/applications/knemo/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/knemo/debian/patches/series b/debian/wheezy/applications/knemo/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/knemo/debian/rules b/debian/wheezy/applications/knemo/debian/rules index 345d9f54d..9e3a13754 100755 --- a/debian/wheezy/applications/knemo/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/knetstats/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/knetstats/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/knetstats/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/knetstats/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/knetstats/debian/control b/debian/wheezy/applications/knetstats/debian/control index 600b079f8..41d913327 100644 --- a/debian/wheezy/applications/knetstats/debian/control +++ b/debian/wheezy/applications/knetstats/debian/control @@ -2,7 +2,7 @@ Source: knetstats-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 5.0), cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://knetstats.sourceforge.net/ diff --git a/debian/wheezy/applications/knetstats/debian/patches/.gitignore b/debian/wheezy/applications/knetstats/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/knetstats/debian/patches/series b/debian/wheezy/applications/knetstats/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/knetstats/debian/rules b/debian/wheezy/applications/knetstats/debian/rules index 1a573fb20..7da95d739 100755 --- a/debian/wheezy/applications/knetstats/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk index 345cc0a61..fb36ac52f 100644 --- a/debian/wheezy/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/knetworkmanager.cmake/debian/rules b/debian/wheezy/applications/knetworkmanager.cmake/debian/rules index 5043dd652..7b801da5f 100755 --- a/debian/wheezy/applications/knetworkmanager.cmake/debian/rules +++ b/debian/wheezy/applications/knetworkmanager.cmake/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/knmap/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/knmap/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/knmap/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/knmap/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/knmap/debian/control b/debian/wheezy/applications/knmap/debian/control index ff43fd3f7..6b8893341 100644 --- a/debian/wheezy/applications/knmap/debian/control +++ b/debian/wheezy/applications/knmap/debian/control @@ -2,7 +2,7 @@ Source: knmap-trinity Section: tde Priority: extra Maintainer: Timothy Pearson -Build-Depends: debhelper (>> 5), autotools-dev, tdelibs14-trinity-dev, automake, libtool, cdbs, docbook2x, docbook-xml +Build-Depends: debhelper (>> 5), quilt, autotools-dev, tdelibs14-trinity-dev, automake, libtool, cdbs, docbook2x, docbook-xml Standards-Version: 3.8.2 Package: knmap-trinity diff --git a/debian/wheezy/applications/knmap/debian/patches/series b/debian/wheezy/applications/knmap/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/knmap/debian/rules b/debian/wheezy/applications/knmap/debian/rules index 348e53573..7a20baa99 100755 --- a/debian/wheezy/applications/knmap/debian/rules +++ b/debian/wheezy/applications/knmap/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/debhelper.mk include debian/cdbs/kde.mk diff --git a/debian/wheezy/applications/koffice/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/koffice/debian/cdbs/debian-qt-kde.mk index b93e7c154..a803f50d6 100644 --- a/debian/wheezy/applications/koffice/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/koffice/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/koffice/debian/control b/debian/wheezy/applications/koffice/debian/control index ed66aecc6..57604185f 100644 --- a/debian/wheezy/applications/koffice/debian/control +++ b/debian/wheezy/applications/koffice/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Ral Snchez Siles -Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.4 Homepage: http://www.koffice.org diff --git a/debian/wheezy/applications/koffice/debian/patches/.gitignore b/debian/wheezy/applications/koffice/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/koffice/debian/patches/series b/debian/wheezy/applications/koffice/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/koffice/debian/rules b/debian/wheezy/applications/koffice/debian/rules index ed91a11c3..495d85db8 100755 --- a/debian/wheezy/applications/koffice/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/konversation/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/konversation/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/konversation/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/konversation/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kpilot/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kpilot/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kpilot/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kpilot/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk index 345cc0a61..fb36ac52f 100644 --- a/debian/wheezy/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kpowersave.cmake/debian/control b/debian/wheezy/applications/kpowersave.cmake/debian/control index 3764a2501..69515ab10 100644 --- a/debian/wheezy/applications/kpowersave.cmake/debian/control +++ b/debian/wheezy/applications/kpowersave.cmake/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Michael Biebl -Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs14-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, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, libtool, libltdl-dev, cmake Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/debian/wheezy/applications/kpowersave.cmake/debian/patches/.gitignore b/debian/wheezy/applications/kpowersave.cmake/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/kpowersave.cmake/debian/patches/series b/debian/wheezy/applications/kpowersave.cmake/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kpowersave.cmake/debian/rules b/debian/wheezy/applications/kpowersave.cmake/debian/rules index 0d2383bae..6d3ac5584 100755 --- a/debian/wheezy/applications/kpowersave.cmake/debian/rules +++ b/debian/wheezy/applications/kpowersave.cmake/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kpowersave/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kpowersave/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kpowersave/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kpowersave/debian/control b/debian/wheezy/applications/kpowersave/debian/control index 98d35e654..9de632947 100644 --- a/debian/wheezy/applications/kpowersave/debian/control +++ b/debian/wheezy/applications/kpowersave/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Michael Biebl -Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13 Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/debian/wheezy/applications/kpowersave/debian/patches/.gitignore b/debian/wheezy/applications/kpowersave/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/kpowersave/debian/patches/series b/debian/wheezy/applications/kpowersave/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kpowersave/debian/rules b/debian/wheezy/applications/kpowersave/debian/rules index 0cf9afbec..fb0e95a07 100755 --- a/debian/wheezy/applications/kpowersave/debian/rules +++ b/debian/wheezy/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/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/krecipes/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/krecipes/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/krecipes/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/krecipes/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/krename/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/krename/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/krename/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/krename/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/krename/debian/control b/debian/wheezy/applications/krename/debian/control index 647940933..87d98d5d8 100644 --- a/debian/wheezy/applications/krename/debian/control +++ b/debian/wheezy/applications/krename/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Richard A. Johnson -Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: krename-trinity diff --git a/debian/wheezy/applications/krename/debian/patches/series b/debian/wheezy/applications/krename/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/krename/debian/rules b/debian/wheezy/applications/krename/debian/rules index 4983ad699..7df9beee2 100755 --- a/debian/wheezy/applications/krename/debian/rules +++ b/debian/wheezy/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/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/krusader/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/krusader/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/krusader/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/krusader/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/krusader/debian/control b/debian/wheezy/applications/krusader/debian/control index cf06f9ab8..c434dd86d 100644 --- a/debian/wheezy/applications/krusader/debian/control +++ b/debian/wheezy/applications/krusader/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 5), libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://krusader.sourceforge.net diff --git a/debian/wheezy/applications/krusader/debian/patches/.gitignore b/debian/wheezy/applications/krusader/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/krusader/debian/patches/series b/debian/wheezy/applications/krusader/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/krusader/debian/rules b/debian/wheezy/applications/krusader/debian/rules index 4b297b1ae..d27f15ff5 100755 --- a/debian/wheezy/applications/krusader/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/ksensors/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/ksensors/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/ksensors/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/ksensors/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/ksensors/debian/control b/debian/wheezy/applications/ksensors/debian/control index f0ba5d2d4..e7de2b810 100644 --- a/debian/wheezy/applications/ksensors/debian/control +++ b/debian/wheezy/applications/ksensors/debian/control @@ -2,7 +2,7 @@ Source: ksensors-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>> 5), cdbs, autotools-dev, automake, autoconf, libtool, libsensors4-dev, tdelibs14-trinity-dev, imagemagick +Build-Depends: debhelper (>> 5), quilt, cdbs, autotools-dev, automake, autoconf, libtool, libsensors4-dev, tdelibs14-trinity-dev, imagemagick Build-Conflicts: autoconf2.13 Standards-Version: 3.8.3 diff --git a/debian/wheezy/applications/ksensors/debian/patches/series b/debian/wheezy/applications/ksensors/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/ksensors/debian/rules b/debian/wheezy/applications/ksensors/debian/rules index 8b97ef030..8030d443a 100755 --- a/debian/wheezy/applications/ksensors/debian/rules +++ b/debian/wheezy/applications/ksensors/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 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/kshowmail/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kshowmail/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/kshowmail/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kshowmail/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kshutdown/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kshutdown/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/kshutdown/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kshutdown/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/ksystemlog/debian/control b/debian/wheezy/applications/ksystemlog/debian/control index a2266c11c..090c9bdaf 100644 --- a/debian/wheezy/applications/ksystemlog/debian/control +++ b/debian/wheezy/applications/ksystemlog/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ksystemlog-trinity diff --git a/debian/wheezy/applications/ksystemlog/debian/patches/.gitignore b/debian/wheezy/applications/ksystemlog/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/ksystemlog/debian/patches/series b/debian/wheezy/applications/ksystemlog/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/ksystemlog/debian/rules b/debian/wheezy/applications/ksystemlog/debian/rules index 5b9d63684..f28f54627 100755 --- a/debian/wheezy/applications/ksystemlog/debian/rules +++ b/debian/wheezy/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/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/ktorrent/debian/cdbs/debian-qt-kde.mk index b93e7c154..a803f50d6 100644 --- a/debian/wheezy/applications/ktorrent/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/ktorrent/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/ktorrent/debian/control b/debian/wheezy/applications/ktorrent/debian/control index b51a9b726..d2916b49e 100644 --- a/debian/wheezy/applications/ktorrent/debian/control +++ b/debian/wheezy/applications/ktorrent/debian/control @@ -2,7 +2,7 @@ Source: ktorrent-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0), quilt, cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ktorrent-trinity diff --git a/debian/wheezy/applications/ktorrent/debian/patches/.gitignore b/debian/wheezy/applications/ktorrent/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/ktorrent/debian/patches/series b/debian/wheezy/applications/ktorrent/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/ktorrent/debian/rules b/debian/wheezy/applications/ktorrent/debian/rules index d0046eb44..862c88e23 100755 --- a/debian/wheezy/applications/ktorrent/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/kuickshow/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kuickshow/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kuickshow/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kuickshow/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kuickshow/debian/control b/debian/wheezy/applications/kuickshow/debian/control index 5244beea1..90492e544 100644 --- a/debian/wheezy/applications/kuickshow/debian/control +++ b/debian/wheezy/applications/kuickshow/debian/control @@ -2,7 +2,7 @@ Source: kuickshow-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs14-trinity-dev, imlib11-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, tdelibs14-trinity-dev, imlib11-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kuickshow-trinity diff --git a/debian/wheezy/applications/kuickshow/debian/patches/series b/debian/wheezy/applications/kuickshow/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kuickshow/debian/rules b/debian/wheezy/applications/kuickshow/debian/rules index 46fe966da..1f3a7d8fc 100755 --- a/debian/wheezy/applications/kuickshow/debian/rules +++ b/debian/wheezy/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/tde diff --git a/debian/wheezy/applications/kvirc/debian/control b/debian/wheezy/applications/kvirc/debian/control index 620e8e29c..07a222fa5 100644 --- a/debian/wheezy/applications/kvirc/debian/control +++ b/debian/wheezy/applications/kvirc/debian/control @@ -1,5 +1,5 @@ Source: kvirc-trinity -Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), tdelibs14-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool, libltdl-dev Section: net Priority: optional Maintainer: Timothy Pearson diff --git a/debian/wheezy/applications/kvirc/debian/patches/.gitignore b/debian/wheezy/applications/kvirc/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/kvirc/debian/patches/series b/debian/wheezy/applications/kvirc/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kvirc/debian/rules b/debian/wheezy/applications/kvirc/debian/rules index 0cb35b452..d0de2524f 100755 --- a/debian/wheezy/applications/kvirc/debian/rules +++ b/debian/wheezy/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/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/kvkbd/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kvkbd/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/kvkbd/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/kvkbd/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/kvkbd/debian/control b/debian/wheezy/applications/kvkbd/debian/control index 9377fc71b..ee7ec6d2e 100644 --- a/debian/wheezy/applications/kvkbd/debian/control +++ b/debian/wheezy/applications/kvkbd/debian/control @@ -2,7 +2,7 @@ Source: kvkbd-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 5), cdbs, libxtst-dev, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, libxtst-dev, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://pan4os.info/main/index.php diff --git a/debian/wheezy/applications/kvkbd/debian/patches/.gitignore b/debian/wheezy/applications/kvkbd/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/kvkbd/debian/patches/series b/debian/wheezy/applications/kvkbd/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/kvkbd/debian/rules b/debian/wheezy/applications/kvkbd/debian/rules index 0f564108e..1ac5329b7 100755 --- a/debian/wheezy/applications/kvkbd/debian/rules +++ b/debian/wheezy/applications/kvkbd/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/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/piklab/debian/control b/debian/wheezy/applications/piklab/debian/control index 984b4b234..6314b47e9 100644 --- a/debian/wheezy/applications/piklab/debian/control +++ b/debian/wheezy/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, tdelibs14-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://piklab.sourceforge.net/ diff --git a/debian/wheezy/applications/piklab/debian/patches/.gitignore b/debian/wheezy/applications/piklab/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/piklab/debian/patches/series b/debian/wheezy/applications/piklab/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/piklab/debian/rules b/debian/wheezy/applications/piklab/debian/rules index 6d0a1d510..d15b8b977 100755 --- a/debian/wheezy/applications/piklab/debian/rules +++ b/debian/wheezy/applications/piklab/debian/rules @@ -26,7 +26,9 @@ else CFLAGS += -O2 endif -config: config-stamp +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +config: post-patches config-stamp config-stamp: configure dh_testdir @@ -39,8 +41,6 @@ config-stamp: configure make -f admin/Makefile.common cvs touch debian/stamp-bootstrap - $(MAKE) -f /usr/share/quilt/quilt.make patch - ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif @@ -62,7 +62,7 @@ build-stamp: config-stamp #docbook-to-man debian/piklab.sgml > piklab.1 touch $@ -clean: +clean:: dh_testdir dh_testroot @@ -80,7 +80,6 @@ clean: rm -f po/*.gmo rm -f src/common/global/svn_revision/svn_revision.h rm -f config.sub config.guess config.status config.log - $(MAKE) -f /usr/share/quilt/quilt.make unpatch dh_clean install: build-stamp diff --git a/debian/wheezy/applications/qt4-tqt-theme-engine/debian/control b/debian/wheezy/applications/qt4-tqt-theme-engine/debian/control index 9c2a37a0e..29d985d0a 100644 --- a/debian/wheezy/applications/qt4-tqt-theme-engine/debian/control +++ b/debian/wheezy/applications/qt4-tqt-theme-engine/debian/control @@ -2,7 +2,7 @@ Source: qt4-tqt-theme-engine Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libqt4-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libqt4-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: qt4-tqt-theme-engine diff --git a/debian/wheezy/applications/qt4-tqt-theme-engine/debian/patches/series b/debian/wheezy/applications/qt4-tqt-theme-engine/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/qt4-tqt-theme-engine/debian/rules b/debian/wheezy/applications/qt4-tqt-theme-engine/debian/rules index 2cde95722..19ea67382 100755 --- a/debian/wheezy/applications/qt4-tqt-theme-engine/debian/rules +++ b/debian/wheezy/applications/qt4-tqt-theme-engine/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/class/qmake.mk include /usr/share/cdbs/1/rules/debhelper.mk diff --git a/debian/wheezy/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/rosegarden/debian/cdbs/debian-qt-kde.mk index 5e704aa4a..c5d8ecfd3 100644 --- a/debian/wheezy/applications/rosegarden/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/rosegarden/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/rosegarden/debian/control b/debian/wheezy/applications/rosegarden/debian/control index 3b0310398..386c0f7db 100644 --- a/debian/wheezy/applications/rosegarden/debian/control +++ b/debian/wheezy/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, cmake, tdelibs14-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, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev Standards-Version: 3.8.4 Homepage: http://www.rosegardenmusic.com/ diff --git a/debian/wheezy/applications/rosegarden/debian/patches/.gitignore b/debian/wheezy/applications/rosegarden/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/rosegarden/debian/patches/series b/debian/wheezy/applications/rosegarden/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/rosegarden/debian/rules b/debian/wheezy/applications/rosegarden/debian/rules index 3fc2b777e..1bac8145d 100755 --- a/debian/wheezy/applications/rosegarden/debian/rules +++ b/debian/wheezy/applications/rosegarden/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/smb4k/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/smb4k/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/smb4k/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/smb4k/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/tde-guidance/debian/control b/debian/wheezy/applications/tde-guidance/debian/control index afc565441..25ac915af 100644 --- a/debian/wheezy/applications/tde-guidance/debian/control +++ b/debian/wheezy/applications/tde-guidance/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 5), chrpath, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, tdelibs14-trinity-dev, libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata diff --git a/debian/wheezy/applications/tde-guidance/debian/patches/.gitignore b/debian/wheezy/applications/tde-guidance/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/tde-guidance/debian/patches/series b/debian/wheezy/applications/tde-guidance/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/tde-guidance/debian/rules b/debian/wheezy/applications/tde-guidance/debian/rules index 0cf0d64e7..ad10455d4 100755 --- a/debian/wheezy/applications/tde-guidance/debian/rules +++ b/debian/wheezy/applications/tde-guidance/debian/rules @@ -5,7 +5,7 @@ DEB_PYTHON_SYSTEM = pysupport include /usr/share/cdbs/1/rules/debhelper.mk #include /usr/share/cdbs/1/class/python-distutils.mk include debian/python-distutils-jaunty.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp diff --git a/debian/wheezy/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk index 5e704aa4a..c5d8ecfd3 100644 --- a/debian/wheezy/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/tde-style-qtcurve/debian/control b/debian/wheezy/applications/tde-style-qtcurve/debian/control index 9df97ecc5..ce0609dde 100644 --- a/debian/wheezy/applications/tde-style-qtcurve/debian/control +++ b/debian/wheezy/applications/tde-style-qtcurve/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Bastian Venthur -Build-Depends: debhelper (>= 5), tdelibs14-trinity-dev, cmake, cdbs +Build-Depends: debhelper (>= 5), quilt, tdelibs14-trinity-dev, cmake, cdbs Standards-Version: 3.8.4 Package: tde-style-qtcurve-trinity diff --git a/debian/wheezy/applications/tde-style-qtcurve/debian/patches/.gitignore b/debian/wheezy/applications/tde-style-qtcurve/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/tde-style-qtcurve/debian/patches/series b/debian/wheezy/applications/tde-style-qtcurve/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/tde-style-qtcurve/debian/rules b/debian/wheezy/applications/tde-style-qtcurve/debian/rules index 685703a85..f697a7e99 100755 --- a/debian/wheezy/applications/tde-style-qtcurve/debian/rules +++ b/debian/wheezy/applications/tde-style-qtcurve/debian/rules @@ -13,7 +13,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/tde-systemsettings/debian/control b/debian/wheezy/applications/tde-systemsettings/debian/control index 811961829..e2fa87c3b 100644 --- a/debian/wheezy/applications/tde-systemsettings/debian/control +++ b/debian/wheezy/applications/tde-systemsettings/debian/control @@ -2,7 +2,7 @@ Source: tde-systemsettings-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), patchutils (>= 0.2.25), tdelibs14-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), quilt, patchutils (>= 0.2.25), tdelibs14-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tde-systemsettings-trinity diff --git a/debian/wheezy/applications/tde-systemsettings/debian/patches/.gitignore b/debian/wheezy/applications/tde-systemsettings/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/tde-systemsettings/debian/patches/series b/debian/wheezy/applications/tde-systemsettings/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/tde-systemsettings/debian/rules b/debian/wheezy/applications/tde-systemsettings/debian/rules index ed2e13a90..7e11dd034 100755 --- a/debian/wheezy/applications/tde-systemsettings/debian/rules +++ b/debian/wheezy/applications/tde-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/tde diff --git a/debian/wheezy/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/tdeio-apt/debian/control b/debian/wheezy/applications/tdeio-apt/debian/control index 02d55c5ab..8d4a84cdd 100644 --- a/debian/wheezy/applications/tdeio-apt/debian/control +++ b/debian/wheezy/applications/tdeio-apt/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Emmanuel Bouthenot -Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdeio-apt-trinity diff --git a/debian/wheezy/applications/tdeio-apt/debian/patches/.gitignore b/debian/wheezy/applications/tdeio-apt/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/tdeio-apt/debian/patches/series b/debian/wheezy/applications/tdeio-apt/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/tdeio-apt/debian/rules b/debian/wheezy/applications/tdeio-apt/debian/rules index 9e8c0f52b..5b3afa420 100755 --- a/debian/wheezy/applications/tdeio-apt/debian/rules +++ b/debian/wheezy/applications/tdeio-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/tde diff --git a/debian/wheezy/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk index 5e704aa4a..c5d8ecfd3 100644 --- a/debian/wheezy/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/tdeio-locate/debian/control b/debian/wheezy/applications/tdeio-locate/debian/control index 69dfc5707..6b61a5af0 100644 --- a/debian/wheezy/applications/tdeio-locate/debian/control +++ b/debian/wheezy/applications/tdeio-locate/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Tobi Vollebregt -Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake +Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake Standards-Version: 3.8.4 Package: tdeio-locate-trinity diff --git a/debian/wheezy/applications/tdeio-locate/debian/patches/series b/debian/wheezy/applications/tdeio-locate/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/tdeio-locate/debian/rules b/debian/wheezy/applications/tdeio-locate/debian/rules index 55427aa5d..01ccf387a 100755 --- a/debian/wheezy/applications/tdeio-locate/debian/rules +++ b/debian/wheezy/applications/tdeio-locate/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/tdeio-umountwrapper/debian/control b/debian/wheezy/applications/tdeio-umountwrapper/debian/control index 49703991a..5ac7d89cc 100644 --- a/debian/wheezy/applications/tdeio-umountwrapper/debian/control +++ b/debian/wheezy/applications/tdeio-umountwrapper/debian/control @@ -2,7 +2,7 @@ Source: tdeio-umountwrapper-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>> 5), cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>> 5), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdeio-umountwrapper-trinity diff --git a/debian/wheezy/applications/tdeio-umountwrapper/debian/patches/.gitignore b/debian/wheezy/applications/tdeio-umountwrapper/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/tdeio-umountwrapper/debian/patches/series b/debian/wheezy/applications/tdeio-umountwrapper/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/tdeio-umountwrapper/debian/rules b/debian/wheezy/applications/tdeio-umountwrapper/debian/rules index ddfd17b35..27e351eba 100755 --- a/debian/wheezy/applications/tdeio-umountwrapper/debian/rules +++ b/debian/wheezy/applications/tdeio-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/tde diff --git a/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk index 345cc0a61..fb36ac52f 100644 --- a/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/tdenetworkmanager/debian/rules b/debian/wheezy/applications/tdenetworkmanager/debian/rules index 00ac9877f..c08c59d57 100755 --- a/debian/wheezy/applications/tdenetworkmanager/debian/rules +++ b/debian/wheezy/applications/tdenetworkmanager/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/tdepowersave/debian/control b/debian/wheezy/applications/tdepowersave/debian/control index de60dd3ae..ca4a5def2 100644 --- a/debian/wheezy/applications/tdepowersave/debian/control +++ b/debian/wheezy/applications/tdepowersave/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Michael Biebl -Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13 Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/debian/wheezy/applications/tdepowersave/debian/patches/.gitignore b/debian/wheezy/applications/tdepowersave/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/tdepowersave/debian/patches/series b/debian/wheezy/applications/tdepowersave/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/tdepowersave/debian/rules b/debian/wheezy/applications/tdepowersave/debian/rules index 485481ef7..f74a76605 100755 --- a/debian/wheezy/applications/tdepowersave/debian/rules +++ b/debian/wheezy/applications/tdepowersave/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/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/tdesudo/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tdesudo/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/tdesudo/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/tdesudo/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/tdesudo/debian/control b/debian/wheezy/applications/tdesudo/debian/control index c5ef4bdee..f71c78ab3 100644 --- a/debian/wheezy/applications/tdesudo/debian/control +++ b/debian/wheezy/applications/tdesudo/debian/control @@ -2,7 +2,7 @@ Source: tdesudo-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>> 5), cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>> 5), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdesudo-trinity diff --git a/debian/wheezy/applications/tdesudo/debian/patches/.gitignore b/debian/wheezy/applications/tdesudo/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/tdesudo/debian/patches/series b/debian/wheezy/applications/tdesudo/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/tdesudo/debian/rules b/debian/wheezy/applications/tdesudo/debian/rules index 443a43aed..83c31e0c9 100755 --- a/debian/wheezy/applications/tdesudo/debian/rules +++ b/debian/wheezy/applications/tdesudo/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/tde diff --git a/debian/wheezy/applications/tdesvn/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tdesvn/debian/cdbs/debian-qt-kde.mk index 5e704aa4a..c5d8ecfd3 100644 --- a/debian/wheezy/applications/tdesvn/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/tdesvn/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/tdesvn/debian/rules b/debian/wheezy/applications/tdesvn/debian/rules index 37d2a944b..0e1c5995b 100755 --- a/debian/wheezy/applications/tdesvn/debian/rules +++ b/debian/wheezy/applications/tdesvn/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/tork/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tork/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/tork/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/tork/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) #include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/twin-style-crystal/debian/control b/debian/wheezy/applications/twin-style-crystal/debian/control index a5a93ab76..fc2c9e65a 100644 --- a/debian/wheezy/applications/twin-style-crystal/debian/control +++ b/debian/wheezy/applications/twin-style-crystal/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Sune Vuorela -Build-Depends: debhelper (>= 5.0.0), cdbs, tdebase-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, tdebase-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: twin-style-crystal-trinity diff --git a/debian/wheezy/applications/twin-style-crystal/debian/patches/.gitignore b/debian/wheezy/applications/twin-style-crystal/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/twin-style-crystal/debian/patches/series b/debian/wheezy/applications/twin-style-crystal/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/twin-style-crystal/debian/rules b/debian/wheezy/applications/twin-style-crystal/debian/rules index 4fb0c5bb5..00b9013fa 100755 --- a/debian/wheezy/applications/twin-style-crystal/debian/rules +++ b/debian/wheezy/applications/twin-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/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man diff --git a/debian/wheezy/applications/wlassistant/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/wlassistant/debian/cdbs/debian-qt-kde.mk index 5e704aa4a..c5d8ecfd3 100644 --- a/debian/wheezy/applications/wlassistant/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/wlassistant/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/debian/wheezy/applications/wlassistant/debian/control b/debian/wheezy/applications/wlassistant/debian/control index 3a49d47ab..2b3517258 100644 --- a/debian/wheezy/applications/wlassistant/debian/control +++ b/debian/wheezy/applications/wlassistant/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Achim Bohnet , Mark Purcell -Build-Depends: debhelper (>= 4.1.0), cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev +Build-Depends: debhelper (>= 4.1.0), quilt, cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev Standards-Version: 3.8.4 Package: wlassistant-trinity diff --git a/debian/wheezy/applications/wlassistant/debian/patches/.gitignore b/debian/wheezy/applications/wlassistant/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/wheezy/applications/wlassistant/debian/patches/series b/debian/wheezy/applications/wlassistant/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/wheezy/applications/wlassistant/debian/rules b/debian/wheezy/applications/wlassistant/debian/rules index 1a8fdeafb..5e6564e64 100755 --- a/debian/wheezy/applications/wlassistant/debian/rules +++ b/debian/wheezy/applications/wlassistant/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/debian/wheezy/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/yakuake/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/wheezy/applications/yakuake/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/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 := -- cgit v1.2.1