[SCM] qtmultimedia packaging branch, experimental, updated. debian/5.5.1-3-4-g09bca3a

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 09bca3adfa13b0e18786ed37ea9c0da7b121ff4a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jan 8 17:10:48 2016 -0300

    Update and sort install files.
---
 debian/changelog                        |  1 +
 debian/qtmultimedia5-dev.install-common | 15 ++++++++-------
 debian/qtmultimedia5-doc-html.install   |  1 -
 debian/qtmultimedia5-doc.install        |  1 -
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9490ead..24bf9b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtmultimedia-opensource-src (5.6.0~beta-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream beta release.
     - Bump Qt build dependencies.
+  * Update and sort install files.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Jan 2016 18:26:14 -0300
 
diff --git a/debian/qtmultimedia5-dev.install-common b/debian/qtmultimedia5-dev.install-common
index fc408f7..5270500 100644
--- a/debian/qtmultimedia5-dev.install-common
+++ b/debian/qtmultimedia5-dev.install-common
@@ -1,14 +1,9 @@
-usr/include/*/qt5/QtMultimedia/QAbstractVideoFilter
-usr/include/*/qt5/QtMultimedia/QCameraViewfinderSettings
-usr/include/*/qt5/QtMultimedia/QCameraViewfinderSettingsControl2
-usr/include/*/qt5/QtMultimedia/qcameraviewfindersettings.h
-usr/include/*/qt5/QtMultimedia/qabstractvideofilter.h
-usr/include/*/qt5/QtMultimedia/QVideoFilterRunnable
 usr/include/*/qt5/QtMultimedia/QAbstractAudioDeviceInfo
 usr/include/*/qt5/QtMultimedia/QAbstractAudioInput
 usr/include/*/qt5/QtMultimedia/QAbstractAudioOutput
 usr/include/*/qt5/QtMultimedia/QAbstractPlanarVideoBuffer
 usr/include/*/qt5/QtMultimedia/QAbstractVideoBuffer
+usr/include/*/qt5/QtMultimedia/QAbstractVideoFilter
 usr/include/*/qt5/QtMultimedia/QAbstractVideoSurface
 usr/include/*/qt5/QtMultimedia/QAudio
 usr/include/*/qt5/QtMultimedia/QAudioBuffer
@@ -24,6 +19,7 @@ usr/include/*/qt5/QtMultimedia/QAudioOutput
 usr/include/*/qt5/QtMultimedia/QAudioOutputSelectorControl
 usr/include/*/qt5/QtMultimedia/QAudioProbe
 usr/include/*/qt5/QtMultimedia/QAudioRecorder
+usr/include/*/qt5/QtMultimedia/QAudioRoleControl
 usr/include/*/qt5/QtMultimedia/QAudioSystemFactoryInterface
 usr/include/*/qt5/QtMultimedia/QAudioSystemPlugin
 usr/include/*/qt5/QtMultimedia/QCamera
@@ -45,7 +41,9 @@ usr/include/*/qt5/QtMultimedia/QCameraImageProcessingControl
 usr/include/*/qt5/QtMultimedia/QCameraInfo
 usr/include/*/qt5/QtMultimedia/QCameraInfoControl
 usr/include/*/qt5/QtMultimedia/QCameraLocksControl
+usr/include/*/qt5/QtMultimedia/QCameraViewfinderSettings
 usr/include/*/qt5/QtMultimedia/QCameraViewfinderSettingsControl
+usr/include/*/qt5/QtMultimedia/QCameraViewfinderSettingsControl2
 usr/include/*/qt5/QtMultimedia/QCameraZoomControl
 usr/include/*/qt5/QtMultimedia/QImageEncoderControl
 usr/include/*/qt5/QtMultimedia/QImageEncoderSettings
@@ -91,6 +89,7 @@ usr/include/*/qt5/QtMultimedia/QSoundEffect
 usr/include/*/qt5/QtMultimedia/QVideoDeviceSelectorControl
 usr/include/*/qt5/QtMultimedia/QVideoEncoderSettings
 usr/include/*/qt5/QtMultimedia/QVideoEncoderSettingsControl
+usr/include/*/qt5/QtMultimedia/QVideoFilterRunnable
 usr/include/*/qt5/QtMultimedia/QVideoFrame
 usr/include/*/qt5/QtMultimedia/QVideoProbe
 usr/include/*/qt5/QtMultimedia/QVideoRendererControl
@@ -100,6 +99,7 @@ usr/include/*/qt5/QtMultimedia/QtMultimedia
 usr/include/*/qt5/QtMultimedia/QtMultimediaDepends
 usr/include/*/qt5/QtMultimedia/QtMultimediaVersion
 usr/include/*/qt5/QtMultimedia/qabstractvideobuffer.h
+usr/include/*/qt5/QtMultimedia/qabstractvideofilter.h
 usr/include/*/qt5/QtMultimedia/qabstractvideosurface.h
 usr/include/*/qt5/QtMultimedia/qaudio.h
 usr/include/*/qt5/QtMultimedia/qaudiobuffer.h
@@ -114,6 +114,7 @@ usr/include/*/qt5/QtMultimedia/qaudiooutput.h
 usr/include/*/qt5/QtMultimedia/qaudiooutputselectorcontrol.h
 usr/include/*/qt5/QtMultimedia/qaudioprobe.h
 usr/include/*/qt5/QtMultimedia/qaudiorecorder.h
+usr/include/*/qt5/QtMultimedia/qaudiorolecontrol.h
 usr/include/*/qt5/QtMultimedia/qaudiosystem.h
 usr/include/*/qt5/QtMultimedia/qaudiosystemplugin.h
 usr/include/*/qt5/QtMultimedia/qcamera.h
@@ -133,6 +134,7 @@ usr/include/*/qt5/QtMultimedia/qcameraimageprocessingcontrol.h
 usr/include/*/qt5/QtMultimedia/qcamerainfo.h
 usr/include/*/qt5/QtMultimedia/qcamerainfocontrol.h
 usr/include/*/qt5/QtMultimedia/qcameralockscontrol.h
+usr/include/*/qt5/QtMultimedia/qcameraviewfindersettings.h
 usr/include/*/qt5/QtMultimedia/qcameraviewfindersettingscontrol.h
 usr/include/*/qt5/QtMultimedia/qcamerazoomcontrol.h
 usr/include/*/qt5/QtMultimedia/qimageencodercontrol.h
@@ -203,7 +205,6 @@ usr/lib/*/libQt5MultimediaWidgets.so
 usr/lib/*/libqgsttools_p.prl
 usr/lib/*/libqgsttools_p.so
 usr/lib/*/pkgconfig/Qt5Multimedia.pc
-usr/lib/*/pkgconfig/Qt5MultimediaQuick_p.pc
 usr/lib/*/pkgconfig/Qt5MultimediaWidgets.pc
 usr/lib/*/qt5/mkspecs/modules/qt_lib_multimedia.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri
diff --git a/debian/qtmultimedia5-doc-html.install b/debian/qtmultimedia5-doc-html.install
index ff9a5d4..d127529 100644
--- a/debian/qtmultimedia5-doc-html.install
+++ b/debian/qtmultimedia5-doc-html.install
@@ -1,2 +1 @@
 usr/share/qt5/doc/qtmultimedia/
-usr/share/qt5/doc/qtmultimediawidgets/
diff --git a/debian/qtmultimedia5-doc.install b/debian/qtmultimedia5-doc.install
index 142f331..0e7162d 100644
--- a/debian/qtmultimedia5-doc.install
+++ b/debian/qtmultimedia5-doc.install
@@ -1,2 +1 @@
 usr/share/qt5/doc/qtmultimedia.qch
-usr/share/qt5/doc/qtmultimediawidgets.qch

-- 
qtmultimedia packaging