[SCM] Phonon Multimedia Framework packaging branch, kubuntu_vivid_archive, updated. debian/4.8.0-3-4-g31388f3
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Fri Nov 7 13:55:31 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/phonon.git;a=commitdiff;h=31388f3
The following commit has been merged in the kubuntu_vivid_archive branch:
commit 31388f356d85953b557d5034c1736fa4843b5818
Author: Jonathan Riddell <jr at jriddell.org>
Date: Fri Nov 7 14:55:27 2014 +0100
Remove phonon_is_not_forced_in_KDE.diff which installs header files to the wrong directory
---
debian/.gitattributes | 1 -
debian/changelog | 7 +++
debian/libphonon-dev.install | 72 ++++++++++++-------------
debian/libphonon4qt5-dev.install | 72 ++++++++++++-------------
debian/patches/phonon_is_not_forced_in_KDE.diff | 15 ------
debian/patches/series | 1 -
debian/source/local-options | 1 -
7 files changed, 79 insertions(+), 90 deletions(-)
diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 1b8b844..9249674 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+phonon (4:4.8.0-~4ubuntu2) vivid; urgency=medium
+
+ * Remove phonon_is_not_forced_in_KDE.diff which installs header files
+ to the wrong directory
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 07 Nov 2014 14:46:07 +0100
+
phonon (4:4.8.0-~4ubuntu1) vivid; urgency=medium
* Merge with Debian, remaining changes:
diff --git a/debian/libphonon-dev.install b/debian/libphonon-dev.install
index 7184e49..d542a7a 100644
--- a/debian/libphonon-dev.install
+++ b/debian/libphonon-dev.install
@@ -35,42 +35,42 @@ usr/include/phonon/ObjectDescriptionData
usr/include/phonon/ObjectDescriptionModel
usr/include/phonon/ObjectDescriptionModelData
usr/include/phonon/Path
-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/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/PlatformPlugin
usr/include/phonon/SeekSlider
usr/include/phonon/StreamInterface
diff --git a/debian/libphonon4qt5-dev.install b/debian/libphonon4qt5-dev.install
index 9d8f072..1e96380 100644
--- a/debian/libphonon4qt5-dev.install
+++ b/debian/libphonon4qt5-dev.install
@@ -35,42 +35,42 @@ usr/include/phonon4qt5/phonon/ObjectDescriptionData
usr/include/phonon4qt5/phonon/ObjectDescriptionModel
usr/include/phonon4qt5/phonon/ObjectDescriptionModelData
usr/include/phonon4qt5/phonon/Path
-usr/include/phonon4qt5/phonon/Phonon/AbstractAudioOutput
-usr/include/phonon4qt5/phonon/Phonon/AbstractMediaStream
-usr/include/phonon4qt5/phonon/Phonon/AbstractVideoOutput
-usr/include/phonon4qt5/phonon/Phonon/AddonInterface
-usr/include/phonon4qt5/phonon/Phonon/AudioDevice
-usr/include/phonon4qt5/phonon/Phonon/AudioDeviceEnumerator
-usr/include/phonon4qt5/phonon/Phonon/AudioOutput
-usr/include/phonon4qt5/phonon/Phonon/AudioOutputDevice
-usr/include/phonon4qt5/phonon/Phonon/AudioOutputDeviceModel
-usr/include/phonon4qt5/phonon/Phonon/AudioOutputInterface
-usr/include/phonon4qt5/phonon/Phonon/BackendCapabilities
-usr/include/phonon4qt5/phonon/Phonon/BackendInterface
-usr/include/phonon4qt5/phonon/Phonon/Effect
-usr/include/phonon4qt5/phonon/Phonon/EffectDescription
-usr/include/phonon4qt5/phonon/Phonon/EffectDescriptionModel
-usr/include/phonon4qt5/phonon/Phonon/EffectInterface
-usr/include/phonon4qt5/phonon/Phonon/EffectParameter
-usr/include/phonon4qt5/phonon/Phonon/EffectWidget
-usr/include/phonon4qt5/phonon/Phonon/Global
-usr/include/phonon4qt5/phonon/Phonon/MediaController
-usr/include/phonon4qt5/phonon/Phonon/MediaNode
-usr/include/phonon4qt5/phonon/Phonon/MediaObject
-usr/include/phonon4qt5/phonon/Phonon/MediaObjectInterface
-usr/include/phonon4qt5/phonon/Phonon/MediaSource
-usr/include/phonon4qt5/phonon/Phonon/ObjectDescription
-usr/include/phonon4qt5/phonon/Phonon/ObjectDescriptionModel
-usr/include/phonon4qt5/phonon/Phonon/Path
-usr/include/phonon4qt5/phonon/Phonon/PlatformPlugin
-usr/include/phonon4qt5/phonon/Phonon/SeekSlider
-usr/include/phonon4qt5/phonon/Phonon/StreamInterface
-usr/include/phonon4qt5/phonon/Phonon/VideoPlayer
-usr/include/phonon4qt5/phonon/Phonon/VideoWidget
-usr/include/phonon4qt5/phonon/Phonon/VideoWidgetInterface
-usr/include/phonon4qt5/phonon/Phonon/VolumeFaderEffect
-usr/include/phonon4qt5/phonon/Phonon/VolumeFaderInterface
-usr/include/phonon4qt5/phonon/Phonon/VolumeSlider
+usr/include/phonon4qt5/KDE/Phonon/AbstractAudioOutput
+usr/include/phonon4qt5/KDE/Phonon/AbstractMediaStream
+usr/include/phonon4qt5/KDE/Phonon/AbstractVideoOutput
+usr/include/phonon4qt5/KDE/Phonon/AddonInterface
+usr/include/phonon4qt5/KDE/Phonon/AudioDevice
+usr/include/phonon4qt5/KDE/Phonon/AudioDeviceEnumerator
+usr/include/phonon4qt5/KDE/Phonon/AudioOutput
+usr/include/phonon4qt5/KDE/Phonon/AudioOutputDevice
+usr/include/phonon4qt5/KDE/Phonon/AudioOutputDeviceModel
+usr/include/phonon4qt5/KDE/Phonon/AudioOutputInterface
+usr/include/phonon4qt5/KDE/Phonon/BackendCapabilities
+usr/include/phonon4qt5/KDE/Phonon/BackendInterface
+usr/include/phonon4qt5/KDE/Phonon/Effect
+usr/include/phonon4qt5/KDE/Phonon/EffectDescription
+usr/include/phonon4qt5/KDE/Phonon/EffectDescriptionModel
+usr/include/phonon4qt5/KDE/Phonon/EffectInterface
+usr/include/phonon4qt5/KDE/Phonon/EffectParameter
+usr/include/phonon4qt5/KDE/Phonon/EffectWidget
+usr/include/phonon4qt5/KDE/Phonon/Global
+usr/include/phonon4qt5/KDE/Phonon/MediaController
+usr/include/phonon4qt5/KDE/Phonon/MediaNode
+usr/include/phonon4qt5/KDE/Phonon/MediaObject
+usr/include/phonon4qt5/KDE/Phonon/MediaObjectInterface
+usr/include/phonon4qt5/KDE/Phonon/MediaSource
+usr/include/phonon4qt5/KDE/Phonon/ObjectDescription
+usr/include/phonon4qt5/KDE/Phonon/ObjectDescriptionModel
+usr/include/phonon4qt5/KDE/Phonon/Path
+usr/include/phonon4qt5/KDE/Phonon/PlatformPlugin
+usr/include/phonon4qt5/KDE/Phonon/SeekSlider
+usr/include/phonon4qt5/KDE/Phonon/StreamInterface
+usr/include/phonon4qt5/KDE/Phonon/VideoPlayer
+usr/include/phonon4qt5/KDE/Phonon/VideoWidget
+usr/include/phonon4qt5/KDE/Phonon/VideoWidgetInterface
+usr/include/phonon4qt5/KDE/Phonon/VolumeFaderEffect
+usr/include/phonon4qt5/KDE/Phonon/VolumeFaderInterface
+usr/include/phonon4qt5/KDE/Phonon/VolumeSlider
usr/include/phonon4qt5/phonon/PlatformPlugin
usr/include/phonon4qt5/phonon/SeekSlider
usr/include/phonon4qt5/phonon/StreamInterface
diff --git a/debian/patches/phonon_is_not_forced_in_KDE.diff b/debian/patches/phonon_is_not_forced_in_KDE.diff
deleted file mode 100644
index 7665bce..0000000
--- a/debian/patches/phonon_is_not_forced_in_KDE.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Sune Vuorela <debian at pusling.com>
-Subject: Install headers where they were earlier
-Forwarded: no
-
---- a/includes/CMakeLists.txt
-+++ b/includes/CMakeLists.txt
-@@ -91,7 +91,7 @@ install( FILES
- old/Phonon/VolumeFaderEffect
- old/Phonon/VolumeFaderInterface
- old/Phonon/VolumeSlider
--DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon COMPONENT Devel)
-+DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/Phonon COMPONENT Devel)
-
- if (PHONON_BUILD_EXPERIMENTAL)
- install(FILES
diff --git a/debian/patches/series b/debian/patches/series
index 6b9f883..27e290d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
phonon-inc.patch
-phonon_is_not_forced_in_KDE.diff
findqt4_optional_x11.diff
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes
--
Phonon Multimedia Framework packaging
More information about the pkg-kde-commits
mailing list