[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0.0-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 20d089d61a685d27bce775477a934b214aacde21
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Feb 19 17:49:03 2012 +0200

    Adapt findqt4_optional_x11.diff to upstream changes.
---
 debian/changelog                         |    3 ++
 debian/patches/findqt4_optional_x11.diff |   32 +++++++++++++++--------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92d9e1f..de3e7db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ phonon (4:4.6.0.0-1) UNRELEASED; urgency=low
   [ Sune Vuorela ]
   * Make phonon conflicts with the xine backend. People must migrate away
 
+  [ Modestas Vainius ]
+  * Adapt findqt4_optional_x11.diff to upstream changes.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 22 Jan 2012 22:51:45 +0100
 
 phonon (4:4.6.0really4.5.1-1) unstable; urgency=low
diff --git a/debian/patches/findqt4_optional_x11.diff b/debian/patches/findqt4_optional_x11.diff
index 61a4869..4b559ee 100644
--- a/debian/patches/findqt4_optional_x11.diff
+++ b/debian/patches/findqt4_optional_x11.diff
@@ -1,16 +1,18 @@
-Qt doesn't expose the X11 headers to the world, so no need to make it required.
----
- cmake/FindQt4.cmake |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+From: Pino Toscano <pino at debian.org>
+From: Modestas Vainius <modax at debian.org>
+Subject: Qt doesn't expose the X11 headers to the world, so no need to make it required.
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2012-02-19
 
---- a/cmake/FindQt4.cmake
-+++ b/cmake/FindQt4.cmake
-@@ -1427,7 +1427,7 @@ IF (QT4_QMAKE_FOUND)
-   IF(UNIX)
-     # on OS X X11 may not be required
-     IF (Q_WS_X11)
--      FIND_PACKAGE(X11 REQUIRED)
-+      FIND_PACKAGE(X11)
-     ENDIF (Q_WS_X11)
-     FIND_PACKAGE(Threads)
-     SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+--- a/cmake/Qt4ConfigDependentSettings.cmake
++++ b/cmake/Qt4ConfigDependentSettings.cmake
+@@ -27,7 +27,7 @@
+ IF(UNIX)
+   # on OS X X11 may not be required
+   IF (Q_WS_X11)
+-    FIND_PACKAGE(X11 REQUIRED)
++    FIND_PACKAGE(X11)
+   ENDIF (Q_WS_X11)
+   FIND_PACKAGE(Threads)
+   SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})

-- 
Phonon Multimedia Framework packaging