rev 12701 - in branches/kde4.2/packages/phonon/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-11-22 09:34:21 +0000 (Sat, 22 Nov 2008)
New Revision: 12701

Added:
   branches/kde4.2/packages/phonon/debian/patches/
   branches/kde4.2/packages/phonon/debian/patches/01_phonon-inc.patch
   branches/kde4.2/packages/phonon/debian/patches/series
Modified:
   branches/kde4.2/packages/phonon/debian/changelog
Log:
new snapshot. merge Sune changes

Modified: branches/kde4.2/packages/phonon/debian/changelog
===================================================================
--- branches/kde4.2/packages/phonon/debian/changelog	2008-11-22 09:28:08 UTC (rev 12700)
+++ branches/kde4.2/packages/phonon/debian/changelog	2008-11-22 09:34:21 UTC (rev 12701)
@@ -1,4 +1,4 @@
-phonon (4:4.2.80+svn886909-0r1) UNRELEASED; urgency=low
+phonon (4:4.2.80+svn887051-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -12,9 +12,24 @@
   * Add symbols file for libphonon4. This needs pkg-kde-tools (>=0.3)
     at build time.
     - Hook up phonon dependency to play(), stop(), pause() etc. methods.
+  * Resync patches:
+    - drop phonon-libraryPaths.patch patch. Merged upstream.
+    - prepend sequence number to phonon-inc.patch (01_) and refresh it.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Nov 2008 20:59:02 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Nov 2008 11:31:03 +0200
 
+phonon (4:4.2.0-2) unstable; urgency=low
+
+  * Make phonon find its backends. (Closes: 498573)
+    Thanks to Vincent Fourmond for tracking down the cause and Matthias Kretz
+    for the fix.
+  * Create a magic phonon header (thanks to Matthias Kretz) and as the Qt.
+    documentation is unclear, symlink Phonon to the phonon header.
+    Also create a symlink from /usr/include/qt4/phonon to /usr/include/phonon
+    so that application using qmake can use it.
+.
+ -- Sune Vuorela <debian at pusling.com>  Thu, 20 Nov 2008 20:06:34 +0100
+
 phonon (4:4.2.0-1) unstable; urgency=low
 
   * New upstream release.

Added: branches/kde4.2/packages/phonon/debian/patches/01_phonon-inc.patch
===================================================================
--- branches/kde4.2/packages/phonon/debian/patches/01_phonon-inc.patch	                        (rev 0)
+++ branches/kde4.2/packages/phonon/debian/patches/01_phonon-inc.patch	2008-11-22 09:34:21 UTC (rev 12701)
@@ -0,0 +1,44 @@
+--- a/phonon/CMakeLists.txt
++++ b/phonon/CMakeLists.txt
+@@ -102,3 +102,7 @@
+    DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
+ 
+ install(FILES org.kde.Phonon.AudioOutput.xml  DESTINATION  ${DBUS_INTERFACES_INSTALL_DIR})
++
++install(FILES
++   phonon
++DESTINATION ${INCLUDE_INSTALL_DIR}/phonon)
+--- /dev/null
++++ b/phonon/phonon
+@@ -0,0 +1,31 @@
++#include "abstractaudiooutput.h"
++#include "abstractmediastream.h"
++#include "abstractvideooutput.h"
++#include "addoninterface.h"
++#include "audiooutput.h"
++#include "audiooutputinterface.h"
++#include "backendcapabilities.h"
++#include "backendinterface.h"
++#include "effect.h"
++#include "effectinterface.h"
++#include "effectparameter.h"
++#include "effectwidget.h"
++#include "mediacontroller.h"
++#include "medianode.h"
++#include "mediaobject.h"
++#include "mediaobjectinterface.h"
++#include "mediasource.h"
++#include "objectdescription.h"
++#include "objectdescriptionmodel.h"
++#include "path.h"
++#include "phonondefs.h"
++#include "phononnamespace.h"
++#include "platformplugin.h"
++#include "seekslider.h"
++#include "streaminterface.h"
++#include "videoplayer.h"
++#include "videowidget.h"
++#include "videowidgetinterface.h"
++#include "volumefadereffect.h"
++#include "volumefaderinterface.h"
++#include "volumeslider.h"

Added: branches/kde4.2/packages/phonon/debian/patches/series
===================================================================
--- branches/kde4.2/packages/phonon/debian/patches/series	                        (rev 0)
+++ branches/kde4.2/packages/phonon/debian/patches/series	2008-11-22 09:34:21 UTC (rev 12701)
@@ -0,0 +1 @@
+01_phonon-inc.patch