[SCM] Akonadi packaging branch, experimental, updated. debian/1.3.1-2-13-g404b5e4

[Modestas Vainius]

The following commit has been merged in the experimental branch:
commit 404b5e4461357e582a31ff11c8541ba9b2a4008c
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Aug 13 03:03:48 2010 +0300

    Drop 02_hardcode_debian_mysqld_path.diff, not needed any more.
---
 debian/changelog                                   |    1 +
 debian/patches/02_hardcode_debian_mysqld_path.diff |   10 ----------
 debian/patches/series                              |    1 -
 3 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1baeff6..4ec2ba8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ akonadi (1.4.0-0r1) UNRELEASED; urgency=low
   * Bump Standards-Versiont to 3.9.1: add Breaks next to Replaces where needed
     or replace Conflicts with Breaks respectively,
   * Improve passing of MYSQLD_EXECUTABLE flag to cmake.
+  * Drop 02_hardcode_debian_mysqld_path.diff, not needed any more.
 
  -- Modestas Vainius <modax at debian.org>  Fri, 13 Aug 2010 02:45:37 +0300
 
diff --git a/debian/patches/02_hardcode_debian_mysqld_path.diff b/debian/patches/02_hardcode_debian_mysqld_path.diff
deleted file mode 100644
index fa811ef..0000000
--- a/debian/patches/02_hardcode_debian_mysqld_path.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -1,5 +1,6 @@
- 
--find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin )
-+# MySQLd can be found here on Debian systems
-+set( MYSQLD_EXECUTABLE "/usr/sbin/mysqld" CACHE STRING "MySQL Server path" )
- if( MYSQLD_EXECUTABLE)
-    message( STATUS "MySQL Server found." )
- else ( MYSQLD_EXECUTABLE )
diff --git a/debian/patches/series b/debian/patches/series
index 335beb3..b2501b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01_x11_not_required.diff
-02_hardcode_debian_mysqld_path.diff

-- 
Akonadi packaging