Merge lp://staging/~jelmer/bzr-builddeb/810531-dont-repack-bz2 into lp://staging/bzr-builddeb
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Merged at revision: | 584 |
| Proposed branch: | lp://staging/~jelmer/bzr-builddeb/810531-dont-repack-bz2 |
| Merge into: | lp://staging/bzr-builddeb |
| Diff against target: |
113 lines (+25/-22) 2 files modified
debian/changelog (+3/-1) upstream/__init__.py (+22/-21) |
| To merge this branch: | bzr merge lp://staging/~jelmer/bzr-builddeb/810531-dont-repack-bz2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Bzr-builddeb-hackers | Pending | ||
|
Review via email:
|
|||
Description of the change
In upstream/, don't repack bz2/xz orig tarballs to gz tarballs.
cmd_merge_upstream, in cmds.py, already takes care of converting tarballs to .tar.gz tarballs if necessary.
This also fixes the use of UScanSource with multiple orig component tarballs.
When this is merged, I'd like to do another upload to unstable, as this particular fix is blocking a Debian user.
To post a comment you must log in.
Revision history for this message
| Jonathan Riddell (jr) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Running the instructions in bug 810531 against this branch I end up with a bz2 file renamed to .gz
jr@gallus:
libindicate-