DEB build scripts: several enhancements as follow:

- major rework of update_repositories.sh script, which now supports
multiple branches and provide better feedback to user.
- added support for pre-built extra dependency packages. A user can now
use Slavek Banko's binary packages instead of building the extra
dependency locally. This removes a quite tedious process during the
setup of the building environment.
- bug fixes and more user friendly folder names.
- improved README to cover the complete process until TDE installation.

Special thanks to Gregory Guy <[email protected]> for testing and
feedback done so far.

Signed-off-by: Michele Calgaro <[email protected]>

2 files changed, 0 insertions, 78 deletions

diff --git a/debian/_buildscripts/local/scripts/hook examples/applications/kaffeine/kaffeine-wizard.diff b/debian/_buildscripts/local/scripts/hook examples/applications/kaffeine/kaffeine-wizard.diff
deleted file mode 100644
index c35ba6516..000000000
--- a/debian/_buildscripts/local/scripts/hook examples/applications/kaffeine/kaffeine-wizard.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -urN kaffeine/kaffeine/src/kaffeine.cpp kaffeine.new/kaffeine/src/kaffeine.cpp
---- kaffeine/kaffeine/src/kaffeine.cpp	2013-03-02 15:47:14.000000000 -0600
-+++ kaffeine.new/kaffeine/src/kaffeine.cpp	2013-11-24 11:39:09.809430631 -0600
-@@ -683,7 +683,9 @@
- 	m_autoResizeTriple = new TDEToggleAction(i18n("Triple Size"), 0, ALT|Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotAutoresizeTriple()), actionCollection(), "view_auto_resize_triple");
- 
- 	m_playersMenu = new TDEActionMenu(i18n("&Player Engine"), actionCollection(), "options_player");
--	KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
-+  m_instWizard = new TDEAction(i18n("Installation &Wizard"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotInstWizard()), actionCollection(), "inst_wizard");
-+	
-+  KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
- 	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
- 	KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection(), "options_preferences");
- 
-@@ -1619,6 +1621,18 @@
- 	mute();
- }
- 
-+void Kaffeine::slotInstWizard()
-+{
-+  TQString stamp = locateLocal("appdata", "wizard_stamp_v0.7.1");
-+  InstWizard::showWizard();
-+
-+  TDEProcess process;
-+  process << "touch" << stamp;
-+  process.start(TDEProcess::Block, TDEProcess::Stderr);
-+  process.clearArguments();
-+}
-+
-+
- /********* DCOP INTERFACE *********/
- 
- void Kaffeine::openURL(TQString url)
-diff -urN kaffeine/kaffeine/src/kaffeine.h kaffeine.new/kaffeine/src/kaffeine.h
---- kaffeine/kaffeine/src/kaffeine.h	2013-03-02 15:47:14.000000000 -0600
-+++ kaffeine.new/kaffeine/src/kaffeine.h	2013-11-24 11:09:17.455756279 -0600
-@@ -193,6 +193,7 @@
- 	void slotDvbClient(bool,const TQString&,int,int,const TQString&);
- 	void slotNumKeyInput( int );
- 	void slotDVBNextBack( int );
-+  void slotInstWizard();
- 
- private:
- 	void autoresize();
-@@ -258,7 +259,8 @@
- 	TDEToggleAction* m_autoResizeTriple;
- 	TDEToggleAction* m_originalAspect;
- 	TDEToggleAction* m_toggleLayout;
--	TDEActionMenu* m_playersMenu;
-+	TDEActionMenu*   m_playersMenu;
-+  TDEAction*       m_instWizard;
- 	TDEToggleAction* m_sleepAfterPlay;
- 	TDEToggleAction* m_quitAfterPlay;
- 	TDEToggleAction* m_quitAfterPlaylist;
-diff -urN kaffeine/kaffeine/src/kaffeineui.rc kaffeine.new/kaffeine/src/kaffeineui.rc
---- kaffeine/kaffeine/src/kaffeineui.rc	2012-09-14 17:39:52.000000000 -0500
-+++ kaffeine.new/kaffeine/src/kaffeineui.rc	2013-11-24 11:10:15.335565312 -0600
-@@ -34,6 +34,7 @@
-   <Merge/>
-   <Menu noMerge="1" name="settings"><text>&amp;Settings</text>
-     <Action name="options_player"/>
-+    <Action name="inst_wizard"/>
-     <Separator/>
-     <Merge name="StandardToolBarMenuHandler"/>
-     <Action name="options_show_statusbar"/>
diff --git a/debian/_buildscripts/local/scripts/hook examples/applications/kaffeine/pre_build.sh b/debian/_buildscripts/local/scripts/hook examples/applications/kaffeine/pre_build.sh
deleted file mode 100755
index 96400d6e9..000000000
--- a/debian/_buildscripts/local/scripts/hook examples/applications/kaffeine/pre_build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-CURR_DIR=$PWD
-cd "$PKG_BUILD_PATH"
-
-# Apply patches
-if [ "$bool_COPY_PKG_SRC" = "y" ]; then
-  echo -e "${CLightPurple}Applying Kaffeine wizard patch${CNone}"
-  patch -p2 < "$HOOK_DIR/$PKG_NAME/kaffeine-wizard.diff"
-fi
-
-cd "$CURR_DIR"
-return 0