Merge lp:~ubuntu-branches/ubuntu/oneiric/pyside/oneiric-201109062006 into lp:ubuntu/oneiric/pyside
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~ubuntu-branches/ubuntu/oneiric/pyside/oneiric-201109062006 |
| Merge into: | lp:ubuntu/oneiric/pyside |
| Diff against target: |
19 lines (+13/-0) (has conflicts) 1 file modified
debian/patches/force-phonon.patch (+13/-0) Conflict adding file debian/patches/force-phonon.patch. Moved existing file to debian/patches/force-phonon.patch.moved. |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/oneiric/pyside/oneiric-201109062006 |
| 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 archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/pyside reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/pyside/oneiric-201109062006. 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 Barry Warsaw
-
* debian/
patches/ force-phonon. patch:
Force the addition of the phonon directory to the CMake files.
(LP: #832864)
* debian/control: Ubuntu 11.10 only has debhelper 8.9.0. - 14. By Barry Warsaw
-
* Add Pre-Depends on dpkg to -dbg for its data.tar.xz.
* Fix the -dbg files renaming regexp. (Closes: #639380)
* New 1.0.6.1 "Isolino for Qt4.6" release.
- Drop patch from upstream, included in point-release.
* Bump tests timeout from 1 to 10 minutes.
* Make sure to move the -dbg symlinks out of the -dev package.
* Add DEP-3 header to patches that lack one.
* Add lintian overrides:
- missing-pre-dependency- on-multiarch- support for the -dbg
package.
- package-contains- empty-directory for all the python packages.
* New 1.0.6 upstream "Isolino" release
- Bump B-Ds:
+ generatorrunner to 0.6.12.
+ shiboken to 1.0.6.
- Symbols:
+ Add six for 1.0.6.
* Compress python-pyside-dbg using xz.
* Import upstream patch to fix build with Qt4.6.
* Convert library to multiarch.
- Bump B-D:
- on debhelper to 8.9.3.
- on cmake to 2.8.4+dfsg.1-3~.
- Bump debhelper compatibility level to 9.
- Override lintian warning about debhelper being too young.
- Update *.install files to cope with new library paths.
- Update .so symlinks paths.
- Initialize D_H_MULTIARCH from dpkg-architectures, use it in the
LIB_SUFFIX cmake variable.
- Add a Pre-Depends on multiarch-support to the libpyside package.
- Add Multi-Arch: same to the libpyside package.
* Use the ${LIBPYSIDE_SOVERSION} variable everywhere.
* Un-$(shell ize debian/rules.
* Update symbols to cope with size_t size differences between 32-64
bit machines (Closes: #635868).
* Update buildsystem to ensure proper build'ability of arch:all
packages.
* New 1.0.5 upstream "And no name was given that day" release
- Bump B-Ds:
+ shiboken to 1.0.5.
- Symbols:
+ Add one from 1.0.4.
+ Add six for 1.0.5.
* Symlink arch:any packages' documentation to libpyside's. Make sure
the dependencies are explicit for Policy compliance.
