rev 12752 - in branches/kde4.2/packages/akonadi/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-11-28 13:14:06 +0000 (Fri, 28 Nov 2008)
New Revision: 12752

Added:
   branches/kde4.2/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff
Modified:
   branches/kde4.2/packages/akonadi/debian/changelog
   branches/kde4.2/packages/akonadi/debian/control
   branches/kde4.2/packages/akonadi/debian/patches/series
   branches/kde4.2/packages/akonadi/debian/rules
Log:
more akonadi fixes

Modified: branches/kde4.2/packages/akonadi/debian/changelog
===================================================================
--- branches/kde4.2/packages/akonadi/debian/changelog	2008-11-28 12:18:07 UTC (rev 12751)
+++ branches/kde4.2/packages/akonadi/debian/changelog	2008-11-28 13:14:06 UTC (rev 12752)
@@ -1,4 +1,4 @@
-akonadi (1.0.80+svn889987-0r2) UNRELEASED; urgency=low
+akonadi (1.0.80+svn889987-0r5) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -10,8 +10,11 @@
   * Update install files:
     - libakonadi-dev.install: 1 new file(s) added;
   * Bump shlibs.
+  * Make akonadi-server depend on libqt4-sql-mysql.
+  * Add 02_hardcode_debian_mysqld_path.diff patch to hardcode MySQLd
+    path instread of depending on mysql-server at build time.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 28 Nov 2008 14:15:19 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 28 Nov 2008 15:04:07 +0200
 
 akonadi (1.0.0-2) unstable; urgency=low
 

Modified: branches/kde4.2/packages/akonadi/debian/control
===================================================================
--- branches/kde4.2/packages/akonadi/debian/control	2008-11-28 12:18:07 UTC (rev 12751)
+++ branches/kde4.2/packages/akonadi/debian/control	2008-11-28 13:14:06 UTC (rev 12752)
@@ -55,7 +55,7 @@
 Package: akonadi-server
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mysql-server
+Depends: ${shlibs:Depends}, ${misc:Depends}, mysql-server, libqt4-sql-mysql
 Description: Akonadi PIM storage service
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)
  storage service.  It provides a common framework for applications to store and

Added: branches/kde4.2/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff
===================================================================
--- branches/kde4.2/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff	                        (rev 0)
+++ branches/kde4.2/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff	2008-11-28 13:14:06 UTC (rev 12752)
@@ -0,0 +1,12 @@
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
+@@ -8,7 +8,8 @@
+ 
+ cmake_policy(SET CMP0003 NEW)
+ 
+-find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/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" )
+ 

Modified: branches/kde4.2/packages/akonadi/debian/patches/series
===================================================================
--- branches/kde4.2/packages/akonadi/debian/patches/series	2008-11-28 12:18:07 UTC (rev 12751)
+++ branches/kde4.2/packages/akonadi/debian/patches/series	2008-11-28 13:14:06 UTC (rev 12752)
@@ -1,2 +1,2 @@
 01_x11_not_required.diff
-
+02_hardcode_debian_mysqld_path.diff

Modified: branches/kde4.2/packages/akonadi/debian/rules
===================================================================
--- branches/kde4.2/packages/akonadi/debian/rules	2008-11-28 12:18:07 UTC (rev 12751)
+++ branches/kde4.2/packages/akonadi/debian/rules	2008-11-28 13:14:06 UTC (rev 12752)
@@ -2,7 +2,7 @@
 THIS_SHOULD_GO_TO_UNSTABLE=1
 
 DEB_CONFIG_INSTALL_DIR = /etc
-DEB_DH_MAKESHLIBS_ARGS_libakonadiprivate0 := -V'libakonadiprivate1 (>= 1.0.80)'
+DEB_DH_MAKESHLIBS_ARGS_libakonadiprivate1 := -V'libakonadiprivate1 (>= 1.0.80)'
 
 DEB_CMAKE_EXTRA_FLAGS += -DMYSQLD_EXECUTABLE=/usr/sbin/mysqld