Merge lp:~ubuntu-branches/ubuntu/precise/hivex/precise-201212060242 into lp:ubuntu/precise/hivex
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~ubuntu-branches/ubuntu/precise/hivex/precise-201212060242 |
| Merge into: | lp:ubuntu/precise/hivex |
| Diff against target: |
10 lines (+2/-0) (has conflicts) 1 file modified
.pc/applied-patches (+2/-0) Conflict adding files to .pc. Created directory. Conflict because .pc is not versioned, but has versioned children. Versioned directory. Conflict adding file .pc. Moved existing file to .pc.moved. Path conflict: .pc.moved/0001-Fixed-gnulib-integration-for-hivexml.patch / .pc/0001-Fixed-gnulib-integration-for-hivexml.patch Path conflict: .pc.moved/0002-automake.patch / .pc/0002-automake.patch |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/precise/hivex/precise-201212060242 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/hivex reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/hivex/precise-201212060242. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.
If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https:/
(this is an automatically generated message)
Unmerged revisions
- 15. By Hilko Bengen
-
* New upstream version
* [1f9e20f] Cleared patch queue, added gnulib fix - 14. By Hilko Bengen
-
* [c2e1061] Fixed typo in description (Closes: #648985)
* [c107de5] Added upstream's fix for Python3 support - 13. By Hilko Bengen
-
[b88d8f1] Disabled building of Python3 bindings for now
(Closes: #646383) - 12. By Colin Watson
-
Drop Python 3 support for now; it doesn't look like it's actually been
ported (e.g. relies on PyString_AsString), and the packaging does not
conform to Debian policy for Python 3 modules. - 11. By Colin Watson
-
Rebuild with fixed Perl 5.14 on amd64.
- 10. By Colin Watson
-
Rebuild for Perl 5.14.
- 9. By Hilko Bengen
-
* New upstream version
* [163d9e6] Added fix from upstream git that enables the hivexsh build. - 8. By Hilko Bengen
-
* Imported New upstream version
* [2c61bd6] Gave package to Debian Libvirt Maintainers group; added
myself to Uploaders
* [7246494] Added Vcs-* fields to debian/control
* [0c303eb] Discarded patches that have been integrated upstream
