[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.4.2-1-15-g180bd9a

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 3b5fe15a2247a78893da9826f93922a39517c7ed
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Nov 26 01:36:22 2010 +0200

    Drop 04_add_phonon_qt_config.diff patch, merged upstream.
---
 debian/changelog                            |    5 -----
 debian/patches/04_add_phonon_qt_config.diff |   19 -------------------
 debian/patches/series                       |    1 -
 3 files changed, 0 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index afaa8c2..f1adb70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,6 @@ phonon (4:4.6.0really4.4.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
-  [ Fathi Boudra ]
-  * Add 04_add_phonon_qt_config.diff:
-    define Phonon module when Qt is built without Phonon and Phonon is
-    installed separately (needs Qt >= 4.7.0~beta2-3 to work).
-
   [ Modestas Vainius ]
   * Point debian/control Vcs fields to the new Git repository.
 
diff --git a/debian/patches/04_add_phonon_qt_config.diff b/debian/patches/04_add_phonon_qt_config.diff
deleted file mode 100644
index fe31f4e..0000000
--- a/debian/patches/04_add_phonon_qt_config.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Qt applications do not recognize the availability of Phonon if Qt
-             is built without Phonon and Phonon is installed separately.
-             This patch needs Qt >= 4.7.0~beta2-3
-Author: Fathi Boudra <fabo at debian.org>
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -268,4 +268,6 @@ if(NOT WIN32) # pkgconfig file
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
- endif(NOT WIN32)
- 
-+install(FILES qt_phonon.pri DESTINATION  ${QT_MKSPECS_DIR}/modules)
-+
- macro_display_feature_log()
---- /dev/null
-+++ b/qt_phonon.pri
-@@ -0,0 +1,2 @@
-+#configuration
-+QT_CONFIG *= phonon
diff --git a/debian/patches/series b/debian/patches/series
index 6a0aae4..ce3dabc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_phonon-inc.patch
 02_no_rpath.patch
 03_phonon_is_not_forced_in_KDE.diff
-04_add_phonon_qt_config.diff

-- 
Phonon Multimedia Framework packaging