[SCM] qtmultimedia packaging branch, ubuntu+1, updated. ubuntu/5.6.1-2ubuntu1-17-g6b8bec6

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit 6b8bec6e74c5b7330b2313c145e4e3e3e483e846
Merge: c9ba4b82d15a13e90031f00066f553041f4f691d d6fc54a80e994a9f0857be5c28788661476655c2
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Sep 15 12:22:38 2016 +0000

    Merge branch 'experimental' into ubuntu+1

 debian/changelog                   |  14 +++
 debian/control                     |  30 ++----
 debian/copyright                   | 183 +++++++++++++++++++++++--------------
 debian/patches/rpath_nonlinux.diff |   2 +-
 debian/rules                       |  14 +--
 5 files changed, 143 insertions(+), 100 deletions(-)

diff --cc debian/changelog
index e3bdf05,bef3953..a4718e2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,17 +1,32 @@@
+ qtmultimedia-opensource-src (5.7.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Refresh debian/patches/rpath_nonlinux.diff.
+   * Update debian/copyright.
+   * Bump Qt build-dependencies to 5.7.0.
+   * Drop obsolete Breaks/Replaces.
+   * Switch to automatic dbgsym packages.
+   * Clean up unused code in debian/rules.
+   * Define DEB_HOST_ARCH properly in debian/rules.
+   * Update the symbols files.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 17 Aug 2016 20:34:38 +0300
+ 
 +qtmultimedia-opensource-src (5.6.1-2ubuntu1~1) yakkety; 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.
 +  * debian/patches/PulseAudio-change-the-way-volume-is-applied.patch:
 +    - Use upstream version instead of the backported to 5.5 version.
 +  * Drop the Pulseaudio patch, now included in 5.6.1.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 28 Jan 2016 10:28:53 +0000
 +
  qtmultimedia-opensource-src (5.6.1-2) unstable; urgency=medium
  
    * Upload to unstable.
diff --cc debian/control
index ffd16da,794b099..2271bf7
--- a/debian/control
+++ b/debian/control
@@@ -12,19 -11,17 +12,19 @@@ Build-Depends: debhelper (>= 9.20160114
                 libasound2-dev [linux-any],
                 libgstreamer-plugins-base1.0-dev,
                 libgstreamer1.0-dev,
 -               libopenal-dev,
                 libpulse-dev,
-                libqt5opengl5-dev (>= 5.6.1+dfsg~),
+                libqt5opengl5-dev (>= 5.7.0+dfsg~),
                 pkg-kde-tools,
 +               qml-module-qtquick2,
 +               qml-module-qttest,
-                qtbase5-dev (>= 5.6.1+dfsg~),
-                qtbase5-private-dev (>= 5.6.1+dfsg~),
-                qtdeclarative5-private-dev (>= 5.6.1~),
+                qtbase5-dev (>= 5.7.0+dfsg~),
+                qtbase5-private-dev (>= 5.7.0+dfsg~),
+                qtdeclarative5-private-dev (>= 5.7.0~),
 +               xvfb,
                 zlib1g-dev
- Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.1+dfsg~),
-                      qtbase5-doc-html (>= 5.6.1+dfsg~),
-                      qttools5-dev-tools (>= 5.6.1~)
+ Build-Depends-Indep: libqt5sql5-sqlite (>= 5.7.0+dfsg~),
+                      qtbase5-doc-html (>= 5.7.0+dfsg~),
+                      qttools5-dev-tools (>= 5.7.0~)
  Standards-Version: 3.9.8
  Homepage: https://qt-project.org/
  Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtmultimedia.git
diff --cc debian/rules
index def03ff,fb11071..d37e0f5
--- a/debian/rules
+++ b/debian/rules
@@@ -14,15 -15,11 +15,13 @@@ export QT_SELECT := qt
  pkgs_with_common = $(patsubst debian/%.install-common,%,$(wildcard debian/*.install-common))
  # Retrieve packages that have a .install-$DEB_HOST_ARCH file
  pkgs_with_arch = $(patsubst debian/%.install-$(DEB_HOST_ARCH),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH)))
- # Retrieve packages that have a .install-$DEB_HOST_ARCH_OS file
- pkgs_with_os = $(patsubst debian/%.install-$(DEB_HOST_ARCH_OS),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH_OS)))
  
  %:
- 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtmultimedia5-dbg
+ 	dh $@ --parallel --with pkgkde_symbolshelper
  
  override_dh_auto_configure:
 +	# Regenerate headers for the upstream audio role patch backport
 +	mkdir .git
  	qmake
  
  override_dh_auto_build-indep:

-- 
qtmultimedia packaging