[28719] in Source-Commits
locker-menu commit: Add debian/gbp.conf
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Sun Nov 13 20:43:59 2016
Date: Sun, 13 Nov 2016 20:43:55 -0500
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201611140143.uAE1htAZ020170@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/locker-menu/commit/217fbe18ffcae1f0d5793d08d4a7e6497a45e4da
commit 217fbe18ffcae1f0d5793d08d4a7e6497a45e4da
Author: Anders Kaseorg <andersk@mit.edu>
Date: Sun Nov 13 20:43:46 2016 -0500
Add debian/gbp.conf
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
debian/changelog | 6 ++++++
debian/gbp.conf | 4 ++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d50e6a1..f33ae91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debathena-locker-menu (1.12) UNRELEASED; urgency=medium
+
+ * Add debian/gbp.conf.
+
+ -- Anders Kaseorg <andersk@mit.edu> Sun, 13 Nov 2016 20:43:30 -0500
+
debathena-locker-menu (1.11) unstable; urgency=medium
* Switch to source format 3.0 (native).
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..6e31add
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+upstream-tree=branch
+upstream-branch=master
+debian-branch=master
