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

[Modestas Vainius]

Author: modax-guest
Date: 2009-01-04 20:44:31 +0000 (Sun, 04 Jan 2009)
New Revision: 13144

Modified:
   branches/kde4.2/packages/akonadi/debian/changelog
   branches/kde4.2/packages/akonadi/debian/control
   branches/kde4.2/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff
   branches/kde4.2/packages/akonadi/debian/rules
Log:
Akonadi 1.1.0

Modified: branches/kde4.2/packages/akonadi/debian/changelog
===================================================================
--- branches/kde4.2/packages/akonadi/debian/changelog	2009-01-04 20:15:12 UTC (rev 13143)
+++ branches/kde4.2/packages/akonadi/debian/changelog	2009-01-04 20:44:31 UTC (rev 13144)
@@ -1,11 +1,11 @@
-akonadi (1.0.81+svn900813-0r1) UNRELEASED; urgency=low
+akonadi (1.1.0-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
   +++ Changes by Modestas Vainius:
 
   * Bump Standards-Version to 3.8.0: add README.source.
-  * Build depend on libboost-dev.
+  * Build depend on libboost-program-options-dev.
   * Bump cmake build depend to 2.6.2.
   * Switch to new installgen format.
   * Update install files:
@@ -14,7 +14,7 @@
   * 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>  Sat, 27 Dec 2008 21:21:48 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 04 Jan 2009 22:41:46 +0200
 
 akonadi (1.0.0-2) unstable; urgency=low
 

Modified: branches/kde4.2/packages/akonadi/debian/control
===================================================================
--- branches/kde4.2/packages/akonadi/debian/control	2009-01-04 20:15:12 UTC (rev 13143)
+++ branches/kde4.2/packages/akonadi/debian/control	2009-01-04 20:44:31 UTC (rev 13144)
@@ -6,7 +6,7 @@
  Ana Beatriz Guerrero Lopez <ana at debian.org>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 5), cmake (>= 2.6.2), automoc, quilt,
  libqt4-dev (>> 4.4.0~), shared-mime-info, libmysqlclient15-dev,
- libxslt-dev, libsoprano-dev (>= 2.1.1), xsltproc, libdbus-1-dev, libboost-dev
+ libxslt-dev, libsoprano-dev (>= 2.1.1), xsltproc, libdbus-1-dev, libboost-program-options-dev
 Standards-Version: 3.8.0
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/akonadi
 Vcs-Svn: svn://svn.debian.org/pkg-kde/branches/kde4/packages/akonadi

Modified: 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	2009-01-04 20:15:12 UTC (rev 13143)
+++ branches/kde4.2/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff	2009-01-04 20:44:31 UTC (rev 13144)
@@ -1,9 +1,9 @@
 --- a/server/CMakeLists.txt
 +++ b/server/CMakeLists.txt
-@@ -8,7 +8,8 @@
+@@ -12,7 +12,8 @@
+    cmake_policy(SET CMP0003 NEW)
+ endif(COMMAND cmake_policy)
  
- 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" )

Modified: branches/kde4.2/packages/akonadi/debian/rules
===================================================================
--- branches/kde4.2/packages/akonadi/debian/rules	2009-01-04 20:15:12 UTC (rev 13143)
+++ branches/kde4.2/packages/akonadi/debian/rules	2009-01-04 20:44:31 UTC (rev 13144)
@@ -2,7 +2,7 @@
 THIS_SHOULD_GO_TO_UNSTABLE=1
 
 DEB_CONFIG_INSTALL_DIR = /etc
-DEB_DH_MAKESHLIBS_ARGS_libakonadiprivate1 := -V'libakonadiprivate1 (>= 1.0.80)'
+DEB_DH_MAKESHLIBS_ARGS_libakonadiprivate1 := -V'libakonadiprivate1 (>= 1.1.0)'
 
 DEB_CMAKE_EXTRA_FLAGS += -DMYSQLD_EXECUTABLE=/usr/sbin/mysqld