[SCM] Akonadi packaging branch, master, updated. debian/1.3.1-3-30-g0c880f6

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 57f3d3c52cd704ca8c0d064a570c93fd4e3a43c6
Merge: 1834e62fd56f44b5a4cf8ef59ce0c878e455f46e 05c4d6e8ffa3cee66bdc2b75be2d87000b32e97d
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Dec 21 01:31:27 2010 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	debian/changelog

 debian/akonadi-server.install                      |    2 +
 debian/changelog                                   |    9 +-
 debian/control                                     |   11 +-
 debian/libakonadi-dev.install                      |    2 +-
 debian/libakonadiprivate1.install                  |    4 -
 debian/libakonadiprotocolinternals1.install        |    2 +
 debian/libakonadiprotocolinternals1.symbols        |  159 ++++++++++++++++++++
 .../patches/02_sanitize_sqlite_version_check.diff  |   21 ---
 debian/patches/series                              |    1 -
 9 files changed, 177 insertions(+), 34 deletions(-)

diff --cc debian/control
index d8f6dd8,eb3d784..b5b74c6
--- a/debian/control
+++ b/debian/control
@@@ -10,10 -10,10 +10,10 @@@ Build-Depends: cdbs (>= 0.4.51), debhel
   libsqlite3-dev
  Standards-Version: 3.9.1
  Homepage: http://pim.kde.org/akonadi
 -Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/akonadi/#_trunk_packages_akonadi_
 -Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/akonadi
 +Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-req/akonadi.git
 +Vcs-Git: git://git.debian.org/pkg-kde/kde-req/akonadi.git
  
- Package: libakonadiprivate1
+ Package: libakonadiprotocolinternals1
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Suggests: akonadi-server (= ${binary:Version})

-- 
Akonadi packaging