[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.8.3-2-16-g50126fc

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 14 20:06:45 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/phonon.git;a=commitdiff;h=610248e

The following commit has been merged in the master branch:
commit 610248e2a5439eaa3dad2b0ce2108d3dd2991b74
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat May 14 17:46:56 2016 +0200

    Add qtquick1-5-dev missing build dependency
---
 debian/control                   | 4 ++--
 debian/libphonon-dev.install     | 4 ++--
 debian/libphonon4qt5-dev.install | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 9d9bd3b..6d04784 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: cmake (>= 2.8.7),
                libqzeitgeist-dev,
                pkg-kde-tools (>= 0.12),
                qtbase5-dev,
+               qtquick1-5-dev,
                qttools5-dev
 Standards-Version: 3.9.6
 Homepage: http://phonon.kde.org/
@@ -44,8 +45,7 @@ Multi-Arch: same
 Depends: libphonon4qt5-4 (>= ${source:Version}),
          ${misc:Depends},
          ${phonon:Recommended-Backend-qt5} | phonon4qt5-backend
-Suggests: phonon4qt5-backend-gstreamer,
-          phonon4qt5-backend-vlc
+Suggests: phonon4qt5-backend-gstreamer, phonon4qt5-backend-vlc
 Description: multimedia framework from KDE using Qt 5 - metapackage
  Phonon Qt 5 is a multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
diff --git a/debian/libphonon-dev.install b/debian/libphonon-dev.install
index ef28eea..37038f0 100644
--- a/debian/libphonon-dev.install
+++ b/debian/libphonon-dev.install
@@ -173,7 +173,7 @@ usr/share/phonon/buildsystem/MacroLogFeature.cmake
 usr/share/phonon/buildsystem/MacroOptionalFindPackage.cmake
 usr/share/phonon/buildsystem/MacroPushRequiredVars.cmake
 usr/share/phonon/buildsystem/PhononMacros.cmake
-usr/share/phonon/buildsystem/cmake_uninstall.cmake.in
-usr/share/qt4/mkspecs/modules/qt_phonon.pri
 usr/share/phonon/buildsystem/PhononQt4.cmake
 usr/share/phonon/buildsystem/PhononQt5.cmake
+usr/share/phonon/buildsystem/cmake_uninstall.cmake.in
+usr/share/qt4/mkspecs/modules/qt_phonon.pri
diff --git a/debian/libphonon4qt5-dev.install b/debian/libphonon4qt5-dev.install
index da38bed..c7d5cf8 100644
--- a/debian/libphonon4qt5-dev.install
+++ b/debian/libphonon4qt5-dev.install
@@ -200,6 +200,6 @@ usr/share/phonon4qt5/buildsystem/MacroLogFeature.cmake
 usr/share/phonon4qt5/buildsystem/MacroOptionalFindPackage.cmake
 usr/share/phonon4qt5/buildsystem/MacroPushRequiredVars.cmake
 usr/share/phonon4qt5/buildsystem/PhononMacros.cmake
-usr/share/phonon4qt5/buildsystem/cmake_uninstall.cmake.in
 usr/share/phonon4qt5/buildsystem/PhononQt4.cmake
 usr/share/phonon4qt5/buildsystem/PhononQt5.cmake
+usr/share/phonon4qt5/buildsystem/cmake_uninstall.cmake.in

-- 
Phonon Multimedia Framework packaging



More information about the pkg-kde-commits mailing list