[SCM] Akonadi packaging branch, master, updated. debian/1.7.2-2-3-g33d6a85

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/akonadi.git;a=commitdiff;h=ae3b160

The following commit has been merged in the master branch:
commit ae3b160ca8870affbaf44567e298e3ec2681351f
Author: Pino Toscano <pino at debian.org>
Date:   Tue Mar 26 20:00:40 2013 +0100

    akonadi-backend-mysql: depend on mysql-server-core-5.5 | mysql-server-core (#686147, #702919)
    
    this should help apt in really choosing -mysql when upgrading from squeeze.
---
 debian/changelog |    4 ++++
 debian/control   |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67864b3..6ddc316 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 akonadi (1.7.2-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * akonadi-backend-mysql: depend on a real mysql-server-core-5.5 before the
+    virtual mysql-server-core. This should help apt in really choosing -mysql
+    when upgrading from squeeze. (Closes: #686147, #702919)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Mar 2013 19:57:10 +0100
 
diff --git a/debian/control b/debian/control
index f278f38..7af4841 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,7 @@ Description: development files for the Akonadi PIM storage service
 Package: akonadi-backend-mysql
 Section: misc
 Architecture: all
-Depends: ${misc:Depends}, mysql-server-core, libqt4-sql-mysql
+Depends: ${misc:Depends}, mysql-server-core-5.5 | mysql-server-core, libqt4-sql-mysql
 Recommends: akonadi-server
 Replaces: akonadi-server (<< 1.3.60~)
 Breaks: akonadi-server (<< 1.3.60~)

-- 
Akonadi packaging