[Pkg-telepathy-commits] [telepathy-glib] 105/111: Revert "debian/gbp.conf, debian/watch: branch for experimental"

[Simon McVittie]

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

smcv pushed a commit to branch debian
in repository telepathy-glib.

commit 7c555d1563d75414a34c7bc87ca0fe146d2a1241
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Mar 19 14:34:47 2014 +0000

    Revert "debian/gbp.conf, debian/watch: branch for experimental"
    
    This reverts commit 7552189de5f8b2177de01d7d70a2fd8b8deb41f2.
---
 debian/gbp.conf | 4 ++--
 debian/watch    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 26870fe..6837223 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
-debian-branch = debian-experimental
-upstream-branch = upstream-experimental
+debian-branch = debian
+upstream-branch = upstream
 pristine-tar = True
 
 [git-buildpackage]
diff --git a/debian/watch b/debian/watch
index edd4059..512f516 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-([0-9]+\.[0-9]*\..*).tar.gz
+http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-([0-9]+\.[0-9]*[24680]\..*).tar.gz

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