summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Stephane Glondu <steph@glondu.net>2011-11-12 16:00:52 +0100
committerGravatar Stephane Glondu <steph@glondu.net>2011-11-12 16:08:31 +0100
commit41989bfbac1f88916a071e53250dc70afa7e7264 (patch)
tree8a900ac0ba39c7d64ce0ef8fb1f34c0ec732fe24
parent5f43edb15fbe34bf1f31a7155e40896baa067796 (diff)
Branches for squeeze-backports
-rw-r--r--debian/gbp.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c7..5a115618 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,4 @@
[DEFAULT]
pristine-tar = True
+upstream-branch = squeeze-backports/upstream
+debian-branch = squeeze-backports/master