diff options
| -rw-r--r-- | .bzr-builddeb/default.conf | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 7 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 35d8580..c342d79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ indicator-applet (0.1.2-0ubuntu2) UNRELEASED; urgency=low * Add debian/watch. + * Add bzr-builddeb configuration (merge mode). Fortunately this doesn't + insist on having *only* debian/ in bzr. This gives us the best of both + worlds, bzd-bd auto-downloading orig.tar.gz and merging in the + pre-generated autoconf stuff, and retaining the possibility of merging + directly from trunk, since we keep the full upstream source in this branch. -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 17 Mar 2009 10:51:46 +0100 |