Merge lp://staging/~ubuntu-branches/ubuntu/maverick/zope.testing/maverick-201103250146 into lp://staging/ubuntu/maverick/zope.testing
Proposed by
James Westby
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/maverick/zope.testing/maverick-201103250146 |
| Merge into: | lp://staging/ubuntu/maverick/zope.testing |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/maverick/zope.testing/maverick-201103250146 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/zope.testing now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/zope.testing/maverick-201103250146. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 7. By Gediminas Paulauskas
-
* New upstream release.
* debian/rules: Build-Depends on python-all, not its -dev variant.
* debian/copyright: update, convert to dep5 format.
