[pkg-wine-party] [wine] 01/05: Pull upstream branch from Debian before importing new Wine version.

[Jens Reyer]

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

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

commit 20a0345c7837acba683954bfe33034ad5361d8c7
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Tue Jan 17 16:00:16 2017 +0100

    Pull upstream branch from Debian before importing new Wine version.
---
 debian/scripts/import | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/scripts/import b/debian/scripts/import
index b9cde13..a6fd313 100755
--- a/debian/scripts/import
+++ b/debian/scripts/import
@@ -19,9 +19,12 @@ git update-index --assume-unchanged configure include/config.h.in
 
 # pull specified tag from upstream repository
 version="$1"
+debian="https://anonscm.debian.org/git/pkg-wine/wine.git"
+upstream_branch="upstream"
 winehq="git://source.winehq.org/git/wine.git"
 tag="wine-$version"
-git checkout upstream
+git checkout ${upstream_branch}
+git pull $debian ${upstream_branch}
 git pull --no-edit $winehq tag "$tag" || echo "unable to fetch tag $tag"
 
 # merge upstream into master (favoring "their" changes)

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