[SCM] qtmultimedia packaging branch, experimental, updated. debian/5.1.1-2-13-gd54bbda

Tue Dec 17 02:28:53 UTC 2013

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

The following commit has been merged in the experimental branch:
commit d54bbda38199087d42c863627962475d8b8936e9
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Dec 16 23:28:35 2013 -0300

    No-op wrap-and-sort.
---
 debian/control                        | 27 +++++++++++++--------------
 debian/copyright                      |  2 +-
 debian/qtmultimedia5-dev.install      |  4 ++--
 debian/qtmultimedia5-examples.install | 12 ++++++------
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/debian/control b/debian/control
index 2ae8e16..195c31c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,19 +9,18 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
            Timo Jyrinki <timo at debian.org>
 Build-Depends: debhelper (>= 9.0.0),
-               qtbase5-dev (>= 5.2.0+dfsg~),
-               libqt5opengl5-dev (>= 5.2.0+dfsg~),
-               qtbase5-private-dev (>= 5.2.0+dfsg~),
-               qtdeclarative5-private-dev (>= 5.2.0-1~),
                libasound2-dev [linux-any],
-               libpulse-dev,
                libgstreamer-plugins-base0.10-dev,
-               libopenal-dev,
                libgstreamer0.10-dev,
-               zlib1g-dev,
+               libopenal-dev,
+               libpulse-dev,
+               libqt5opengl5-dev (>= 5.2.0+dfsg~),
                pkg-kde-tools,
-Build-Depends-Indep: libqt5sql5-sqlite,
-                     qttools5-dev-tools (>= 5.2.0-1~)
+               qtbase5-dev (>= 5.2.0+dfsg~),
+               qtbase5-private-dev (>= 5.2.0+dfsg~),
+               qtdeclarative5-private-dev (>= 5.2.0-1~),
+               zlib1g-dev
+Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.2.0-1~)
 Standards-Version: 3.9.4
 Homepage: https://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtmultimedia.git
@@ -43,8 +42,9 @@ Package: libqt5multimedia5-plugins
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: libqt5multimedia5 (= ${binary:Version}), ${misc:Depends},
- ${shlibs:Depends}
+Depends: libqt5multimedia5 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Qt 5 Multimedia module plugins
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -115,9 +115,9 @@ Multi-Arch: same
 Section: x11
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: libqt5multimedia5-plugins (= ${binary:Version}),
+         qtdeclarative5-folderlistmodel-plugin,
          qtdeclarative5-qtmultimedia-plugin (= ${binary:Version}),
          qtdeclarative5-qtquick2-plugin,
-         qtdeclarative5-folderlistmodel-plugin,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Examples for Qt 5 Multimedia module
@@ -149,8 +149,7 @@ Priority: extra
 Architecture: any
 Multi-Arch: same
 Section: debug
-Depends: libqt5multimedia5 (= ${binary:Version}),
-         ${misc:Depends}
+Depends: libqt5multimedia5 (= ${binary:Version}), ${misc:Depends}
 Suggests: qtmultimedia5-examples (= ${binary:Version})
 Description: Qt 5 Multimedia library debugging symbols
  Qt is a cross-platform C++ application framework. Qt's primary feature
diff --git a/debian/copyright b/debian/copyright
index fb812c7..e7f2ab0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -161,4 +161,4 @@ License: GFDL-NIV-1.3
  will be met: http://www.gnu.org/copyleft/fdl.html.
  .
  On Debian systems, the complete text of the GFDL-1.3 license can be found in
- `/usr/share/common-licenses/GFDL-1.3`,
\ No newline at end of file
+ `/usr/share/common-licenses/GFDL-1.3`,
diff --git a/debian/qtmultimedia5-dev.install b/debian/qtmultimedia5-dev.install
index c43fdd9..af1887d 100644
--- a/debian/qtmultimedia5-dev.install
+++ b/debian/qtmultimedia5-dev.install
@@ -1,5 +1,3 @@
-usr/include/qt5/QtMultimedia/QtMultimediaDepends
-usr/include/qt5/QtMultimediaWidgets/QtMultimediaWidgetsDepends
 usr/include/qt5/QtMultimedia/QAbstractAudioDeviceInfo
 usr/include/qt5/QtMultimedia/QAbstractAudioInput
 usr/include/qt5/QtMultimedia/QAbstractAudioOutput
@@ -88,6 +86,7 @@ usr/include/qt5/QtMultimedia/QVideoRendererControl
 usr/include/qt5/QtMultimedia/QVideoSurfaceFormat
 usr/include/qt5/QtMultimedia/QVideoWindowControl
 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/qabstractvideosurface.h
@@ -173,6 +172,7 @@ usr/include/qt5/QtMultimediaWidgets/QGraphicsVideoItem
 usr/include/qt5/QtMultimediaWidgets/QVideoWidget
 usr/include/qt5/QtMultimediaWidgets/QVideoWidgetControl
 usr/include/qt5/QtMultimediaWidgets/QtMultimediaWidgets
+usr/include/qt5/QtMultimediaWidgets/QtMultimediaWidgetsDepends
 usr/include/qt5/QtMultimediaWidgets/QtMultimediaWidgetsVersion
 usr/include/qt5/QtMultimediaWidgets/qcameraviewfinder.h
 usr/include/qt5/QtMultimediaWidgets/qgraphicsvideoitem.h
diff --git a/debian/qtmultimedia5-examples.install b/debian/qtmultimedia5-examples.install
index 0045dcd..13d42b2 100644
--- a/debian/qtmultimedia5-examples.install
+++ b/debian/qtmultimedia5-examples.install
@@ -36,12 +36,17 @@ usr/lib/*/qt5/examples/multimedia/audiorecorder/qaudiolevel.h
 usr/lib/*/qt5/examples/multimedia/declarative-camera/CameraButton.qml
 usr/lib/*/qt5/examples/multimedia/declarative-camera/CameraPropertyButton.qml
 usr/lib/*/qt5/examples/multimedia/declarative-camera/CameraPropertyPopup.qml
+usr/lib/*/qt5/examples/multimedia/declarative-camera/FocusButton.qml
+usr/lib/*/qt5/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
+usr/lib/*/qt5/examples/multimedia/declarative-camera/PhotoPreview.qml
+usr/lib/*/qt5/examples/multimedia/declarative-camera/VideoCaptureControls.qml
+usr/lib/*/qt5/examples/multimedia/declarative-camera/VideoPreview.qml
+usr/lib/*/qt5/examples/multimedia/declarative-camera/ZoomControl.qml
 usr/lib/*/qt5/examples/multimedia/declarative-camera/declarative-camera
 usr/lib/*/qt5/examples/multimedia/declarative-camera/declarative-camera.pro
 usr/lib/*/qt5/examples/multimedia/declarative-camera/declarative-camera.qml
 usr/lib/*/qt5/examples/multimedia/declarative-camera/declarative-camera.qmlproject
 usr/lib/*/qt5/examples/multimedia/declarative-camera/declarative-camera.qrc
-usr/lib/*/qt5/examples/multimedia/declarative-camera/FocusButton.qml
 usr/lib/*/qt5/examples/multimedia/declarative-camera/images/camera_auto_mode.png
 usr/lib/*/qt5/examples/multimedia/declarative-camera/images/camera_camera_setting.png
 usr/lib/*/qt5/examples/multimedia/declarative-camera/images/camera_flash_auto.png
@@ -54,12 +59,7 @@ usr/lib/*/qt5/examples/multimedia/declarative-camera/images/camera_white_balance
 usr/lib/*/qt5/examples/multimedia/declarative-camera/images/camera_white_balance_sunny.png
 usr/lib/*/qt5/examples/multimedia/declarative-camera/images/toolbutton.png
 usr/lib/*/qt5/examples/multimedia/declarative-camera/images/toolbutton.sci
-usr/lib/*/qt5/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
-usr/lib/*/qt5/examples/multimedia/declarative-camera/PhotoPreview.qml
 usr/lib/*/qt5/examples/multimedia/declarative-camera/qmlcamera.cpp
-usr/lib/*/qt5/examples/multimedia/declarative-camera/VideoCaptureControls.qml
-usr/lib/*/qt5/examples/multimedia/declarative-camera/VideoPreview.qml
-usr/lib/*/qt5/examples/multimedia/declarative-camera/ZoomControl.qml
 usr/lib/*/qt5/examples/multimedia/declarative-radio/declarative-radio
 usr/lib/*/qt5/examples/multimedia/declarative-radio/declarative-radio.pro
 usr/lib/*/qt5/examples/multimedia/declarative-radio/declarative-radio.qrc

-- 
qtmultimedia packaging

