aboutsummaryrefslogtreecommitdiff
path: root/.bzr-builddeb/default.conf
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@canonical.com>2009-03-17 10:54:24 +0100
committerMartin Pitt <martin.pitt@canonical.com>2009-03-17 10:54:24 +0100
commitf5f204aa14310950b76a939d80a966f442b7c6d8 (patch)
treeb0e6f9a7b051b486c3c1673c9ea8ee8f12ea17ee /.bzr-builddeb/default.conf
parent2a0f3ae6d2a4492673dee702a02a7f84a147ae15 (diff)
downloadlibayatana-indicator-f5f204aa14310950b76a939d80a966f442b7c6d8.tar.gz
libayatana-indicator-f5f204aa14310950b76a939d80a966f442b7c6d8.tar.bz2
libayatana-indicator-f5f204aa14310950b76a939d80a966f442b7c6d8.zip
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.
Diffstat (limited to '.bzr-builddeb/default.conf')
-rw-r--r--.bzr-builddeb/default.conf2
1 files changed, 2 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