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

[Sune Vuorela]

Author: pusling-guest
Date: 2008-06-27 18:40:21 +0000 (Fri, 27 Jun 2008)
New Revision: 11144

Modified:
   branches/kde4/packages/akonadi/debian/changelog
   branches/kde4/packages/akonadi/debian/control
   branches/kde4/packages/akonadi/debian/patches/01_x11_not_required.diff
   branches/kde4/packages/akonadi/debian/rules
Log:
.84 might be ready now ;)

Modified: branches/kde4/packages/akonadi/debian/changelog
===================================================================
--- branches/kde4/packages/akonadi/debian/changelog	2008-06-27 18:26:27 UTC (rev 11143)
+++ branches/kde4/packages/akonadi/debian/changelog	2008-06-27 18:40:21 UTC (rev 11144)
@@ -1,8 +1,9 @@
-akonadi (0.81.0+svn814221-1) UNRELEASED; urgency=low
+akonadi (0.82.0-1) experimental; urgency=low
 
-  * New upstream development snapshot.
+  * New upstream snapshot
+  * Protocol change in akonadi. approprate conflicts.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 03 Jun 2008 20:10:37 +0200
+ -- Sune Vuorela <debian at pusling.com>  Fri, 27 Jun 2008 19:30:34 +0200
 
 akonadi (0.81.0-1) experimental; urgency=low
 

Modified: branches/kde4/packages/akonadi/debian/control
===================================================================
--- branches/kde4/packages/akonadi/debian/control	2008-06-27 18:26:27 UTC (rev 11143)
+++ branches/kde4/packages/akonadi/debian/control	2008-06-27 18:40:21 UTC (rev 11144)
@@ -17,6 +17,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: akonadi-server
+Conflicts: kdepimlibs5 (<< 4:4.0.84)
 Description: libraries for the 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

Modified: branches/kde4/packages/akonadi/debian/patches/01_x11_not_required.diff
===================================================================
--- branches/kde4/packages/akonadi/debian/patches/01_x11_not_required.diff	2008-06-27 18:26:27 UTC (rev 11143)
+++ branches/kde4/packages/akonadi/debian/patches/01_x11_not_required.diff	2008-06-27 18:40:21 UTC (rev 11144)
@@ -1,3 +1,5 @@
+Index: b/cmake/modules/FindQt4.cmake
+===================================================================
 --- a/cmake/modules/FindQt4.cmake
 +++ b/cmake/modules/FindQt4.cmake
 @@ -1341,7 +1341,7 @@

Modified: branches/kde4/packages/akonadi/debian/rules
===================================================================
--- branches/kde4/packages/akonadi/debian/rules	2008-06-27 18:26:27 UTC (rev 11143)
+++ branches/kde4/packages/akonadi/debian/rules	2008-06-27 18:40:21 UTC (rev 11144)
@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
 DEB_CONFIG_INSTALL_DIR = /etc
+DEB_DH_MAKESHLIBS_ARGS_libakonadiprivate0 := -V'libakonadiprivate0 (>= 0.82)'
 
 include debian/cdbs/kde.mk
+
+