[SCM] qtmultimedia packaging branch, ubuntu, updated. ubuntu/5.5.1-1ubuntu2-13-gc8996f5

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit c952dd52502dc05272d0a0017ed74c9cb5ae2987
Merge: 186ea0e1b336b614752e5f458bb90ae165363cd5 89536f23523cb9583051136248e495458ba9e8dd
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Mar 8 09:14:53 2016 +0000

    Merge branch 'master' into ubuntu

 debian/changelog                        | 21 +++++++++++++++++++++
 debian/control                          |  1 +
 debian/patches/fix_alsa_detection.patch | 21 +++++++++++++++++++++
 debian/patches/series                   |  1 +
 4 files changed, 44 insertions(+)

diff --cc debian/changelog
index 49d8c42,c5e96fd..5e743ea
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,39 -1,24 +1,60 @@@
+ qtmultimedia-opensource-src (5.5.1-4) unstable; urgency=medium
+ 
+   * Add fix_alsa_detection.patch to workaround ALSA >= 1.1.0 detection.
+     - Bump build dependency on qtbase to 5.5.1+dfsg-16 to be sure Qt has
+       detected ALSA.
+   * Update symbols files with buildd's logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sat, 05 Mar 2016 19:57:12 -0300
+ 
+ qtmultimedia-opensource-src (5.5.1-3) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 21 Oct 2015 18:52:12 -0300
+ 
+ qtmultimedia-opensource-src (5.5.1-2) experimental; urgency=medium
+ 
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 19 Oct 2015 11:39:50 -0300
+ 
 +qtmultimedia-opensource-src (5.5.1-1ubuntu2) xenial; urgency=medium
 +
 +  [ Timo Jyrinki ]
 +  * More patches from upstream to the playlist:
 +    - debian/patches/Change-the-way-a-playlist-is-bound-to-a-media-object.patch
 +      (replaces earlier abandoned Sync-the-state... patch)
 +    - debian/patches/Added-addItems-to-QML-Playlist-for-batch-adding-of-t.patch
 +    - debian/patches/Added-insertItems-and-removeItems-to-QML-Playlist.patch
 +    - debian/patches/Add-moveItem-from-to-to-QMediaPlaylist.patch
 +
 +  [ Jim Hodapp ]
 +  * Related changes for compatibility reasons:
 +    - debian/patches/backport_adjustments.patch
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 22 Dec 2015 13:57:22 +0000
 +
 +qtmultimedia-opensource-src (5.5.1-1ubuntu1) xenial; urgency=medium
 +
 +  * New upstream release.
 +  * Update symbols.
 +  * Merge with Debian's packaging, remaining changes:
 +    - Build without OpenAL (in universe), so without qml-module-qtaudioengine
 +    - Transitional package for 14.04 LTS -> 16.04 LTS
 +    - Own .symbols files
 +    - Three patches
 +    - Enable tests
 +  * debian/patches/Add-audio-role-API-to-QMediaPlayer.patch
 +    debian/patches/Added-new-playlist-QML-type.patch:
 +    - The Audio role API and Playlist type patches were upstreamed for 
 +      Qt 5.6, use backported versions of those.
 +  * debian/patches/Sync-the-state-of-the-old-QMediaPlaylistControl-inst.patch
 +  * Regenerate headers for the audio role API
 +  * Drop upstreamed patch qgstreamercapturesession_avoid_race_eos.patch
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 01 Dec 2015 08:59:13 +0000
 +
  qtmultimedia-opensource-src (5.5.1-1) experimental; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index c24b9a8,ffab708..aaf737c
--- a/debian/control
+++ b/debian/control
@@@ -15,12 -14,10 +15,13 @@@ Build-Depends: debhelper (>= 9.0.0)
                 libpulse-dev,
                 libqt5opengl5-dev (>= 5.5.1+dfsg~),
                 pkg-kde-tools,
 +               qml-module-qtquick2,
 +               qml-module-qttest,
 +               qtbase5-dev (>= 5.5.1+dfsg~),
+                qtbase5-dev (>= 5.5.1+dfsg-16~),
                 qtbase5-private-dev (>= 5.5.1+dfsg~),
                 qtdeclarative5-private-dev (>= 5.5.1~),
 +               xvfb,
                 zlib1g-dev
  Build-Depends-Indep: libqt5sql5-sqlite (>= 5.5.1+dfsg~),
                       qtbase5-doc-html (>= 5.5.1+dfsg~),
diff --cc debian/patches/series
index 77fbb81,00e675a..7d3214d
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,13 -1,2 +1,14 @@@
+ fix_alsa_detection.patch
  rpath_nonlinux.diff
 +skip_failing_tests.patch
 +
 +# Backported patches
 +Added-new-playlist-QML-type.patch
 +Add-audio-role-API-to-QMediaPlayer.patch
 +Change-the-way-a-playlist-is-bound-to-a-media-object.patch
 +Added-addItems-to-QML-Playlist-for-batch-adding-of-t.patch
 +Added-insertItems-and-removeItems-to-QML-Playlist.patch
 +Add-moveItem-from-to-to-QMediaPlaylist.patch
 +
 +# Ubuntu patches
 +backport_adjustments.patch

-- 
qtmultimedia packaging