Merge lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src_5.0.2 into lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src
Proposed by
Dimitri John Ledkov
Status: | Rejected |
---|---|
Rejected by: | Timo Jyrinki |
Proposed branch: | lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src_5.0.2 |
Merge into: | lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src |
Diff against target: |
37 lines (+9/-1) (has conflicts) 2 files modified
debian/changelog (+5/-1) debian/qtmultimedia5-examples.install (+4/-0) Text conflict in debian/changelog Text conflict in debian/qtmultimedia5-examples.install |
To merge this branch: | bzr merge lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src_5.0.2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Timo Jyrinki | Disapprove | ||
Review via email: mp+192567@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 49. By Timo Jyrinki
-
Drop Qt Audio Engine for now to not bring OpenAL dependency
This merge request does not make sense, as the main branch is the 5.1.1 packaging branch.
lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src_5.0.2 is ready to be sponsored as is (with the existing orig tarball).