[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.4.3-1-15-g7df594a
Modestas Vainius
modax at alioth.debian.org
Sun Feb 20 17:37:03 UTC 2011
The following commit has been merged in the master branch:
commit e74979e5e1af09980b9fe56948cc99f09034dc0d
Author: Modestas Vainius <modestas at vainius.eu>
Date: Sun Feb 20 13:16:20 2011 +0200
Refresh other debian patches.
---
debian/changelog | 1 +
debian/patches/01_phonon-inc.patch | 2 +-
debian/patches/03_phonon_is_not_forced_in_KDE.diff | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4c509cc..22441f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ phonon (4:4.6.0really4.4.4-0r1) UNRELEASED; urgency=low
remains here.
* Remove xine and gstreamer specific packages from Build-Depends.
* Adapt 02_no_rpath.patch to upstream changes.
+ * Refresh other debian patches.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 05 Dec 2010 16:01:39 +0100
diff --git a/debian/patches/01_phonon-inc.patch b/debian/patches/01_phonon-inc.patch
index a8db74b..432e351 100644
--- a/debian/patches/01_phonon-inc.patch
+++ b/debian/patches/01_phonon-inc.patch
@@ -5,7 +5,7 @@ Forwarded: no
--- a/phonon/CMakeLists.txt
+++ b/phonon/CMakeLists.txt
-@@ -139,3 +139,7 @@ install(FILES
+@@ -150,3 +150,7 @@ install(FILES
DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
install(FILES org.kde.Phonon.AudioOutput.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
diff --git a/debian/patches/03_phonon_is_not_forced_in_KDE.diff b/debian/patches/03_phonon_is_not_forced_in_KDE.diff
index facb0a2..dbaf42b 100644
--- a/debian/patches/03_phonon_is_not_forced_in_KDE.diff
+++ b/debian/patches/03_phonon_is_not_forced_in_KDE.diff
@@ -4,7 +4,7 @@ Forwarded: no
--- a/includes/CMakeLists.txt
+++ b/includes/CMakeLists.txt
-@@ -85,7 +85,7 @@ install( FILES
+@@ -87,7 +87,7 @@ install( FILES
old/Phonon/VolumeFaderEffect
old/Phonon/VolumeFaderInterface
old/Phonon/VolumeSlider
--
Phonon Multimedia Framework packaging
More information about the pkg-kde-commits
mailing list