diff options
| author | Martin Pitt <martin.pitt@canonical.com> | 2009-08-27 20:53:29 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@canonical.com> | 2009-08-27 20:53:29 +0200 |
| commit | 62baba6702e68a0cb9eee972b13d7a8c1c9e1c25 (patch) | |
| tree | 3394e5f0742a3ce8727fa15ecd7cfed77f4eb98b | |
| parent | 6c33dc7e614f5c92c9a3a55fc5183bb2b25e8cdf (diff) | |
| download | libdbusmenu-62baba6702e68a0cb9eee972b13d7a8c1c9e1c25.tar.gz libdbusmenu-62baba6702e68a0cb9eee972b13d7a8c1c9e1c25.tar.bz2 libdbusmenu-62baba6702e68a0cb9eee972b13d7a8c1c9e1c25.zip | |
Add bzr-builddep configuration for merge mode.
| -rw-r--r-- | .bzr-builddeb/default.conf | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 6 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 6e8f8f2..a520785 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,12 +10,16 @@ libdbusmenu (0.1.2-0ubuntu1) UNRELEASED; urgency=low libdbusmenu (0.1.0-0ubuntu1) karmic; urgency=low + [ Ted Gould ] * Upstream release 0.1.0 * debian/watch: Added for tarball * debian/control: - Specify both Vcs-Bzr and Vcs-Browser - Fixed the project name + [ Martin Pitt ] + * Add bzr-builddep configuration for merge mode. + -- Ted Gould <ted@ubuntu.com> Thu, 27 Aug 2009 09:59:48 -0500 libdbusmenu (0.1~bzr5-0ubuntu1) karmic; urgency=low |