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

[Fathi Boudra]

Author: fabo
Date: 2009-05-01 12:18:19 +0000 (Fri, 01 May 2009)
New Revision: 14540

Modified:
   trunk/packages/akonadi/debian/changelog
   trunk/packages/akonadi/debian/control
   trunk/packages/akonadi/debian/patches/01_x11_not_required.diff
   trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff
Log:
Upload akonadi 1.1.2


Modified: trunk/packages/akonadi/debian/changelog
===================================================================
--- trunk/packages/akonadi/debian/changelog	2009-05-01 10:59:34 UTC (rev 14539)
+++ trunk/packages/akonadi/debian/changelog	2009-05-01 12:18:19 UTC (rev 14540)
@@ -1,11 +1,18 @@
-akonadi (1.1.1-3) UNRELEASED; urgency=low
+akonadi (1.1.2-1) unstable; urgency=low
 
+  * New upstream release.
+
   +++ Changes by Modestas Vainius:
 
   * Point Debian Vcs URLs to pkg-kde/trunk (new location).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Feb 2009 00:19:58 +0200
+  +++ Changes by Fathi Boudra:
 
+  * Bump Standards-Version to 3.8.1. No changes needed.
+  * Update akonadi-dbg package section: debug.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 01 May 2009 14:00:31 +0200
+
 akonadi (1.1.1-2) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: trunk/packages/akonadi/debian/control
===================================================================
--- trunk/packages/akonadi/debian/control	2009-05-01 10:59:34 UTC (rev 14539)
+++ trunk/packages/akonadi/debian/control	2009-05-01 12:18:19 UTC (rev 14540)
@@ -3,14 +3,14 @@
 Priority: extra
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Modestas Vainius <modestas at vainius.eu>,
- Ana Beatriz Guerrero Lopez <ana at debian.org>
+ Ana Beatriz Guerrero Lopez <ana at debian.org>, Fathi Boudra <fabo at debian.org>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), cmake (>= 2.6.2), automoc, quilt, pkg-kde-tools (>= 0.4),
  libqt4-dev (>> 4.4.0~), shared-mime-info, libmysqlclient15-dev,
  libxslt-dev, libsoprano-dev (>= 2.1.1), xsltproc, libdbus-1-dev, libboost-program-options-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
+Homepage: http://pim.kde.org/akonadi
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/akonadi
 Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/akonadi
-Homepage: http://pim.kde.org/akonadi
 
 Package: libakonadiprivate1
 Section: libs
@@ -27,7 +27,7 @@
  service.
 
 Package: akonadi-dbg
-Section: libdevel
+Section: debug
 Architecture: any
 Suggests: akonadi-server (= ${binary:Version})
 Description: debugging symbols for the Akonadi PIM storage service

Modified: trunk/packages/akonadi/debian/patches/01_x11_not_required.diff
===================================================================
--- trunk/packages/akonadi/debian/patches/01_x11_not_required.diff	2009-05-01 10:59:34 UTC (rev 14539)
+++ trunk/packages/akonadi/debian/patches/01_x11_not_required.diff	2009-05-01 12:18:19 UTC (rev 14540)
@@ -1,8 +1,6 @@
-Index: b/cmake/modules/FindQt4.cmake
-===================================================================
 --- a/cmake/modules/FindQt4.cmake
 +++ b/cmake/modules/FindQt4.cmake
-@@ -1341,7 +1341,7 @@
+@@ -1341,7 +1341,7 @@ IF (QT4_QMAKE_FOUND)
    IF(UNIX)
      # on OS X X11 may not be required
      IF (Q_WS_X11)

Modified: trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff
===================================================================
--- trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff	2009-05-01 10:59:34 UTC (rev 14539)
+++ trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff	2009-05-01 12:18:19 UTC (rev 14540)
@@ -1,6 +1,6 @@
 --- a/server/CMakeLists.txt
 +++ b/server/CMakeLists.txt
-@@ -12,7 +12,8 @@
+@@ -12,7 +12,8 @@ if(COMMAND cmake_policy)
     cmake_policy(SET CMP0003 NEW)
  endif(COMMAND cmake_policy)