summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2016-09-23 07:18:25 -0700
committerSean Whitton <spwhitton@spwhitton.name>2016-09-23 07:18:25 -0700
commit44bf90c19f635926c2886d9c09313b10cf077a4b (patch)
tree72cf6277b68e8919ef38338a611fa8e79429c645
parent7e181ee5e7d20f06d125ae67e629a2b6018637bc (diff)
changelog
-rw-r--r--debian/changelog10
-rw-r--r--debian/gbp.conf1
2 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index fd250ba..b30f4f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+seq-el (1.11-2) UNRELEASED; urgency=medium
+
+ [ Lev Lamberov ]
+ * Update watch file.
+
+ [ Sean Whitton ]
+ * Add upstream-branch to gbp.conf.
+
+ -- Sean Whitton <spwhitton@spwhitton.name> Fri, 23 Sep 2016 07:17:08 -0700
+
seq-el (1.11-1) unstable; urgency=medium
* Initial release. (Closes: #815859)
diff --git a/debian/gbp.conf b/debian/gbp.conf
index ebbc046..79273aa 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,6 @@
[DEFAULT]
debian-branch = master
+upstream-branch = upstream
upstream-tag = %(version)s
debian-tag = debian/%(version)s