[Pkg-samba-maint] [samba] 02/07: New upstream release.

[Jelmer Vernooij]

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

jelmer pushed a commit to branch experimental
in repository samba.

commit 1f85a63fda53c40df384cc8e2273fbb61542c96e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Dec 7 15:34:40 2014 +0000

    New upstream release.
    
    Change-Id: I57f39648c60e19e140507edccd2949f130830715
---
 debian/changelog | 6 ++++++
 debian/gbp.conf  | 2 +-
 debian/watch     | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 525bed2..eea90e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+samba (2:4.2.0~rc2+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Sun, 07 Dec 2014 15:34:36 +0000
+
 samba (2:4.1.13+dfsg-3) unstable; urgency=medium
 
   * Update debian/rules to allow support for multiple upstream ldb
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 2f30dd2..ec83e16 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 pristine-tar = True
-upstream-branch = upstream_4.1
+upstream-branch = upstream_4.2
 # don't hardcode the debian branch
 ignore-branch = True
 
diff --git a/debian/watch b/debian/watch
index 68a1038..00763ab 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/tp/~alpha1~tp/;s/alpha/~alpha/;s/beta/~beta/;s/rc/~rc/,dversionmangle=s/\+dfsg\d*$//" \
-	  http://ftp.samba.org/pub/samba/stable samba-(.*).tar.gz
+	  http://ftp.samba.org/pub/samba/rc samba-(.*).tar.gz

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