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

[Timo Jyrinki]

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

[Timo Jyrinki (timo-jyrinki)]

Related to bug #1206268

[Timo Jyrinki (timo-jyrinki)]

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)]

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)]

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

review: Approve

[Timo Jyrinki (timo-jyrinki)]

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.

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-02 17:52:51 +0000
+++ debian/changelog	2013-10-25 04:27:12 +0000
@@ -1,3 +1,10 @@
+qtmultimedia-opensource-src (5.0.2-4ubuntu4) trusty; urgency=low
+
+  * Add libqt5multimedia5-plugins dependency to QML plugin (LP: #1202996)
+  * Drop Qt Audio Engine for now to not bring OpenAL dependency
+
+ -- Timo Jyrinki <[e-mail]>  Fri, 11 Oct 2013 08:13:50 +0300
+
 qtmultimedia-opensource-src (5.0.2-4ubuntu3) saucy; urgency=low
 
   * debian/control: adding missing dependencies for qtmultimedia5-examples
 
=== modified file 'debian/control'
--- debian/control	2013-07-02 17:52:51 +0000
+++ debian/control	2013-10-25 04:27:12 +0000
@@ -17,7 +17,6 @@
                libasound2-dev [linux-any],
                libpulse-dev,
                libgstreamer-plugins-base0.10-dev,
-               libopenal-dev,
                libgstreamer0.10-dev,
                zlib1g-dev,
                pkg-kde-tools,
@@ -87,27 +86,13 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: libqt5multimedia5-plugins, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 Multimedia QML plugin
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
  This package contains the Multimedia QML plugin for QtDeclarative.
 
-Package: qtdeclarative5-qtaudioengine-plugin
-Architecture: any
-Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libqt5declarative5-qtmultimedia-plugin
-Replaces: libqt5declarative5-qtmultimedia-plugin
-Provides: libqt5declarative5-qtmultimedia-plugin
-Description: Qt 5 AudioEngine QML plugin
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the AudioEngine QML plugin for QtDeclarative.
-
 Package: libqgsttools-p1
 Architecture: any
 Multi-Arch: same
 
=== modified file 'debian/qtmultimedia5-examples.install'
--- debian/qtmultimedia5-examples.install	2013-05-14 14:20:13 +0000
+++ debian/qtmultimedia5-examples.install	2013-10-25 04:27:12 +0000
@@ -11,10 +11,6 @@
 usr/lib/*/qt5/examples/multimedia/audiodevices/audiodevices.pro
 usr/lib/*/qt5/examples/multimedia/audiodevices/audiodevicesbase.ui
 usr/lib/*/qt5/examples/multimedia/audiodevices/main.cpp
-usr/lib/*/qt5/examples/multimedia/audioengine/audioengine.pro
-usr/lib/*/qt5/examples/multimedia/audioengine/qml/audioengine.qml
-usr/lib/*/qt5/examples/multimedia/audioengine/qml/audioengine.qmlproject
-usr/lib/*/qt5/examples/multimedia/audioengine/qml/content/MyAudioEngine.qml
 usr/lib/*/qt5/examples/multimedia/audioinput/audioinput
 usr/lib/*/qt5/examples/multimedia/audioinput/audioinput.cpp
 usr/lib/*/qt5/examples/multimedia/audioinput/audioinput.h