[SCM] Akonadi packaging branch, master, updated. debian/1.9.2-1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 034fc312ab89379ef5ee4e4cf7881eef792f819a
Merge: 24ba7eccfb7b3fd1002f93ad7da3ca27dc60942d 33d6a85f20370d4919ed2beb76afd03219b3674c
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Tue Apr 2 22:52:12 2013 +0200

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog

 debian/changelog |   17 ++++++++++++++---
 debian/control   |    2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 69779ae,ad5a751..b5e398c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,21 +1,35 @@@
 +akonadi (1.9.1-1) experimental; urgency=low
 +
 +  * New upstream release.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Update disable_dbus_requiring_tests.diff; some tests were added and
 +    some of them need D-Bus.
 +  * Update installed files.
 +
 +  [ Sune Vuorela ]
 +  * Add mysql-server-core to Build-Depends so it can be used by the test suite
 +
 + -- Sune Vuorela <sune at debian.org>  Mon, 25 Mar 2013 17:00:16 +0100
 +
- akonadi (1.7.2-2) UNRELEASED; urgency=low
+ akonadi (1.7.2-3) unstable; urgency=low
+ 
+   * Team upload.
+   * 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)
+ 
+  -- Pino Toscano <pino at debian.org>  Tue, 26 Mar 2013 20:02:38 +0100
+ 
+ akonadi (1.7.2-2) unstable; urgency=low
+ 
+   * Team upload.
  
    [ Lisandro Damián Nicanor Pérez Meyer ]
-   * Change [General] to [%General] in README:Debian (Closes: #688236).
+   * Change [General] to [%General] in README.Debian (Closes: #688236).
      Thanks Alexander Wuerstlein for noticing.
  
-  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Sep 2012 14:58:24 -0300
+  -- Pino Toscano <pino at debian.org>  Wed, 05 Dec 2012 11:07:57 +0100
  
  akonadi (1.7.2-1) unstable; urgency=low
  

-- 
Akonadi packaging