[Pkg-samba-maint] [samba] 01/04: Update gbp.conf with debian-branch = master

[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 c17ff64aa552304d462ee31d1fd2e8a1c8cd4cd5
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Thu Dec 8 08:51:35 2016 +0100

    Update gbp.conf with debian-branch = master
    
    and mention this in README.source
---
 debian/README.source | 4 +++-
 debian/gbp.conf      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 59fa18b..4a10102 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -15,9 +15,11 @@ Merging upstream releases
 Importing a new upstream version can be done like this:
 
 # set target version
-upstream_version=4.4.4
+upstream_version=4.5.3
 # go to git repo
 cd $GIT_DIR
+# Check gbp.conf (especially debian-branch)
+cat debian/gbp.conf
 # Import upstream
 git remote add upstream https://git.samba.org/samba.git
 git fetch upstream
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 83a86d7..db0c253 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -13,4 +13,4 @@ filter = [
   '*chm',
   ]
 filter-pristine-tar = True
-debian-branch = experimental
+debian-branch = master

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