[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/3.3.90.2-1-22-g16a60a1

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit 8dc67aee4e91f28c311ca215e3d1d0a73dfb99d7
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Mon Apr 16 15:30:38 2012 +0200

    debian/gbp.conf: Switch to unstable branch

diff --git a/debian/changelog b/debian/changelog
index 8d39374..cf16e90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ empathy (3.4.0-1) UNRELEASED; urgency=low
     - freedesktop-sound-theme has been renamed to sound-theme-freedesktop
   * debian/rules:
     - Compile with geoclue support enabled as intended (Closes: #663697)
+  * debian/gbp.conf: Switch to unstable branch
 
- -- Laurent Bigonville <bigon at debian.org>  Tue, 03 Apr 2012 11:06:17 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 16 Apr 2012 15:29:35 +0200
 
 empathy (3.3.90.2-1) experimental; urgency=low
 
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

-- 
Empathy packaging