[Pkg-samba-maint] [samba] 01/01: Improve debian/README.source

[Mathieu Parent]

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

sathieu pushed a commit to branch master
in repository samba.

commit 162fff8d18df91a5f97d8e493d993a7cafda0cd7
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Tue Jun 14 21:20:15 2016 +0200

    Improve debian/README.source
    
    Following Jelmer's comment
---
 debian/README.source | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index b51415d..59fa18b 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -19,14 +19,14 @@ upstream_version=4.4.4
 # go to git repo
 cd $GIT_DIR
 # Import upstream
-git checkout upstream_4.4
 git remote add upstream https://git.samba.org/samba.git
 git fetch upstream
-git merge "samba-${upstream_version}"
-# got to the Debian branch
+# go to the Debian branch
 git checkout master
 # Import latest version
-gbp import-orig --uscan -u "${upstream_version}+dfsg"
+gbp import-orig --uscan \
+  -u "${upstream_version}+dfsg" \
+  --upstream-vcs-tag "samba-${upstream_version}"
 # all done :)
 
 

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