rev 16722 - trunk/packages/akonadi/debian/patches

[Lisandro D. N. Pérez Meyer]

Author: lisandropm-guest
Date: 2010-01-30 22:33:38 +0000 (Sat, 30 Jan 2010)
New Revision: 16722

Modified:
   trunk/packages/akonadi/debian/patches/01_x11_not_required.diff
   trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff
Log:
Fixed patches for akonadi

Modified: trunk/packages/akonadi/debian/patches/01_x11_not_required.diff
===================================================================
--- trunk/packages/akonadi/debian/patches/01_x11_not_required.diff	2010-01-30 22:33:02 UTC (rev 16721)
+++ trunk/packages/akonadi/debian/patches/01_x11_not_required.diff	2010-01-30 22:33:38 UTC (rev 16722)
@@ -1,6 +1,8 @@
---- a/cmake/modules/FindQt4.cmake
-+++ b/cmake/modules/FindQt4.cmake
-@@ -1341,7 +1341,7 @@ IF (QT4_QMAKE_FOUND)
+Index: akonadi-1.3.0/cmake/modules/FindQt4.cmake
+===================================================================
+--- akonadi-1.3.0.orig/cmake/modules/FindQt4.cmake	2010-01-20 06:13:49.000000000 -0300
++++ akonadi-1.3.0/cmake/modules/FindQt4.cmake	2010-01-30 18:50:11.000000000 -0300
+@@ -1342,7 +1342,7 @@
    IF(UNIX)
      # on OS X X11 may not be required
      IF (Q_WS_X11)

Modified: trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff
===================================================================
--- trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff	2010-01-30 22:33:02 UTC (rev 16721)
+++ trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff	2010-01-30 22:33:38 UTC (rev 16722)
@@ -1,8 +1,10 @@
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
+Index: akonadi-1.3.0/server/CMakeLists.txt
+===================================================================
+--- akonadi-1.3.0.orig/server/CMakeLists.txt	2010-01-30 18:54:50.000000000 -0300
++++ akonadi-1.3.0/server/CMakeLists.txt	2010-01-30 18:55:14.000000000 -0300
 @@ -1,5 +1,6 @@
  
--find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec )
+-find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec /usr/mysql/bin )
 +# MySQLd can be found here on Debian systems
 +set( MYSQLD_EXECUTABLE "/usr/sbin/mysqld" CACHE STRING "MySQL Server path" )
  if( MYSQLD_EXECUTABLE)