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 ++ 1 file changed, 2 insertions(+) create mode 100644 .bzr-builddeb/default.conf (limited to '.bzr-builddeb') 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 -- cgit v1.2.3 From e9392e98b500f47f4eab225108196cd031f0038c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Apr 2010 11:57:05 -0500 Subject: No merging --- .bzr-builddeb/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.bzr-builddeb') diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf index 3165e05..36c28f8 100644 --- a/.bzr-builddeb/default.conf +++ b/.bzr-builddeb/default.conf @@ -1,2 +1,2 @@ [BUILDDEB] -merge = True +merge = False -- cgit v1.2.3