DEB build scripts:

1) updated application list.
2) fixed problem with .tdescminfo contents when branches are more recent
than master/r14.0.x.
3) fixed issue with detection of extra dependencies repository.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

7 files changed, 24 insertions, 9 deletions

diff --git a/debian/_buildscripts/local/06_applications_03.sh b/debian/_buildscripts/local/06_applications_03.sh
index 75a8a7e15..07a1f3e90 100755
--- a/debian/_buildscripts/local/06_applications_03.sh
+++ b/debian/_buildscripts/local/06_applications_03.sh
@@ -16,7 +16,6 @@ build_module "applications/kile"
 build_module "applications/kima"    
 build_module "applications/kkbswitch"
 build_module "applications/klcddimmer"
-build_module "applications/kmplayer"
 build_module "applications/kmyfirewall"
 build_module "applications/kmymoney"
 build_module "applications/knemo"
diff --git a/debian/_buildscripts/local/07_applications_04.sh b/debian/_buildscripts/local/07_applications_04.sh
index 2dda86fe4..e23b6226a 100755
--- a/debian/_buildscripts/local/07_applications_04.sh
+++ b/debian/_buildscripts/local/07_applications_04.sh
@@ -7,12 +7,12 @@ set_log_start
 
 build_module "applications/koffice"
 build_module "applications/koffice-i18n"
+build_module "applications/kmplayer"  # depends on koffice-trinity-dev
 build_module "applications/keximdb"
 build_module "applications/konversation"
 build_module "applications/kooldock"    
 build_module "applications/kopete-otr"
 build_module "applications/kpicosim"
-build_module "applications/kpilot"
 build_module "applications/kplayer"
 
 set_log_end
diff --git a/debian/_buildscripts/local/10_others_01.sh b/debian/_buildscripts/local/10_others_01.sh
index 8097c93fe..5f1908833 100755
--- a/debian/_buildscripts/local/10_others_01.sh
+++ b/debian/_buildscripts/local/10_others_01.sh
@@ -17,7 +17,7 @@ build_module "applications/kiosktool"
 build_module "applications/knights"         
 build_module "libraries/libksquirrel"
 build_module "applications/ksquirrel"
-build_module "applications/qt4-tqt-theme-engine"
+#build_module "applications/qt4-tqt-theme-engine"
 build_module "applications/rosegarden"
 build_module "applications/smartcardauth"
 build_module "applications/smb4k"
diff --git a/debian/_buildscripts/local/11_others_02.sh b/debian/_buildscripts/local/11_others_02.sh
index 6c98710a5..d32da9a42 100755
--- a/debian/_buildscripts/local/11_others_02.sh
+++ b/debian/_buildscripts/local/11_others_02.sh
@@ -13,7 +13,9 @@ if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
 	build_module "edeps/compiz-fusion-plugins-main-trinity"
 	build_module "edeps/compiz-fusion-plugins-extra-trinity"
 	build_module "edeps/compizconfig-python-trinity"
+	build_module "edeps/pilot-link"
 fi
 build_module "applications/compizconfig-backend-tdeconfig"
+build_module "applications/kpilot"
 
 set_log_end
diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh
index b3a403681..b037b7d09 100755
--- a/debian/_buildscripts/local/build_module.sh
+++ b/debian/_buildscripts/local/build_module.sh
@@ -275,7 +275,7 @@ if [ "$bool_COPY_MOD_SRC" = "y" ]; then
     echo "# TDE SCM module information" > "$MOD_BUILD_PATH/.tdescminfo"
     echo "Name: $MOD_NAME" >> "$MOD_BUILD_PATH/.tdescminfo"
     cd "$MOD_GIT_PATH"
-    MOD_BRANCH=`git branch --contains HEAD | grep -v "no branch" | head -n1 | cut -c 3-`
+    MOD_BRANCH=`git rev-parse --abbrev-ref HEAD | grep -v "no branch" | head -n1`
     COMMIT_HASH=`git rev-parse HEAD`
     echo "Revision: $MOD_BRANCH-$COMMIT_HASH" >> "$MOD_BUILD_PATH/.tdescminfo"
     git log -1 --pretty=format:"DateTime: %cd%n" --date=format:"%m/%d/%Y %H:%M" >> "$MOD_BUILD_PATH/.tdescminfo"
@@ -310,7 +310,7 @@ if [ "$bool_EXTRADEP_MOD" != "y"  -a  "$bool_COPY_PKGING_FILES" = "y" ]; then
 	# Default package name
 	# Calculate package version
 	cd $MOD_GIT_PATH
-	branch=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-`
+	branch=`git rev-parse --abbrev-ref HEAD | egrep -v "no branch|detached" | head -n1`
 	target_tag=`git tag | grep -F "$TDE_RELEASE" | head -n1`
 	tag=`git tag | \
 		sed "s|^\([^0-9]\)|\1.|" | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr -k 5,5nr | sed "s|^\([^0-9]\)\.|\1|" | \
diff --git a/debian/_buildscripts/local/internals/_pbuilder.sh b/debian/_buildscripts/local/internals/_pbuilder.sh
index cbcded647..870758df0 100755
--- a/debian/_buildscripts/local/internals/_pbuilder.sh
+++ b/debian/_buildscripts/local/internals/_pbuilder.sh
@@ -47,15 +47,29 @@ END_D05_01
 		# Get building branch from .tdescminfo file
 		if [[ -f "$MOD_BUILD_PATH/.tdescminfo" ]]; then
 			BUILD_BRANCH=`sed -n -r "s/^Revision: ([^-]+)-.*/\1/p" "$MOD_BUILD_PATH/.tdescminfo"`
+			bool_EDEPS_FOUND="n"
 			OLD_IFS=$IFS && IFS=$' \t'
 			while read l_branch l_repo l_component; do
 				if [ "$l_branch" = "$BUILD_BRANCH" ]; then
+					bool_EDEPS_FOUND="y"
 					cat <<END_D05_02 >> "$PBUILDER_DEPS_HOOK"
 echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.list
 END_D05_02
 					break
 				fi
 			done <<< $(cat "$SCRIPT_DIR/internals/extra_deps.txt" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$")
+			if [ "$bool_EDEPS_FOUND" != "y" ]; then
+			  # EDEPS repository not found, use default. This could happen when building from sub branches of the main package repo
+			while read l_branch l_repo l_component; do
+				if [ "$l_branch" = "default" ]; then
+					bool_EDEPS_FOUND="y"
+					cat <<END_D05_02 >> "$PBUILDER_DEPS_HOOK"
+echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.list
+END_D05_02
+					break
+				fi
+			done <<< $(cat "$SCRIPT_DIR/internals/extra_deps.txt" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$")
+			fi
 			IFS=$OLD_IFS
 		fi
 	fi
diff --git a/debian/_buildscripts/local/internals/extra_deps.txt b/debian/_buildscripts/local/internals/extra_deps.txt
index 0a764d9bc..b19514d84 100644
--- a/debian/_buildscripts/local/internals/extra_deps.txt
+++ b/debian/_buildscripts/local/internals/extra_deps.txt
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-# List of repositories for extra dependency packages
+# List of repositories for extra dependency packages.
+# The "default" repo will be used in case a match can't be found.
 EDEPS_REPO="
-# - For the time being use stable builds for extra dependencies
-#	master   http://mirror.ppa.trinitydesktop.org/trinity-testing deps
-	master   http://mirror.ppa.trinitydesktop.org/trinity-sb      deps-r14
+	default  http://mirror.ppa.trinitydesktop.org/trinity-testing deps
+	master   http://mirror.ppa.trinitydesktop.org/trinity-testing deps
 	r14.0.x  http://mirror.ppa.trinitydesktop.org/trinity-sb      deps-r14
 "