Merge lp:~ubuntu-branches/ubuntu/natty/libotr/natty-201103260311 into lp:ubuntu/natty/libotr
Proposed by
James Westby
Status: | Needs review |
---|---|
Proposed branch: | lp:~ubuntu-branches/ubuntu/natty/libotr/natty-201103260311 |
Merge into: | lp:ubuntu/natty/libotr |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/natty/libotr/natty-201103260311 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dave Walker (community) | Disapprove | ||
Review via email: mp+54971@code.launchpad.net |
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/natty/libotr now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/libotr/natty-201103260311. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 10. By Steve Langasek
-
run update-maintainer
- 9. By Steve Langasek
-
debian/rules: clean the dependency_libs out of .la files at build
time, per Policy 10.2
The contents of this branch are in the package currently in the archive, and lp:ubuntu/libotr. Therefore marking Disapprove. Thanks.