[SCM] qtmultimedia packaging branch, ubuntu, updated. debian/5.5.0-3-10-gf486fd4

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=8b95cbe

The following commit has been merged in the ubuntu branch:
commit 8b95cbe6b78041047ac0a993b8986e6e836c719c
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Oct 5 10:05:01 2015 +0000

    Modify the audio role patch to use version 5.5
---
 .../Add-audio-role-API-to-QMediaPlayer.patch       | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch b/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch
index 9bdb34d..8c20915 100644
--- a/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch
+++ b/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch
@@ -39,7 +39,7 @@ index fda8768..9d28cab 100644
  
  import QtQuick 2.0
 -import QtMultimedia 5.0
-+import QtMultimedia 5.6
++import QtMultimedia 5.5
  
  /*!
      \qmltype Video
@@ -71,7 +71,7 @@ index fda8768..9d28cab 100644
 +        \li MediaPlayer.GameRole - game audio.
 +        \endlist
 +
-+        \since 5.6
++        \since 5.5
 +    */
 +    property alias audioRole:       player.audioRole
 +
@@ -90,7 +90,7 @@ index fda8768..9d28cab 100644
 +
 +        If setting the audio role is not supported, an empty list is returned.
 +
-+        \since 5.6
++        \since 5.5
 +        \sa audioRole
 +    */
 +    function supportedAudioRoles() {
@@ -113,7 +113,7 @@ index d01c988..11d423f 100644
  //
  // This file was auto-generated by:
 -// 'qmlplugindump -nonrelocatable QtMultimedia 5.5'
-+// 'qmlplugindump -nonrelocatable QtMultimedia 5.6'
++// 'qmlplugindump -nonrelocatable QtMultimedia 5.5'
  
  Module {
 +    dependencies: ["QtQuick 2.0"]
@@ -212,7 +212,7 @@ index 60af623..5ef9ead 100644
 +    \li GameRole - game audio.
 +    \endlist
 +
-+    \since 5.6
++    \since 5.5
 +*/
 +QDeclarativeAudio::AudioRole QDeclarativeAudio::audioRole() const
 +{
@@ -239,7 +239,7 @@ index 60af623..5ef9ead 100644
 +
 +    If setting the audio role is not supported, an empty list is returned.
 +
-+    \since 5.6
++    \since 5.5
 +    \sa audioRole
 +*/
 +QJSValue QDeclarativeAudio::supportedAudioRoles() const
@@ -308,7 +308,7 @@ index 60af623..5ef9ead 100644
 +    \li GameRole - game audio.
 +    \endlist
 +
-+    \since 5.6
++    \since 5.5
 +*/
 +
 +/*!
@@ -318,7 +318,7 @@ index 60af623..5ef9ead 100644
 +
 +    If setting the audio role is not supported, an empty list is returned.
 +
-+    \since 5.6
++    \since 5.5
 +    \sa audioRole
 +*/
 +
@@ -440,7 +440,7 @@ index 8b452a1..72c24ad 100644
 +    
alue SonificationRole         Sonification, such as with user interface sounds
 +    
alue GameRole                 Game audio
 +
-+    \since 5.6
++    \since 5.5
 +    \sa QMediaPlayer::setAudioRole()
 +*/
 +
@@ -601,7 +601,7 @@ index 0000000..62696f0
 +    
-- 
qtmultimedia packaging