Merge lp://qastaging/~noskcaj/ubuntu/saucy/python-apt/debian-merge into lp://qastaging/ubuntu/saucy/python-apt
Proposed by
Jackson Doak
| Status: | Merged |
|---|---|
| Merge reported by: | Martin Pitt |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/saucy/python-apt/debian-merge |
| Merge into: | lp://qastaging/ubuntu/saucy/python-apt |
| Diff against target: |
472 lines (+148/-21) 10 files modified
apt/debfile.py (+3/-0) apt/package.py (+2/-0) aptsources/distro.py (+4/-0) data/templates/Debian.mirrors (+7/-6) data/templates/Ubuntu.mirrors (+10/-12) debian/changelog (+103/-0) debian/gbp.conf (+5/-0) tests/test_all.py (+8/-1) tests/test_debfile.py (+4/-0) tests/test_lp659438.py (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/saucy/python-apt/debian-merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from unstable.
I've probably done something wrong.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hey Jackson,
The Vcs-Bzr: changes should be dropped as Debian moved to git and thus we can't merge the debian bzr branch into the old custom ~ubuntu-core-dev branch any more. Also, another Ubuntu change is the "Multi-Arch: allowed" bits.
I tested the new version with the ubuntu-