Merge lp:~timo-jyrinki/ubuntu/trusty/qtmultimedia-opensource-src/drop_qtaudioengine into lp:ubuntu/trusty/qtmultimedia-opensource-src

Proposed by Timo Jyrinki on 2013-10-25
Status: Merged
Merged at revision: 11
Proposed branch: lp:~timo-jyrinki/ubuntu/trusty/qtmultimedia-opensource-src/drop_qtaudioengine
Merge into: lp:ubuntu/trusty/qtmultimedia-opensource-src
Diff against target: 70 lines (+8/-20)
3 files modified
debian/changelog (+7/-0)
debian/control (+1/-16)
debian/qtmultimedia5-examples.install (+0/-4)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu/trusty/qtmultimedia-opensource-src/drop_qtaudioengine
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve on 2013-10-29
Ubuntu branches 2013-10-25 Pending
Review via email: mp+192635@code.launchpad.net

Commit message

* Add libqt5multimedia5-plugins dependency to QML plugin (LP: #1202996)
  * Drop Qt Audio Engine for now to not bring OpenAL dependency

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

Related to bug #1206268

Timo Jyrinki (timo-jyrinki) wrote :

Postponed to further discussion since it affects API we are providing in Touch, even if this would be needed to get desktop package migrate to main.

review: Disapprove
Michael Terry (mterry) wrote :

As of yesterday, we are no longer providing this API in Touch. I dropped the package from the ubuntu-sdk-libs metapackage. So this can go in.

Timo Jyrinki (timo-jyrinki) wrote :

Finally this was again approved together with approving the idea of now really doing the seed changes.

review: Approve
Timo Jyrinki (timo-jyrinki) wrote :

And the uploaded https://launchpad.net/ubuntu/+source/qtmultimedia-opensource-src/5.0.2-4ubuntu4 should get unblocked from proposed after the seed changes are in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-07-02 17:52:51 +0000
3+++ debian/changelog 2013-10-25 04:27:12 +0000
4@@ -1,3 +1,10 @@
5+qtmultimedia-opensource-src (5.0.2-4ubuntu4) trusty; urgency=low
6+
7+ * Add libqt5multimedia5-plugins dependency to QML plugin (LP: #1202996)
8+ * Drop Qt Audio Engine for now to not bring OpenAL dependency
9+
10+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 11 Oct 2013 08:13:50 +0300
11+
12 qtmultimedia-opensource-src (5.0.2-4ubuntu3) saucy; urgency=low
13
14 * debian/control: adding missing dependencies for qtmultimedia5-examples
15
16=== modified file 'debian/control'
17--- debian/control 2013-07-02 17:52:51 +0000
18+++ debian/control 2013-10-25 04:27:12 +0000
19@@ -17,7 +17,6 @@
20 libasound2-dev [linux-any],
21 libpulse-dev,
22 libgstreamer-plugins-base0.10-dev,
23- libopenal-dev,
24 libgstreamer0.10-dev,
25 zlib1g-dev,
26 pkg-kde-tools,
27@@ -87,27 +86,13 @@
28 Architecture: any
29 Multi-Arch: same
30 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
31-Depends: ${misc:Depends}, ${shlibs:Depends}
32+Depends: libqt5multimedia5-plugins, ${misc:Depends}, ${shlibs:Depends}
33 Description: Qt 5 Multimedia QML plugin
34 Qt is a cross-platform C++ application framework. Qt's primary feature
35 is its rich set of widgets that provide standard GUI functionality.
36 .
37 This package contains the Multimedia QML plugin for QtDeclarative.
38
39-Package: qtdeclarative5-qtaudioengine-plugin
40-Architecture: any
41-Multi-Arch: same
42-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
43-Depends: ${misc:Depends}, ${shlibs:Depends}
44-Conflicts: libqt5declarative5-qtmultimedia-plugin
45-Replaces: libqt5declarative5-qtmultimedia-plugin
46-Provides: libqt5declarative5-qtmultimedia-plugin
47-Description: Qt 5 AudioEngine QML plugin
48- Qt is a cross-platform C++ application framework. Qt's primary feature
49- is its rich set of widgets that provide standard GUI functionality.
50- .
51- This package contains the AudioEngine QML plugin for QtDeclarative.
52-
53 Package: libqgsttools-p1
54 Architecture: any
55 Multi-Arch: same
56
57=== modified file 'debian/qtmultimedia5-examples.install'
58--- debian/qtmultimedia5-examples.install 2013-05-14 14:20:13 +0000
59+++ debian/qtmultimedia5-examples.install 2013-10-25 04:27:12 +0000
60@@ -11,10 +11,6 @@
61 usr/lib/*/qt5/examples/multimedia/audiodevices/audiodevices.pro
62 usr/lib/*/qt5/examples/multimedia/audiodevices/audiodevicesbase.ui
63 usr/lib/*/qt5/examples/multimedia/audiodevices/main.cpp
64-usr/lib/*/qt5/examples/multimedia/audioengine/audioengine.pro
65-usr/lib/*/qt5/examples/multimedia/audioengine/qml/audioengine.qml
66-usr/lib/*/qt5/examples/multimedia/audioengine/qml/audioengine.qmlproject
67-usr/lib/*/qt5/examples/multimedia/audioengine/qml/content/MyAudioEngine.qml
68 usr/lib/*/qt5/examples/multimedia/audioinput/audioinput
69 usr/lib/*/qt5/examples/multimedia/audioinput/audioinput.cpp
70 usr/lib/*/qt5/examples/multimedia/audioinput/audioinput.h

Subscribers

People subscribed via source and target branches

to all changes: