diff options
| -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 |