[SCM] qtmultimedia packaging branch, ubuntu+1, updated. ubuntu/5.5.1-4ubuntu1-26-gdb1a987

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit db1a9870be217e3408a3c6fafe5f246185a7e837
Merge: 4a22e2f567f8d5100af17a068626523d374424de 435c9f03f508c92cfec1c6a13a183c8f044cf7e3
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Mar 21 13:37:18 2016 +0000

    Merge branch 'experimental' into ubuntu+1

 debian/changelog                        | 22 +++++++++++++++++++++-
 debian/control                          | 18 +++++++++---------
 debian/patches/fix_alsa_detection.patch | 21 ---------------------
 debian/patches/series                   |  1 -
 debian/rules                            | 17 ++++-------------
 5 files changed, 34 insertions(+), 45 deletions(-)

diff --cc debian/changelog
index 5630a98,780034a..be7e291
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,23 +1,35 @@@
- qtmultimedia-opensource-src (5.6.0~beta-1ubuntu1) UNRELEASED; urgency=medium
++qtmultimedia-opensource-src (5.6.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * Drop patches merged upstream:
 +    - 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
 +  * Drop unneeded Ubuntu specific patch.
 +  * Update symbols.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 28 Jan 2016 10:28:53 +0000
 +
+ qtmultimedia-opensource-src (5.6.0~rc-2) experimental; urgency=medium
+ 
+   * Bump Qt build dependencies.
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 09 Mar 2016 23:54:30 -0300
+ 
+ qtmultimedia-opensource-src (5.6.0~rc-1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * Merge 5.5.1-4 upload from unstable.
+   * Update debian/libqgsttools-p1.symbols from buildds’ logs.
+   * Stop marking private symbols (we no longer need explicit marks).
+   * Use recommended https URIs for Vcs fields.
+   * Drop fix_alsa_detection.patch, a different version applied upstream.
+   * Update symbols files from the current build log.
+   * Bump Standards-Version to 3.9.7, no changes needed.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 06 Mar 2016 22:46:46 +0300
+ 
  qtmultimedia-opensource-src (5.6.0~beta-1) experimental; urgency=medium
  
    * New upstream beta release.
diff --cc debian/control
index a3c7245,0f1e44d..d32d946
--- a/debian/control
+++ b/debian/control
@@@ -12,23 -11,21 +12,23 @@@ Build-Depends: debhelper (>= 9.0.0)
                 libasound2-dev [linux-any],
                 libgstreamer-plugins-base1.0-dev,
                 libgstreamer1.0-dev,
 -               libopenal-dev,
                 libpulse-dev,
-                libqt5opengl5-dev (>= 5.6.0~beta+dfsg~),
 -               libqt5opengl5-dev (>= 5.6.0~rc+dfsg~),
++               libqt5opengl5-dev (>= 5.6.0+dfsg~),
                 pkg-kde-tools,
 -               qtbase5-dev (>= 5.6.0~rc+dfsg~),
 -               qtbase5-private-dev (>= 5.6.0~rc+dfsg~),
 -               qtdeclarative5-private-dev (>= 5.6.0~rc~),
 +               qml-module-qtquick2,
 +               qml-module-qttest,
-                qtbase5-dev (>= 5.6.0~beta+dfsg~),
-                qtbase5-private-dev (>= 5.6.0~beta+dfsg~),
-                qtdeclarative5-private-dev (>= 5.6.0~beta~),
++               qtbase5-dev (>= 5.6.0+dfsg~),
++               qtbase5-private-dev (>= 5.6.0+dfsg~),
++               qtdeclarative5-private-dev (>= 5.6.0~),
 +               xvfb,
                 zlib1g-dev
- Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0~beta+dfsg~),
-                      qtbase5-doc-html (>= 5.6.0~beta+dfsg~),
 -Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0~rc+dfsg~),
 -                     qtbase5-doc-html (>= 5.6.0~rc+dfsg~),
++Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0+dfsg~),
++                     qtbase5-doc-html (>= 5.6.0+dfsg~),
                       qttools5-dev-tools (>= 5.6.0~)
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
  Homepage: https://qt-project.org/
- Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtmultimedia.git
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/qt/qtmultimedia.git
+ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtmultimedia.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qtmultimedia.git
  
  Package: libqt5multimedia5
  Architecture: any
diff --cc debian/patches/series
index 55a2ffb,1662367..8aa347c
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,1 +1,7 @@@
- fix_alsa_detection.patch
  rpath_nonlinux.diff
 +skip_failing_tests.patch
 +
 +# Backported patches
 +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

-- 
qtmultimedia packaging