[pkg-wine-party] [wine] 110/114: Add support for stable release 1.8.x to the import script.

[Jens Reyer]

This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch stretch
in repository wine.

commit 91804fd916ccf3eaaafca48a710a2421f6293c9e
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Mon Jun 6 15:11:09 2016 +0200

    Add support for stable release 1.8.x to the import script.
    
    Store upstream on branch upstream-1.8.x, branched off from
    branch upstream at:
    
    commit 86f2ee2e3a49eca3b922ceacf8fe109887c615a7
    Merge: 407c32d a981d37
    Author: Michael Gilbert <mgilbert at debian.org>
    Date:   Sat Dec 19 17:53:54 2015 +0000
    
        Merge tag 'wine-1.8' of git://source.winehq.org/git/wine into upstream
---
 debian/scripts/import | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/debian/scripts/import b/debian/scripts/import
index 3affb39..84bb496 100755
--- a/debian/scripts/import
+++ b/debian/scripts/import
@@ -14,19 +14,31 @@ if [ ! -d ".git" ]; then
   exit 1
 fi
 
+version="$1"
+winehq="git://source.winehq.org/git/wine.git"
+tag="wine-$version"
+
+case $version in
+    1.8.*)
+        upstream_branch="upstream-1.8.x"
+        debian_branch="stretch"
+        ;;
+    *)
+        upstream_branch="upstream"
+        debian_branch="master"
+        ;;
+esac
+
 # ignore changes to files that will be automatically generated
 git update-index --assume-unchanged configure include/config.h.in
 
 # pull specified tag from upstream repository
-version="$1"
-winehq="git://source.winehq.org/git/wine.git"
-tag="wine-$version"
-git checkout upstream
+git checkout "$upstream_branch"
 git pull --no-edit $winehq tag "$tag" || echo "unable to fetch tag $tag"
 
 # merge upstream into master (favoring "their" changes)
-git checkout master
-git merge --strategy-option=theirs upstream
+git checkout "$debian_branch"
+git merge --strategy-option=theirs "$upstream_branch"
 
 # format the "New upstream release" message
 tag_time=`git cat-file tag "$tag" | sed -n 's/tagger .*<.*> \([0-9]*\) .*/\1/p'`

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git