rev 14882 - in trunk/packages/akonadi/debian: . patches

[George Kiagiadakis]

Author: gkiagia-guest
Date: 2009-06-05 10:08:00 +0000 (Fri, 05 Jun 2009)
New Revision: 14882

Modified:
   trunk/packages/akonadi/debian/changelog
   trunk/packages/akonadi/debian/libakonadi-dev.install
   trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff
Log:
New akonadi snapshot.


Modified: trunk/packages/akonadi/debian/changelog
===================================================================
--- trunk/packages/akonadi/debian/changelog	2009-06-05 09:20:12 UTC (rev 14881)
+++ trunk/packages/akonadi/debian/changelog	2009-06-05 10:08:00 UTC (rev 14882)
@@ -1,3 +1,14 @@
+akonadi (1.1.90+svn977248-0r1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+  +++ Changes by George Kiagiadakis:
+
+  * Refresh patches.
+  * Update installed files.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 05 Jun 2009 12:25:42 +0300
+
 akonadi (1.1.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/akonadi/debian/libakonadi-dev.install
===================================================================
--- trunk/packages/akonadi/debian/libakonadi-dev.install	2009-06-05 09:20:12 UTC (rev 14881)
+++ trunk/packages/akonadi/debian/libakonadi-dev.install	2009-06-05 10:08:00 UTC (rev 14882)
@@ -4,6 +4,8 @@
 usr/include/akonadi/private/notificationmessage_p.h
 usr/include/akonadi/private/protocol_p.h
 usr/include/akonadi/private/xdgbasedirs_p.h
+usr/lib/cmake/Akonadi/AkonadiConfig.cmake
+usr/lib/cmake/Akonadi/AkonadiConfigVersion.cmake
 usr/lib/libakonadiprivate.so
 usr/lib/libakonadiprotocolinternals.so
 usr/lib/pkgconfig/akonadi.pc

Modified: trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff
===================================================================
--- trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff	2009-06-05 09:20:12 UTC (rev 14881)
+++ trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff	2009-06-05 10:08:00 UTC (rev 14882)
@@ -1,12 +1,10 @@
 --- a/server/CMakeLists.txt
 +++ b/server/CMakeLists.txt
-@@ -12,7 +12,8 @@ if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0003 NEW)
- endif(COMMAND cmake_policy)
+@@ -1,5 +1,6 @@
  
--find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /opt/mysql/libexec )
+-find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec )
 +# MySQLd can be found here on Debian systems
 +set( MYSQLD_EXECUTABLE "/usr/sbin/mysqld" CACHE STRING "MySQL Server path" )
- macro_log_feature( MYSQLD_EXECUTABLE "MySQL Server" "Database server" "http://www.mysql.com" FALSE ""
-                    "Akonadi server requires the mysqld binary" )
- 
+ if( MYSQLD_EXECUTABLE)
+    message( STATUS "MySQL Server found." )
+ else ( MYSQLD_EXECUTABLE )