rev 17194 - in trunk/packages/phonon/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2010-02-28 01:26:09 +0000 (Sun, 28 Feb 2010)
New Revision: 17194

Added:
   trunk/packages/phonon/debian/patches/03_phonon_is_not_forced_in_KDE.diff
Modified:
   trunk/packages/phonon/debian/changelog
   trunk/packages/phonon/debian/libphonon-dev.install
   trunk/packages/phonon/debian/libphonon-dev.links
   trunk/packages/phonon/debian/patches/series
Log:
Fix installing of include headers so that others can also find them.

Modified: trunk/packages/phonon/debian/changelog
===================================================================
--- trunk/packages/phonon/debian/changelog	2010-02-28 01:21:02 UTC (rev 17193)
+++ trunk/packages/phonon/debian/changelog	2010-02-28 01:26:09 UTC (rev 17194)
@@ -1,4 +1,4 @@
-phonon (4:4.6.0really4.3.80-0r6) UNRELEASED; urgency=low
+phonon (4:4.6.0really4.3.80-0r7) UNRELEASED; urgency=low
 
   * New upstream release (using really-style version number).
 
@@ -42,6 +42,9 @@
   * Build depend on dpkg-dev 1.15.5.
   * Make libphonon4 break phonon-backend-xine (<< 4:4.6.0really4.3.80).
 
+  [ Sune Vuorela ]
+  * Fix installing of include headers so that others can also find them.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 12 Feb 2010 13:23:15 +0100
 
 phonon-backends (4:4.3.1-5) unstable; urgency=low

Modified: trunk/packages/phonon/debian/libphonon-dev.install
===================================================================
--- trunk/packages/phonon/debian/libphonon-dev.install	2010-02-28 01:21:02 UTC (rev 17193)
+++ trunk/packages/phonon/debian/libphonon-dev.install	2010-02-28 01:26:09 UTC (rev 17194)
@@ -1,39 +1,39 @@
-usr/include/KDE/Phonon/AbstractAudioOutput
-usr/include/KDE/Phonon/AbstractMediaStream
-usr/include/KDE/Phonon/AbstractVideoOutput
-usr/include/KDE/Phonon/AddonInterface
-usr/include/KDE/Phonon/AudioDevice
-usr/include/KDE/Phonon/AudioDeviceEnumerator
-usr/include/KDE/Phonon/AudioOutput
-usr/include/KDE/Phonon/AudioOutputDevice
-usr/include/KDE/Phonon/AudioOutputDeviceModel
-usr/include/KDE/Phonon/AudioOutputInterface
-usr/include/KDE/Phonon/BackendCapabilities
-usr/include/KDE/Phonon/BackendInterface
-usr/include/KDE/Phonon/Effect
-usr/include/KDE/Phonon/EffectDescription
-usr/include/KDE/Phonon/EffectDescriptionModel
-usr/include/KDE/Phonon/EffectInterface
-usr/include/KDE/Phonon/EffectParameter
-usr/include/KDE/Phonon/EffectWidget
-usr/include/KDE/Phonon/Global
-usr/include/KDE/Phonon/MediaController
-usr/include/KDE/Phonon/MediaNode
-usr/include/KDE/Phonon/MediaObject
-usr/include/KDE/Phonon/MediaObjectInterface
-usr/include/KDE/Phonon/MediaSource
-usr/include/KDE/Phonon/ObjectDescription
-usr/include/KDE/Phonon/ObjectDescriptionModel
-usr/include/KDE/Phonon/Path
-usr/include/KDE/Phonon/PlatformPlugin
-usr/include/KDE/Phonon/SeekSlider
-usr/include/KDE/Phonon/StreamInterface
-usr/include/KDE/Phonon/VideoPlayer
-usr/include/KDE/Phonon/VideoWidget
-usr/include/KDE/Phonon/VideoWidgetInterface
-usr/include/KDE/Phonon/VolumeFaderEffect
-usr/include/KDE/Phonon/VolumeFaderInterface
-usr/include/KDE/Phonon/VolumeSlider
+usr/include/phonon/Phonon/AbstractAudioOutput
+usr/include/phonon/Phonon/AbstractMediaStream
+usr/include/phonon/Phonon/AbstractVideoOutput
+usr/include/phonon/Phonon/AddonInterface
+usr/include/phonon/Phonon/AudioDevice
+usr/include/phonon/Phonon/AudioDeviceEnumerator
+usr/include/phonon/Phonon/AudioOutput
+usr/include/phonon/Phonon/AudioOutputDevice
+usr/include/phonon/Phonon/AudioOutputDeviceModel
+usr/include/phonon/Phonon/AudioOutputInterface
+usr/include/phonon/Phonon/BackendCapabilities
+usr/include/phonon/Phonon/BackendInterface
+usr/include/phonon/Phonon/Effect
+usr/include/phonon/Phonon/EffectDescription
+usr/include/phonon/Phonon/EffectDescriptionModel
+usr/include/phonon/Phonon/EffectInterface
+usr/include/phonon/Phonon/EffectParameter
+usr/include/phonon/Phonon/EffectWidget
+usr/include/phonon/Phonon/Global
+usr/include/phonon/Phonon/MediaController
+usr/include/phonon/Phonon/MediaNode
+usr/include/phonon/Phonon/MediaObject
+usr/include/phonon/Phonon/MediaObjectInterface
+usr/include/phonon/Phonon/MediaSource
+usr/include/phonon/Phonon/ObjectDescription
+usr/include/phonon/Phonon/ObjectDescriptionModel
+usr/include/phonon/Phonon/Path
+usr/include/phonon/Phonon/PlatformPlugin
+usr/include/phonon/Phonon/SeekSlider
+usr/include/phonon/Phonon/StreamInterface
+usr/include/phonon/Phonon/VideoPlayer
+usr/include/phonon/Phonon/VideoWidget
+usr/include/phonon/Phonon/VideoWidgetInterface
+usr/include/phonon/Phonon/VolumeFaderEffect
+usr/include/phonon/Phonon/VolumeFaderInterface
+usr/include/phonon/Phonon/VolumeSlider
 usr/include/phonon/abstractaudiooutput.h
 usr/include/phonon/abstractmediastream.h
 usr/include/phonon/abstractvideooutput.h

Modified: trunk/packages/phonon/debian/libphonon-dev.links
===================================================================
--- trunk/packages/phonon/debian/libphonon-dev.links	2010-02-28 01:21:02 UTC (rev 17193)
+++ trunk/packages/phonon/debian/libphonon-dev.links	2010-02-28 01:26:09 UTC (rev 17194)
@@ -1,2 +1 @@
 usr/include/phonon usr/include/qt4/phonon
-usr/include/phonon/phonon usr/include/phonon/Phonon

Added: trunk/packages/phonon/debian/patches/03_phonon_is_not_forced_in_KDE.diff
===================================================================
--- trunk/packages/phonon/debian/patches/03_phonon_is_not_forced_in_KDE.diff	                        (rev 0)
+++ trunk/packages/phonon/debian/patches/03_phonon_is_not_forced_in_KDE.diff	2010-02-28 01:26:09 UTC (rev 17194)
@@ -0,0 +1,15 @@
+From: Sune Vuorela <debian at pusling.com>
+Subject: Install headers where they were earlier
+Forwarded: no
+
+--- a/includes/CMakeLists.txt
++++ b/includes/CMakeLists.txt
+@@ -35,7 +35,7 @@ install( FILES
+   Phonon/VolumeFaderEffect
+   Phonon/VolumeFaderInterface
+   Phonon/VolumeSlider
+-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon COMPONENT Devel)
++DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/Phonon COMPONENT Devel)
+ 
+ install(FILES
+   Phonon/Experimental/AbstractVideoDataOutput

Modified: trunk/packages/phonon/debian/patches/series
===================================================================
--- trunk/packages/phonon/debian/patches/series	2010-02-28 01:21:02 UTC (rev 17193)
+++ trunk/packages/phonon/debian/patches/series	2010-02-28 01:26:09 UTC (rev 17194)
@@ -1,2 +1,3 @@
 01_phonon-inc.patch
 02_no_rpath.patch
+03_phonon_is_not_forced_in_KDE.diff