[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.8.0-3-2-g9b327cf

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Mon Oct 6 17:05:02 UTC 2014


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

The following commit has been merged in the master branch:
commit 9b327cf3d06eb0b116597a8924934157f4c3fa05
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Oct 6 14:04:50 2014 -0300

    No-op wrap-and-sort.
---
 debian/control                   | 14 +++++++-------
 debian/libphonon4qt5-dev.install |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index ba8a5f1..f626dcc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,10 @@ Source: phonon
 Section: sound
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Modestas Vainius <modax at debian.org>, Fathi Boudra <fabo at debian.org>,
-           Diane Trout <diane at ghic.org>, Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Uploaders: Modestas Vainius <modax at debian.org>,
+           Fathi Boudra <fabo at debian.org>,
+           Diane Trout <diane at ghic.org>,
+           Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 Build-Depends: automoc,
                cmake (>= 2.8.7),
                debhelper (>= 9),
@@ -11,11 +13,11 @@ Build-Depends: automoc,
                libglib2.0-dev,
                libpulse-dev (>= 0.9.21),
                libqt4-dev (>= 4:4.8.1),
+               libqt5opengl5-dev,
                libqzeitgeist-dev,
                pkg-kde-tools (>= 0.12),
                qtbase5-dev,
-               qttools5-dev,
-               libqt5opengl5-dev
+               qttools5-dev
 Standards-Version: 3.9.5
 Homepage: http://phonon.kde.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-req/phonon.git
@@ -27,9 +29,7 @@ Multi-Arch: same
 Depends: libphonon4 (>= ${source:Version}),
          ${misc:Depends},
          ${phonon:Recommended-Backend-qt4} | phonon-backend
-Suggests: phonon-backend-gstreamer,
-          phonon-backend-mplayer,
-          phonon-backend-vlc
+Suggests: phonon-backend-gstreamer, phonon-backend-mplayer, phonon-backend-vlc
 Breaks: phonon-backend-xine (<< 4:4.6.0.0)
 Description: multimedia framework from KDE using Qt 4 - metapackage
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
diff --git a/debian/libphonon4qt5-dev.install b/debian/libphonon4qt5-dev.install
index ab2705a..c316eea 100644
--- a/debian/libphonon4qt5-dev.install
+++ b/debian/libphonon4qt5-dev.install
@@ -155,8 +155,8 @@ usr/lib/*/cmake/phonon4qt5/PhononTargets-debian.cmake
 usr/lib/*/cmake/phonon4qt5/PhononTargets.cmake
 usr/lib/*/libphonon4qt5.so
 usr/lib/*/pkgconfig/phonon4qt5.pc
-usr/lib/*/qt5/plugins/designer/libphononwidgets.so
 usr/lib/*/qt5/mkspecs/modules/qt_phonon4qt5.pri
+usr/lib/*/qt5/plugins/designer/libphononwidgets.so
 usr/share/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml
 usr/share/phonon/buildsystem/COPYING-CMAKE-SCRIPTS
 usr/share/phonon4qt5/buildsystem/COPYING-CMAKE-SCRIPTS

-- 
Phonon Multimedia Framework packaging



More information about the pkg-kde-commits mailing list