Merge lp:~jelmer/bzr-builddeb/multiple-upstream-tarballs into lp:bzr-builddeb
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | James Westby |
Approved revision: | 625 |
Merged at revision: | 628 |
Proposed branch: | lp:~jelmer/bzr-builddeb/multiple-upstream-tarballs |
Merge into: | lp:bzr-builddeb |
Prerequisite: | lp:~jelmer/bzr-builddeb/upstream-parents-per-component |
Diff against target: |
258 lines (+62/-26) 6 files modified
cmds.py (+1/-1) debian/changelog (+7/-0) import_dsc.py (+6/-1) upstream/__init__.py (+11/-9) upstream/branch.py (+1/-1) upstream/pristinetar.py (+36/-14) |
To merge this branch: | bzr merge lp:~jelmer/bzr-builddeb/multiple-upstream-tarballs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bzr-builddeb-hackers | Pending | ||
Review via email: mp+77893@code.launchpad.net |
This proposal supersedes a proposal from 2011-09-27.
Description of the change
Importing and building of packages with multiple upstream tarballs now works.
There are still two caveats:
* when exporting the base component before generating a pristine tar delta, we don't exclude non-base components. This probably causes the pristine tar delta to be bigger than it needs to be
* Needs more tests
To post a comment you must log in.