Merge lp:~ubuntu-branches/ubuntu/vivid/pyqt5/vivid-proposed-201503172043 into lp:ubuntu/vivid-proposed/pyqt5
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~ubuntu-branches/ubuntu/vivid/pyqt5/vivid-proposed-201503172043 |
| Merge into: | lp:ubuntu/vivid-proposed/pyqt5 |
| Diff against target: |
90 lines (+34/-1) (has conflicts) 2 files modified
debian/changelog (+9/-0) debian/control (+25/-1) Text conflict in debian/changelog Text conflict in debian/control |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/vivid/pyqt5/vivid-proposed-201503172043 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Development Team | 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/vivid-proposed/pyqt5 reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/vivid/pyqt5/vivid-proposed-201503172043. 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
- 21. By Dmitry Shachnev
-
Relax build-dependencies to build against Qt 5.3.
- 20. By Ricardo Salveti
-
No change rebuild against latest qtbase
- 19. By Dmitry Shachnev
-
Fix a typo in debian/
tests/control. - 18. By Scott Kitterman
-
* Add support for python in addition to python3 because the upcoming calibre
2.X series of releases will use PyQt5 with Python and not Python 3
- Add python build-depends to debian/control
- Add python-* equivalents of existing python3-* packages to debian/
control
- Update debian/rules to account for python as well as python3
- Set minimum python3 version to 3.3 since the revised debug configure
rule will not work for 3.2
- Replicate and update all python3-* .install files as python-* - 17. By Dmitry Shachnev
-
debian/
tests/import: Redirect stderr to stdout for debug interpreter. - 16. By Scott Kitterman
-
* New upstream release
- Drop debian/patches/ fix_implicit_ qtablewidget. patch, which had been
cherry picked from upstream - 15. By Ricardo Salveti
-
No-change rebuild against the new qtbase-
opensource- src (armhf build still
used the older package) - 14. By Dmitry Shachnev
-
* Merge with Debian experimental, remaining changes:
- Add new package for QtPositioning module.
- Add a patch to build against QtWebKit 5.1. - 13. By Ricardo Salveti
-
* debian/
patches/ build_against_ qtwebkit_ 5_1.patch:
- Dropping features that are only available in qtwebkit 5.2, so we
can build it against qtwebkit 5.1 (can be dropped once qtwebkit
5.2 gets published). - 12. By Matthias Klose
-
No-change rebuild for Python 3.4.
