aboutsummaryrefslogtreecommitdiff
path: root/.bzr-builddeb/default.conf
Commit message (Collapse)AuthorAgeFilesLines
* No mergingTed Gould2010-04-091-1/+1
|
* Add bzr-builddeb configuration (merge mode). Fortunately this doesn'tMartin Pitt2009-03-171-0/+2
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.