lp://staging/ubuntu/trusty-proposed/bzr-builddeb

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

31. By Iain Lane on 2013-10-23

debian/tests/control: Add python-distro-info and libalgorithm-merge-perl
to test depends; the former is required to compare release names and the
latter for dpkg-mergechangelogs to generate the expected output (it does
different things with conflicts in 3-way merges depending on the presence
of this library).

30. By Andrew Starr-Bochicchio on 2013-09-10

* tests/blackbox/test_import_dsc.py:
 - Explicitly pass '--format=1.0' to dpkg-source inorder to
   silence "no source format specified" warnings printed to
   stderr (Closes: #711042).
* tests/test_import_dsc.py:
 - As of dpkg 1.17.0, source format '3.0 (native)' strictly
   enforces that native packages do not have a Debian revision.
   Use "0.1" instead of "0.1-1" for the version number in
   test_extract_format3_native (Closes: #720003).
* debian/control: Add myself to Uploaders.
* debian/tests/control:
 - Remove the depricated no-build-needed Features flag and add
   Restrictions: allow-stderr.

29. By Martin Pitt on 2013-06-04

debian/tests/testsuite: Redirect stderr to avoid the "no source format
specified" dpkg-source warnings cause a failure.

28. By Andrew Starr-Bochicchio on 2013-05-22

* Team upload.
* Upload to unstable.
* Move to minimal dh style rules file.
* Drop bzr-svn from Build-Depends-Indep and Suggests (Closes: #709288).
* Bump Standards-Version to 3.9.4, no changes needed.
* Drop deprecated debian/pycompat and debian/pyversions files.
* Add autopkgtests.

27. By Jelmer Vernooij on 2012-03-19

* Add dependency on quilt. LP: #951207
* Cope with missing tags when looking up upstream versions.
* Skip quilt unapplying for trees that can not be copied (such as
  _PreviewTree). LP: #950419
* Document the argument for --export-upstream. LP: #959065

26. By Jelmer Vernooij on 2012-03-03

* Fix patch unapplying from DirStateRevisionTrees. LP: #923688
* Bump distro-info dependency back to a recommends, to ease
  backporting.
* Cope with the deprecation of Tree.inventory in bzr/2.6. LP: #934247
* Generate xz files with the 'xz' utility rather than the Python
  'lzma' module, as the latter uses options not supported by pristine-
  xz. Closes: #660721
* Merge fix from Joel Pickett to fix typo in orig-dir option help
  description. LP: #945413
* Bump standards version to 3.9.3 (no changes).

25. By Jelmer Vernooij on 2012-01-22

* Only warn about unapplying quilt patches when there are actually
  patches to unapply.
* Don't throw a traceback when quilt unapplying fails.
* Read configuration from original working tree, in case there are
  conflicts during merge.

24. By Jelmer Vernooij on 2012-01-18

* New revision specifier 'upstream:'. LP: #905728
* Imports are now deferred in command definitions, to speed up
  commands like 'bzr bash-completion'. LP: #903650
* Provide merge-package functionality as a hook for 'bzr merge'.
  LP: #486075, LP: #910900
* Add pre-commit hook that warns about applied quilt patches, and can
  automatically unapply/apply all quilt patches. LP: #608670
* Automatically unapply patches before merge operations.
  LP: #815854
* Include full changelog paths that were checked in error message.
  LP: #811459
* Cope with unicode strings being specified to TarfileSource. Based on
  patch by Gediminas Paulauskas. LP: #911262
* Automatically apply patches for 3.0 (quilt) packages in 'bzr bd-do'
  and 'bzr bd'. LP: #616791
* Switch to source format '3.0 (native)'.
* Skip import tests for .tar.xz if not supported by pristine-tar.
  Closes: #655463, LP: #917112

23. By Jelmer Vernooij on 2011-12-16

[ Jonathan Riddell ]
* Add get-orig-source command which will get the upstream tar file.
  LP: #862188
* Change "bd-do" command to "builddeb-do" and alias "bd-do".
* Add commit-message-from-changelog option for those who do not
  want commit message set automatically

[ Jelmer Vernooij ]
* Support importing and building packages with multiple upstream
  tarballs. LP: #653757, LP: #664834
* Move .bzr-builddeb/default.conf to debian/bzr-builddeb.conf.
  LP: #793137
* Fix test suite on Lucid, where dpkg-mergechangelogs is not available.

[ Martin Packman ]
* Fix test_utf8_changelog when run with older versions of python-debian.

[ Jelmer Vernooij ]
* Support svn-buildpackage tag names to find upstream versions.
  LP: #874263
* Support --revision argument to merge-package. LP: #888590
* By default, don't override the commit message from debian/changelog
  unless 'commit-message-from-changelog' is explicitly set to True. LP: #812749
* Support running dep3-patch against remote repositories, and with
  open-ended revision ranges. LP: #893608
* Fix finding orig tarballs in directories also containing filenames
  with non-utf8 characters. LP: #865753
* bzr-builddeb now prefers the 'get-packaged-orig-source' rule to
  retrieve the packaged upstream source, and warns about
  'get-orig-source'. LP: #409862
* Support translations.

[ Martin Packman ]
* Deal with invalid versions and bad encoding in the changelog merge
  hook. LP: #893495

22. By Jelmer Vernooij on 2011-10-01

[ Jelmer Vernooij ]
* Support .tar.xz Debian files rather than .tar.lzma.

[ Martin Packman ]
* Support non-ascii characters in changelog entry when determining
  commit message. LP: #853664

[ Jelmer Vernooij ]
* Use more complete control file during examples. Closes: #642818