[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0.0-1+exp1-4-gc1dee9d

Fathi Boudra fabo at alioth.debian.org
Wed May 2 09:01:21 UTC 2012


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

The following commit has been merged in the master branch:
commit c1dee9d83a8c7139026959dfc6462e33253c2141
Author: Fathi Boudra <fathi.boudra at linaro.org>
Date:   Wed May 2 11:59:48 2012 +0300

    Prepare upload to Sid.
    Bump Build-Depends on Qt to >= 4.8.1.
    Bump debian/compat to 8.
    wrap and sort debian/control.
---
 debian/changelog |    6 +++++-
 debian/compat    |    2 +-
 debian/control   |   41 ++++++++++++++++++++++++++---------------
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd49c13..40c1c1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-phonon (4:4.6.0.0-2) UNRELEASED; urgency=low
+phonon (4:4.6.0.0-2) unstable; urgency=low
 
   [ Debconf translation updates ]
   * Polish (Michał Kułach). (Closes: #670645)
 
+  [ Fathi Boudra ]
+  * Bump Build-Depends on Qt to >= 4.8.1.
+  * Bump debian/compat to 8.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 27 Apr 2012 18:11:46 +0200
 
 phonon (4:4.6.0.0-1+exp1) experimental; urgency=low
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 010c9de..326bacf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,15 @@ 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>
-Build-Depends: debhelper (>= 8.1.3~), cmake (>= 2.6.2), pkg-kde-tools (>= 0.12),
- dpkg-dev (>= 1.15.5), automoc, libglib2.0-dev,
- libpulse-dev (>= 0.9.21), libqt4-dev (>= 4:4.8.0),
- libqzeitgeist-dev
+Build-Depends: automoc,
+               cmake (>= 2.6.2),
+               debhelper (>= 8.1.3~),
+               dpkg-dev (>= 1.15.5),
+               libglib2.0-dev,
+               libpulse-dev (>= 0.9.21),
+               libqt4-dev (>= 4:4.8.1),
+               libqzeitgeist-dev,
+               pkg-kde-tools (>= 0.12)
 Standards-Version: 3.9.3
 Homepage: http://phonon.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-req/phonon.git
@@ -15,10 +20,12 @@ Vcs-Git: git://git.debian.org/pkg-kde/kde-req/phonon.git
 Package: phonon
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libphonon4 (>= ${source:Version}),
- ${phonon:Recommended-Backend} | phonon-backend
-Suggests: ${phonon:Recommended-Backend}, phonon-backend-gstreamer,
- phonon-backend-mplayer
+Depends: libphonon4 (>= ${source:Version}),
+         ${misc:Depends},
+         ${phonon:Recommended-Backend} | phonon-backend
+Suggests: phonon-backend-gstreamer,
+          phonon-backend-mplayer,
+          ${phonon:Recommended-Backend}
 Conflicts: phonon-backend-xine
 Description: multimedia framework from KDE - metapackage
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
@@ -30,8 +37,11 @@ Description: multimedia framework from KDE - metapackage
 Package: libphonon-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libphonon4 (= ${binary:Version}),
- ${sameVersionDep:libqt4-dev:libphonon4}, phonon-backend-null | phonon
+Depends: libphonon4 (= ${binary:Version}),
+         phonon-backend-null | phonon,
+         ${misc:Depends},
+         ${sameVersionDep:libqt4-dev:libphonon4},
+         ${shlibs:Depends}
 Description: multimedia framework from KDE - development files
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
@@ -44,7 +54,7 @@ Architecture: any
 Multi-Arch: same
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: phonon-backend-xine (<< 4:4.6.0really4.3.80)
 Description: multimedia framework from KDE - core library
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
@@ -56,8 +66,9 @@ Description: multimedia framework from KDE - core library
 Package: libphononexperimental-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libphononexperimental4 (= ${binary:Version}),
- ${sameVersionDep:libqt4-dev:libphononexperimental4}
+Depends: libphononexperimental4 (= ${binary:Version}),
+         ${misc:Depends},
+         ${sameVersionDep:libqt4-dev:libphononexperimental4}
 Replaces: libphonon-dev (<< 4:4.6.0really4.4.4)
 Breaks: libphonon-dev (<< 4:4.6.0really4.4.4)
 Description: multimedia framework from KDE - experimental development files
@@ -74,7 +85,7 @@ Architecture: any
 Multi-Arch: same
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: phononexperimental-abi-1
 Replaces: libphonon4 (<< 4:4.6.0really4.3.80)
 Breaks: libphonon4 (<< 4:4.6.0really4.3.80)
@@ -106,7 +117,7 @@ Priority: extra
 Architecture: any
 Multi-Arch: same
 Section: debug
-Depends: ${misc:Depends}, libphonon4 (= ${binary:Version})
+Depends: libphonon4 (= ${binary:Version}), ${misc:Depends}
 Suggests: libphononexperimental4 (= ${binary:Version})
 Description: multimedia framework from KDE - debugging symbols
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction

-- 
Phonon Multimedia Framework packaging



More information about the pkg-kde-commits mailing list