[Pkg-telepathy-commits] [empathy] 03/03: Reset gbp.conf for unstable

[Simon McVittie]

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

smcv pushed a commit to branch debian
in repository empathy.

commit b59df2b141a82f38042b6467983515b77a5a2efc
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Mar 25 16:49:54 2014 +0000

    Reset gbp.conf for unstable
---
 debian/changelog | 1 +
 debian/gbp.conf  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ffeb42a..0553152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ empathy (3.12.0-1) UNRELEASED; urgency=medium
 
   [ Simon McVittie ]
   * Build against cogl and GOA from unstable
+  * Reset gbp.conf for unstable
 
  -- Laurent Bigonville <bigon at debian.org>  Mon, 24 Mar 2014 18:16:07 +0100
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index c8de0d4..9822eec 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = debian-experimental
+debian-branch = debian
 upstream-branch = upstream
 pristine-tar = True
 compression = xz

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