[SCM] Akonadi packaging branch, master, updated. debian/1.7.2-1

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/akonadi.git;a=commitdiff;h=5422a15

The following commit has been merged in the master branch:
commit 5422a1531bbfbaf988dd689349e7ec82d9d4446f
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 12 22:38:52 2012 +0300

    Drop x11_not_required.diff
    
    It is no longer needed as internal FindQt4 was dropped.
---
 debian/changelog                     |    2 ++
 debian/patches/series                |    1 -
 debian/patches/x11_not_required.diff |   15 ---------------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e712d99..efff4fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 akonadi (1.7.2-0r1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Drop x11_not_required.diff, no longer needed as internal FindQt4 was
+    dropped.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 12 May 2012 22:31:34 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cf85231..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-x11_not_required.diff
diff --git a/debian/patches/x11_not_required.diff b/debian/patches/x11_not_required.diff
deleted file mode 100644
index a84dbd1..0000000
--- a/debian/patches/x11_not_required.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: make X11 optional in FindQt4
-Forwarded: no
-
---- a/cmake/modules/FindQt4.cmake
-+++ b/cmake/modules/FindQt4.cmake
-@@ -1342,7 +1342,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})

-- 
Akonadi packaging