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

Modestas Vainius modax at alioth.debian.org
Fri Aug 13 00:14:25 UTC 2010


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

    Improve passing of MYSQLD_EXECUTABLE flag to cmake.
---
 debian/changelog |    1 +
 debian/rules     |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2b68e9..1baeff6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ akonadi (1.4.0-0r1) UNRELEASED; urgency=low
     - build-depends on pkg-kde-tools (>= 0.9) for 3.0 support;
   * 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.
 
  -- Modestas Vainius <modax at debian.org>  Fri, 13 Aug 2010 02:45:37 +0300
 
diff --git a/debian/rules b/debian/rules
index a358275..0dcd35b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 DEB_CONFIG_INSTALL_DIR = /etc
 DEB_DH_MAKESHLIBS_ARGS_libakonadiprivate1 := -V
 
-DEB_CMAKE_EXTRA_FLAGS += -DMYSQLD_EXECUTABLE=/usr/sbin/mysqld
+DEB_CMAKE_EXTRA_FLAGS += -DMYSQLD_EXECUTABLE:STRING=/usr/sbin/mysqld
 
 DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
 

-- 
Akonadi packaging



More information about the pkg-kde-commits mailing list