lp:ubuntu/maverick-proposed/bzr-builddeb

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

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Review team:
Ubuntu Development Team
Status:
Mature

Recent revisions

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).

16. By Jelmer Vernooij

[ Jelmer Vernooij ]
* Avoid AttributeError in the python-apt compatibility code.

[ James Westby ]
* Add 'maverick' as an Ubuntu release.

15. By James Westby

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

[ Jelmer Vernooij ]
* Fix use of getattr to have 3 arguments to avoid exception. (LP: #572093)

[ James Westby ]
* Fix for Launchpad's multi-version support.

14. By Jelmer Vernooij

[ Jelmer Vernooij ]
* Switch section to vcs.
* Allow the directory service to work with older version of python-apt.

[ James Westby ]
* Correct typo that causes packages with .orig.tar.bz2 to fail to build.
* Also merge tags in merge-package.
* Adapt to the python-apt 0.8 API. Thanks to Julian Andres Klode.
  (Closes: #572093)
* Fix merge-upstream with just a branch. (LP: #528273)

[ John Arbash Meinel ]
* Improve the changelog merge hook to be smarter when both sides change.

[ Steve Langasek ]
* Make merge-upstream --v3 unpack .tar.bz2 with the correct arguments.
  (LP: #529900)

13. By Jelmer Vernooij

[ James Westby ]
* Some support for v3 source formats (Closes: #562991)
  - Those that look quite a lot like v1 are supported well.
  - .tar.bz2 tarballs are supported for import, building, merge-upstream,
    etc., but only enabled for the latter with a --v3 switch for now.
  - Multiple orig.tar.gz is not supported.
  - .tar.lzma is not supported awaiting pristine-tar support.
* New "dh-make" command ("dh_make" alias) that allows you to start
  packaging, either in an empty branch, or based on an upstream branch.
* Fix merge-package for native packages (LP: #476348)
* debian/changelog merge hook to reduce the manual conflict resolution
  required there. Thanks to John Arbash Meinel and Andrew Bennetts
  (LP: #501754).
  - Requires newer bzr.
* Fix merge-package outside a shared repo (LP: #493462)
* Fix exporting of symlinks (LP: #364671)
* Add --force option to merge-upstream which may help certain people.
* Use system configobj if the bzr copy isn't available. Thanks Jelmer.
* Make merging multiple-root branches work. Thanks Robert Collins.
* Disentangle from bzrtools. Thanks Max Bowser.

[ Jelmer Vernooij ]
* Bump standards version to 3.8.4.
* Fix formatting in doc-base.

12. By Jelmer Vernooij

* Upload to unstable.
* Bump standards version to 3.8.3.

11. By Andrew Starr-Bochicchio

util.py: Add "lucid" to ubuntu_releases (LP: #476530).

10. By James Westby

[ Jelmer Vernooij ]
* Automatically use merge mode if there's only a debian/ directory in
  the packaging branch. Closes: #529816.

[ James Westby ]
* Merge merge-package command from Muharem Hrnjadovic to allow merging
  another branch of the same package in a way that will avoid spurious
  conflicts from divergent upstream histories. Thanks Muharem.
* Don't crash on merge-upstream due to API changes not being fully applied.
* Add plugin information as parsed by "bzr plugin-info".
* Improve the error when the upstream tag is missing during merge-upstream.
* Also query the config file for the revision to use in export-upstream
  (LP: #415572)
* Don't populate the commit message editor with all lines added to
  debian/changelog. Only use the stripped version of the "change" lines.
* Always use the date from debian/changelog during import-dsc. Thanks
  Sveinung Kvilhaugsvik.
* pristine-tar errors are no longer fatal for building the package.
  Thanks Muharem. (LP: #417153)
* Refuse to build a conflicted tree. Thanks Muharem. (LP: #381303)
* Don't crash if there are no deb-src lines when building. (LP: #375897)
* Make import-dsc work against redirected URIs. Thanks Muharem (LP: #337209)

Branch metadata

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

Subscribers