Merge lp://qastaging/~ubuntu-branches/ubuntu/maverick/libsmbios/maverick-201007211814 into lp://qastaging/ubuntu/maverick/libsmbios
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/maverick/libsmbios/maverick-201007211814 |
| Merge into: | lp://qastaging/ubuntu/maverick/libsmbios |
| Diff against target: |
45 lines (+38/-0) (has conflicts) 1 file modified
debian/README.source (+38/-0) Conflict adding file debian/README.source. Moved existing file to debian/README.source.moved. |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/maverick/libsmbios/maverick-201007211814 |
| Related bugs: |
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/libsmbios now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/libsmbios/maverick-201007211814. A merge should be performed if necessary.
Unmerged revisions
- 17. By Stefano Rivera
-
* New upstream release (LP: #591017).
* debian/patches/ gcc44.dpatch:
- Dropped, fixed upstream.
* debian/patches/ fix-typo. dpatch:
- Dropped, fixed upstream.
* debian/control:
- Bump Standards-Version to 3.9.0.
* debian/README. source:
- Fix lintian's warning patch-system-but-no- source- readme.
* debian/watch:
- Find tarballs, not directories.
* Call dh_python2.
* Revert:
- Enable building on lpia (Closes: #488278)
