From 6a41b5259237c07e4b159687e29ac894e948d83a Mon Sep 17 00:00:00 2001
From: Ben Finney <ben+debian@benfinney.id.au>
Date: Tue, 21 Oct 2014 09:57:55 +1100
Subject: [PATCH] =?utf8?q?Add=20this=20package's=20configuration=20for=20?=
 =?utf8?q?=E2=80=98bzr=20builddeb=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 debian/bzr-builddeb.conf | 4 ++++
 debian/changelog         | 7 +++++++
 2 files changed, 11 insertions(+)
 create mode 100644 debian/bzr-builddeb.conf

diff --git a/debian/bzr-builddeb.conf b/debian/bzr-builddeb.conf
new file mode 100644
index 0000000..c135030
--- /dev/null
+++ b/debian/bzr-builddeb.conf
@@ -0,0 +1,4 @@
+[builddeb]
+
+# Build source package by merging this working tree with upstream source.
+merge = True
diff --git a/debian/changelog b/debian/changelog
index f31f621..dff5e90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lojban-common (1.5+dfsg.1-3) UNRELEASED; urgency=low
+
+  * debian/bzr-builddeb.conf:
+    + Add this package's configuration for ‘bzr builddeb’.
+
+ --
+
 lojban-common (1.5+dfsg.1-2) unstable; urgency=low
 
   * The “You Need Feet” release.
-- 
2.11.4.GIT