From f5f204aa14310950b76a939d80a966f442b7c6d8 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 17 Mar 2009 10:54:24 +0100 Subject: 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. --- .bzr-builddeb/default.conf | 2 ++ debian/changelog | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 .bzr-builddeb/default.conf 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 Tue, 17 Mar 2009 10:51:46 +0100 -- cgit v1.2.3