[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.4.2-1-15-g180bd9a

Modestas Vainius modax at alioth.debian.org
Fri Nov 26 00:29:32 UTC 2010


The following commit has been merged in the master branch:
commit 2e9b326737d97ca055a9c0876fdccfb57b5b44ae
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Nov 26 01:54:57 2010 +0200

    Bump Standards-Version to 3.9.1.
    
    Add Breaks next to Replaces where needed.
---
 debian/changelog |    1 +
 debian/control   |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 85a1ce5..7aa32c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ phonon (4:4.6.0really4.4.3-1) UNRELEASED; urgency=low
   * Update symbol file. for 4.4.3 on amd64.
   * Update install files.
   * Remove references to obsolete << KDE 4.1 from debian/control.
+  * Bump Standards-Version to 3.9.1: add Breaks next to Replaces where needed.
 
  -- Modestas Vainius <modax at debian.org>  Fri, 26 Nov 2010 01:33:33 +0200
 
diff --git a/debian/control b/debian/control
index aa1cbf4..42e0fc7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.4.13), cmake (>= 2.6.2),
  libpulse-dev (>= 0.9.21), libqt4-dev (>= 4.5), libqt4-opengl-dev (>= 4.5),
  libxine-dev (>= 1.1.16.3), libxml2-dev
 Build-Conflicts: libxine2
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://www.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-req/phonon.git
 Vcs-Git: git://git.debian.org/pkg-kde/kde-req/phonon.git
@@ -57,6 +57,7 @@ Architecture: any
 Provides: phonon-backend
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xine-x:Depends}
 Replaces: kde-icons-oxygen (<< 4:4.1.80)
+Breaks: kde-icons-oxygen (<< 4:4.1.80)
 Description: Phonon Xine 1.1.x backend
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.

-- 
Phonon Multimedia Framework packaging



More information about the pkg-kde-commits mailing list