summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2013-07-02 16:56:54 +0200
committerMichael Vogt <mvo@ubuntu.com>2013-07-02 16:56:54 +0200
commit71de6e782f56aa22b7aba730baeee291e9c62401 (patch)
tree4ce525ade3f6132b2a3838d9607bc4a75a199f71 /debian
parent56363109dac51dffb6ec8491728e0bc934a15fa1 (diff)
debian/gbp.conf: change build branch to ubuntu/master
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/gbp.conf2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ae8141966..8f62e36a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
apt (0.9.9ubuntu1) UNRELEASEDsaucy; urgency=low
* merged from the debian/sid branch
+ - debian/gbp.conf: change build branch to ubuntu/master
-- Michael Vogt <michael.vogt@ubuntu.com> Tue, 02 Jul 2013 16:48:08 +0200
diff --git a/debian/gbp.conf b/debian/gbp.conf
index db22e3e1e..a9da2423b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,5 +2,5 @@
prebuild = ./prepare-release pre-export
postbuild = ./prepare-release post-build
export-dir = ../build-area
-debian-branch = debian/sid
+debian-branch = ubuntu/master
debian-tag = %(version)s