aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2014-06-28 12:00:12 +0200
committerSebastian Dröge <sebastian@centricular.com>2014-06-28 12:00:12 +0200
commit8660032b771f0eaaf87136723e31866d5340fbd9 (patch)
treeb0dd8bb8a4d32309e7ffef3335db74ee27905bca
parent247000749913615203cbad0770d574077d777326 (diff)
Update gbp.conf again
-rw-r--r--debian/gbp.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 0d042a7f..ebb3d050 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
[DEFAULT]
-upstream-branch = upstream-experimental
-debian-branch = debian-experimental
+upstream-branch = upstream
+debian-branch = master
pristine-tar = True
upstream-tag = upstream/%(version)s
debian-tag = debian/%(version)s