aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzr-builddeb/default.conf2
-rw-r--r--debian/changelog7
2 files changed, 7 insertions, 2 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 034c065..1369e64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-indicator-session (0.1.1-0ubuntu1) UNRELEASED; urgency=low
+indicator-session (0.1.1-0ubuntu1) karmic; urgency=low
+ * set bzr-builddeb merge mode to true for easy tarball build
+
+ [ Ted Gould ]
* Upstream update 0.1.1 for dbusmenu 0.1.2 (LP: #423975)
* debian/control: Increasing dbusmenu dep to 0.1.2
- -- Ted Gould <ted@ubuntu.com> Thu, 03 Sep 2009 15:18:34 -0500
+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 04 Sep 2009 11:46:25 +0200
indicator-session (0.1-0ubuntu1) karmic; urgency=low