Merge lp://staging/~jelmer/bzr-builddeb/multiple-upstream-tarballs into lp://staging/bzr-builddeb
Proposed by
Jelmer Vernooij
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~jelmer/bzr-builddeb/multiple-upstream-tarballs |
| Merge into: | lp://staging/bzr-builddeb |
| Diff against target: |
1272 lines (+339/-191) 11 files modified
cmds.py (+29/-25) debian/changelog (+3/-1) dh_make.py (+2/-2) import_dsc.py (+79/-45) merge_package.py (+9/-4) tests/blackbox/test_merge_upstream.py (+1/-1) tests/test_import_dsc.py (+47/-38) tests/test_upstream.py (+51/-11) upstream/__init__.py (+16/-13) upstream/branch.py (+13/-3) upstream/pristinetar.py (+89/-48) |
| To merge this branch: | bzr merge lp://staging/~jelmer/bzr-builddeb/multiple-upstream-tarballs |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Bzr-builddeb-hackers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2011-10-03.
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.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
