rev 10267 - in branches/kde4/packages/akonadi/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-04-25 13:14:02 +0000 (Fri, 25 Apr 2008)
New Revision: 10267

Added:
   branches/kde4/packages/akonadi/debian/patches/01_x11_not_required.diff
Modified:
   branches/kde4/packages/akonadi/debian/changelog
   branches/kde4/packages/akonadi/debian/control
   branches/kde4/packages/akonadi/debian/patches/series
Log:
Fix FindQt4.cmake: make X11 optional. Patch stolen from soprano

Modified: branches/kde4/packages/akonadi/debian/changelog
===================================================================
--- branches/kde4/packages/akonadi/debian/changelog	2008-04-25 13:07:18 UTC (rev 10266)
+++ branches/kde4/packages/akonadi/debian/changelog	2008-04-25 13:14:02 UTC (rev 10267)
@@ -9,4 +9,9 @@
   
   * Rework descriptions and add Homepage field.
 
- --  Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 25 Apr 2008 15:07:39 +0200
+  +++ Changes by Modestas Vainius:
+
+  * Patch FindQt4.cmake to make X11 optional.
+  * Add myself to uploaders.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 25 Apr 2008 16:12:57 +0300

Modified: branches/kde4/packages/akonadi/debian/control
===================================================================
--- branches/kde4/packages/akonadi/debian/control	2008-04-25 13:07:18 UTC (rev 10266)
+++ branches/kde4/packages/akonadi/debian/control	2008-04-25 13:14:02 UTC (rev 10267)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: extra
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Sune Vuorela <debian at pusling.com>
+Uploaders: Sune Vuorela <debian at pusling.com>, Modestas Vainius <modestas at vainius.eu>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 5), cmake (>= 2.6.0~), quilt, 
  libqt4-dev (>> 4.4.0~), shared-mime-info, libmysqlclient15-dev,
  libxslt-dev, libsoprano-dev (>= 2.0.98), xsltproc, libdbus-1-dev

Added: branches/kde4/packages/akonadi/debian/patches/01_x11_not_required.diff
===================================================================
--- branches/kde4/packages/akonadi/debian/patches/01_x11_not_required.diff	                        (rev 0)
+++ branches/kde4/packages/akonadi/debian/patches/01_x11_not_required.diff	2008-04-25 13:14:02 UTC (rev 10267)
@@ -0,0 +1,11 @@
+--- a/cmake/modules/FindQt4.cmake
++++ b/cmake/modules/FindQt4.cmake
+@@ -1211,7 +1211,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})

Modified: branches/kde4/packages/akonadi/debian/patches/series
===================================================================
--- branches/kde4/packages/akonadi/debian/patches/series	2008-04-25 13:07:18 UTC (rev 10266)
+++ branches/kde4/packages/akonadi/debian/patches/series	2008-04-25 13:14:02 UTC (rev 10267)
@@ -0,0 +1,2 @@
+01_x11_not_required.diff
+