[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.5.0-6-4-ga900c3c

Tue Dec 20 11:34:53 UTC 2011

The following commit has been merged in the master branch:
commit 5a61767644ff81c5f7990623af17fbf924e566e6
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 20 11:53:52 2011 +0100

    update the patches for the new version
    
    - phonon-inc.patch: adapt to the new version
    - phonon_is_not_forced_in_KDE.diff: refresh
    - upstream_PHONON_EXPORT_DEPRECATED.diff: drop, applied upstream
    - upstream_pulse-Use-qPow-as-pow-is-sometimes-not-found.patch: drop, applied upstream
---
 debian/changelog                                   |    8 ++++
 debian/patches/phonon-inc.patch                    |    8 ++--
 debian/patches/phonon_is_not_forced_in_KDE.diff    |    2 +-
 debian/patches/series                              |    2 -
 .../patches/upstream_PHONON_EXPORT_DEPRECATED.diff |   25 --------------
 ...se-Use-qPow-as-pow-is-sometimes-not-found.patch |   35 --------------------
 6 files changed, 13 insertions(+), 67 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68a1680..d013f51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,14 @@ phonon (4:4.6.0really4.5.1-0r1) UNRELEASED; urgency=low
 
   * New upstream release.
 
+  [ Pino Toscano ]
+  * Update the patches:
+    - phonon-inc.patch: adapt to the new version
+    - phonon_is_not_forced_in_KDE.diff: refresh
+    - upstream_PHONON_EXPORT_DEPRECATED.diff: drop, applied upstream
+    - upstream_pulse-Use-qPow-as-pow-is-sometimes-not-found.patch: drop,
+      applied upstream
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 20 Dec 2011 11:40:28 +0100
 
 phonon (4:4.6.0really4.5.0-6) unstable; urgency=low
diff --git a/debian/patches/phonon-inc.patch b/debian/patches/phonon-inc.patch
index 432e351..1b84f13 100644
--- a/debian/patches/phonon-inc.patch
+++ b/debian/patches/phonon-inc.patch
@@ -2,14 +2,14 @@ From: Sune Vuorela <debian at pusling.com>
 Subject: Create a magic phonon header
  Thanks to Matthias Kretz.
 Forwarded: no
+Last-Update: 2011-12-20
 
 --- a/phonon/CMakeLists.txt
 +++ b/phonon/CMakeLists.txt
-@@ -150,3 +150,7 @@ install(FILES
-    DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
+@@ -153,3 +153,6 @@ if (QT_QTDBUS_FOUND AND NOT PHONON_NO_DB
+     install(FILES org.kde.Phonon.AudioOutput.xml  DESTINATION  ${DBUS_INTERFACES_INSTALL_DIR})
+ endif (QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
  
- install(FILES org.kde.Phonon.AudioOutput.xml  DESTINATION  ${DBUS_INTERFACES_INSTALL_DIR})
-+
 +install(FILES
 +   phonon
 +DESTINATION ${INCLUDE_INSTALL_DIR}/phonon)
diff --git a/debian/patches/phonon_is_not_forced_in_KDE.diff b/debian/patches/phonon_is_not_forced_in_KDE.diff
index dbaf42b..9dc76d4 100644
--- a/debian/patches/phonon_is_not_forced_in_KDE.diff
+++ b/debian/patches/phonon_is_not_forced_in_KDE.diff
@@ -4,7 +4,7 @@ Forwarded: no
 
 --- a/includes/CMakeLists.txt
 +++ b/includes/CMakeLists.txt
-@@ -87,7 +87,7 @@ install( FILES
+@@ -90,7 +90,7 @@ install( FILES
    old/Phonon/VolumeFaderEffect
    old/Phonon/VolumeFaderInterface
    old/Phonon/VolumeSlider
diff --git a/debian/patches/series b/debian/patches/series
index 1b78929..d69ec3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 phonon-inc.patch
 no_rpath.patch
 phonon_is_not_forced_in_KDE.diff
-upstream_PHONON_EXPORT_DEPRECATED.diff
 findqt4_optional_x11.diff
-upstream_pulse-Use-qPow-as-pow-is-sometimes-not-found.patch
diff --git a/debian/patches/upstream_PHONON_EXPORT_DEPRECATED.diff b/debian/patches/upstream_PHONON_EXPORT_DEPRECATED.diff
deleted file mode 100644
index 9aac625..0000000
--- a/debian/patches/upstream_PHONON_EXPORT_DEPRECATED.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From 974fb5f6ef5e21d5e91df48025f4f7cfb857efc7 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Tue, 5 Apr 2011 10:56:14 +0200
-Subject: [PATCH] use PHONON_EXPORT_DEPRECATED instead of PHONON_DEPRECATED+PHONON_EXPORT
-
----
- phonon/objectdescription.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/phonon/objectdescription.h b/phonon/objectdescription.h
-index 51158fe..b18272c 100644
---- a/phonon/objectdescription.h
-+++ b/phonon/objectdescription.h
-@@ -346,7 +346,7 @@ typedef QPair<QByteArray, QString> DeviceAccess;
-  */
- typedef QList<DeviceAccess> DeviceAccessList;
- 
--void PHONON_DEPRECATED PHONON_EXPORT registerMetaTypes();
-+void PHONON_EXPORT_DEPRECATED registerMetaTypes();
- 
- } //namespace Phonon
- 
--- 
-1.7.4.1
-
diff --git a/debian/patches/upstream_pulse-Use-qPow-as-pow-is-sometimes-not-found.patch b/debian/patches/upstream_pulse-Use-qPow-as-pow-is-sometimes-not-found.patch
deleted file mode 100644
index 160fed6..0000000
--- a/debian/patches/upstream_pulse-Use-qPow-as-pow-is-sometimes-not-found.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d7d3a08d4c9dff8da5299aeaefe28e1e02d03ee6 Mon Sep 17 00:00:00 2001
-From: Colin Guthrie <colin at mageia.org>
-Date: Thu, 4 Aug 2011 16:55:47 +0100
-Subject: [PATCH] pulse: Use qPow() as pow() is sometimes not found. (cherry
- picked from commit
- 436d5379abe83c53c652d8a251f7ab504a1523df)
-
----
- phonon/pulsestream.cpp |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/phonon/pulsestream.cpp b/phonon/pulsestream.cpp
-index d1e6711..e129f1b 100644
---- a/phonon/pulsestream.cpp
-+++ b/phonon/pulsestream.cpp
-@@ -21,6 +21,7 @@
- */
- 
- #include "pulsestream_p.h"
-+#include <QtCore/qmath.h>
- 
- QT_BEGIN_NAMESPACE
- 
-@@ -81,7 +82,7 @@ void PulseStream::setVolume(const pa_cvolume *volume)
-         // AudioOutput expects the "backend" to supply values that have been
-         // adjusted for Stephens' law, so we need to fudge them accordingly
-         // so that the %ages match up in KMix/the application's own slider.
--        emit volumeChanged(pow(vol, VOLTAGE_TO_LOUDNESS_EXPONENT));
-+        emit volumeChanged(qPow(vol, VOLTAGE_TO_LOUDNESS_EXPONENT));
-     }
- }
- 
--- 
-1.7.7.3
-

-- 
Phonon Multimedia Framework packaging

