aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzr-builddeb/default.conf2
-rw-r--r--debian/changelog1
2 files changed, 3 insertions, 0 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..3165e05
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True
diff --git a/debian/changelog b/debian/changelog
index 02c88ae..cf5551d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ indicator-messages (0.1.3-0ubuntu1) UNRELEASED; urgency=low
[ Martin Pitt ]
* Add debian/watch.
+ * Add bzr-builddeb configuration.
-- Ted Gould <ted@ubuntu.com> Wed, 18 Mar 2009 16:31:28 -0500