Created by Ubuntu Package Importer and last modified
Get this branch:
bzr branch lp:ubuntu/oneiric-proposed/bzr-builddeb
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches
Review team:
Ubuntu Development Team

Recent revisions

26. By Andrew Starr-Bochicchio

util.py: Add precise to list of Ubuntu releases (LP: #876888).

25. By Jelmer Vernooij

* Improve error message when tag for upstream version can not be
  found. LP: #783882
* Cope with newer versions of bzr raising IOError rather than
  NoSuchFile error. LP: #831351, Closes: #638219

24. By Jelmer Vernooij

[ Jelmer Vernooij ]
* Build type now defaults to normal mode when used in an empty tree.
  LP: #776528

[ Andrew Bennetts ]
* Use dpkg-mergechangelogs(1) to merge changelog files.
 + Preserve the existing ordering of changelog entries when merging.
   LP: #718944
 + Additional changelog entries are modified when merging another branch.
   LP: #552950
 + 3-way changelog file merge doesn't do textual merging on sections.
   LP: #517093
 + 3-way changelog file merge doesn't support deletions. LP: #517090

[ Jelmer Vernooij ]
* Add python-lzma to build dependencies, for use in test suite.
* Recommend libalgorithm-merge-perl, required for conflict resolution
  in dpkg-mergechangelogs.

23. By Scott Kitterman

Delete debian/bzr-builddeb.dirs so the long obsolete and empty
/usr/lib/python2.4/site-packages/bzrlib/plugins/bzr-builddeb/ is no
longer created (LP: #801757)

22. By Max Bowsher

[ Jelmer Vernooij ]
* In 'bzr merge-upstream', don't ignore upstream branch when upstream
  version can not be found. LP: #772424
* Automatically determine the version from the tarball name if possible.
  LP: #773199
* Use --create when merging a new upstream into a branch that doesn't have a
  changelog file. LP: #385667
* Fix merging of upstream in new packages. LP: #772225

[ Max Bowsher ]
* Add python-bzrlib.tests to Build-Depends-Indep.

21. By Jelmer Vernooij

[ Jelmer Vernooij ]
* Avoid opening upstream branch when it is not necessary. LP: #730589
* Retrieve the upstream branch URL from Launchpad in 'bzr merge-upstream'
  if --launchpad is specified. LP: #726460
* Fix merge of bz2 upstream tarballs. LP: #737012

[ Max Bowsher ]
* Do not error if the top changelog entry is not a recognized Debian or
Ubuntu upload target.

20. By Jelmer Vernooij

[ Andrew Mitchell ]
Add upstream/ directory to setup.py. Closes: #618380. LP: #735147

19. By Bilal Akhtar

util.py: Add 'natty' to the list of Ubuntu releases, so that bzr-builddeb
can find out the last Ubuntu upload easily rather than give an error
when builddeb is called with the --package-merge argument. (LP: #668764)

18. By James Westby

[ James Westby ]

* Don't fail if asked to use a .bz2 tarball that is already in the desired
  location. LP: #616786
* Don't crash if we are asked to merge-upstream with an unrelated branch.
  LP: #619614.
* Don't strip -n from the version we get in merge-upstream, as some
  upstreams have this in there, and trying to support both means supporting
  both badly. If you are used to doing "bzr merge-upstream --version
  <package version>" then it will no longer work for you, use the
  upstream version instead.
* Don't crash when doing merge-upstream with a branch that does a rename
  and then ships another file with the old path in the tarball that isn't
  in the branch.

[ Jelmer Vernooij ]

* Fix the auto-detection of merge mode.
* Don't crash on merge mode packages where there is no export-upstream
  if we can't find the tarball.
* Determine Bazaar home directory using bzrlib to prevent test
  isolation issues. LP: #614125

17. By Jelmer Vernooij

[ Colin Watson ]
* Consider a .dsc without a Format: to be Format: 1.0.

[ Jelmer Vernooij ]
* export now uses the timestamp of the last revision, making them more
  deterministic, and so hopefully producing the same tarballs when it is
  used for that.
* Fix use of getattr to have 3 arguments to avoid exception. (LP: #572093)
* Implement the automatic_tag_name hook so that "bzr tag" with no arguments
  will tag based on the version in debian/changelog.
* Support upstream/VERSION tags, for compatibility with git-
  buildpackage. LP: #551362
* Support upstream tarballs without a pristine tar delta.
* Support -r argument to import-upstream.

[ Robert Collins ]
* Add import-upstream command which imports an upstream - useful for
  migrating existing packaging branches into pristine-tar using mode.
* Stop stripping .bzrignore from tarball imports. LP: #496907
* Make the upstream branch authoritative for file ids when importing a
  tarball, stopping errors when files are renamed. LP: #588060

[ James Westby ]
* Add a --package-merge option to builddeb to build with the -v and -sa
  appropriate when doing a merge from Debian or similar. LP: #576027
* Fixed a logic error that stops -r working in merge-upstream. LP: #594575

[ Jelmer Vernooij ]
* Determine Bazaar home directory using bzrlib to prevent test
  isolation issues. Closes: #614125
* Bump standards version to 3.9.1 (no changes).

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.