[SCM] pkg-kde-jenkins packaging branch, master, updated. 819a4e2608dab41a072f09e953292b59196bd946

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-jenkins.git;a=commitdiff;h=9c91eb6

The following commit has been merged in the master branch:
commit 9c91eb672297cb275c5e361653b966bcbdfef9f5
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri May 6 13:46:02 2016 +0200

    Select the branches to merge with
---
 scripts/prepare_build.sh | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index d44fb9a..6e733fe 100755
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -15,10 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-# TODO: get the new upstream release with uscan if there is no upstream git
-# TODO: build against experimental, do we need to merge experimental into
-# unstable? or into local?
-
 set -x
 set -e
 
@@ -99,9 +95,21 @@ prepare_branches () {
         git checkout -B master refs/remotes/debian/master
     fi
     git merge --no-edit refs/remotes/local/master
-    for ref in refs/remotes/local/"$LOCAL_BRANCH" \
-               refs/remotes/debian/unstable \
-               refs/remotes/local/unstable; do
+    declare -a REFS
+    case "$LOCAL_BRANCH" in
+        master)
+            REFS+=("refs/remotes/debian/experimental")
+        experimental)
+            REFS+=("refs/remotes/local/experimental"
+                   "refs/remotes/debian/unstable")
+        unstable)
+            REFS+=("refs/remotes/local/unstable")
+            ;;
+        *)
+            REFS+=("refs/remotes/local/$LOCAL_BRANCH")
+            ;;
+    esac
+    for ref in "${REFS[@]}"; do
         if git show-ref --verify --quiet "$ref"; then
             git merge --no-edit "$ref"
         fi

-- 
pkg-kde-jenkins packaging