rev 10217 - in branches/kde4/packages/soprano/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2008-04-21 13:06:57 +0000 (Mon, 21 Apr 2008)
New Revision: 10217

Added:
   branches/kde4/packages/soprano/debian/patches/
   branches/kde4/packages/soprano/debian/patches/01_x11_not_required.diff
   branches/kde4/packages/soprano/debian/patches/series
Modified:
   branches/kde4/packages/soprano/debian/changelog
   branches/kde4/packages/soprano/debian/control
Log:
* Proper fix: wrong check. X11 isn't required.


Modified: branches/kde4/packages/soprano/debian/changelog
===================================================================
--- branches/kde4/packages/soprano/debian/changelog	2008-04-21 12:27:14 UTC (rev 10216)
+++ branches/kde4/packages/soprano/debian/changelog	2008-04-21 13:06:57 UTC (rev 10217)
@@ -1,6 +1,6 @@
 soprano (2.0.97~svn790369-3) UNRELEASED; urgency=low
 
-  * Add libx11-dev build dependency to fix ftbfs since libqt4-dev dependencies
+  * Add patch to make X11 not required to fix ftbfs since libqt4-dev dependencies
     clean up.
 
  -- Fathi Boudra <fabo at debian.org>  Mon, 21 Apr 2008 14:20:45 +0200

Modified: branches/kde4/packages/soprano/debian/control
===================================================================
--- branches/kde4/packages/soprano/debian/control	2008-04-21 12:27:14 UTC (rev 10216)
+++ branches/kde4/packages/soprano/debian/control	2008-04-21 13:06:57 UTC (rev 10217)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Armin Berres <trigger+debian at space-based.de>, Fathi Boudra <fabo at debian.org>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 5), cmake, quilt,
- libclucene-dev, libqt4-dev (>> 4.4.0~rc1), librdf0-dev, libx11-dev, doxygen, graphviz
+ libclucene-dev, libqt4-dev (>> 4.4.0~rc1), librdf0-dev, doxygen, graphviz
 Standards-Version: 3.7.3
 Homepage: http://soprano.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/soprano

Added: branches/kde4/packages/soprano/debian/patches/01_x11_not_required.diff
===================================================================
--- branches/kde4/packages/soprano/debian/patches/01_x11_not_required.diff	                        (rev 0)
+++ branches/kde4/packages/soprano/debian/patches/01_x11_not_required.diff	2008-04-21 13:06:57 UTC (rev 10217)
@@ -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})

Added: branches/kde4/packages/soprano/debian/patches/series
===================================================================
--- branches/kde4/packages/soprano/debian/patches/series	                        (rev 0)
+++ branches/kde4/packages/soprano/debian/patches/series	2008-04-21 13:06:57 UTC (rev 10217)
@@ -0,0 +1,2 @@
+01_x11_not_required.diff
+