[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 1834e62fd56f44b5a4cf8ef59ce0c878e455f46e
Merge: 1639f55cedda9e2558e63eecd0024ca09abdd046 bcb64b7930f69c2c249c18daec28d0582c021e72
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Dec 20 00:14:24 2010 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	debian/control

 debian/NEWS                                        |    9 ++
 debian/README.Debian                               |   17 ++++
 debian/akonadi-backend-mysql.install               |    2 +
 debian/akonadi-backend-sqlite.install              |    1 +
 debian/akonadi-server.install                      |    2 +-
 debian/changelog                                   |   36 +++++++-
 debian/control                                     |   94 +++++++++++++++-----
 debian/libakonadi-dev.install                      |    6 +-
 debian/patches/01_x11_not_required.diff            |    4 +
 debian/patches/02_hardcode_debian_mysqld_path.diff |   10 --
 .../patches/02_sanitize_sqlite_version_check.diff  |   21 +++++
 .../patches/03_disable_usr_lib_install_rpath.diff  |   24 -----
 debian/patches/series                              |    3 +-
 debian/rules                                       |    2 +-
 debian/source/format                               |    1 +
 15 files changed, 167 insertions(+), 65 deletions(-)

diff --cc debian/changelog
index 465bc05,dbefc39..bc8df55
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,39 +1,40 @@@
- akonadi (1.3.1-4) UNRELEASED; urgency=low
+ akonadi (1.4.0-0r2) UNRELEASED; urgency=low
  
+   * New upstream release.
+ 
+   [ Modestas Vainius ]
 +  * Point debian/control Vcs fields to the new Git repository.
+   * Add libsqlite3-dev to build depends. This build has support for SQLite
+     backend.
+   * Drop 03_disable_usr_lib_install_rpath.diff patch, no longer needed as
+     the problem was fixed upstream differently.
+   * Add new packages for multiple backend split:
+     - akonadi-backend-mysql - a package which depends on the stuff needed for
+       MySQL backend (server and Qt module) and installs a configuration file
+       previously present in akonadi-server;
+     - akonadi-backend-sqlite - a package with improved SQLite driver that is
+       needed for Akonadi SQLite backend;
+     - akonadi-backend-pgsql - a package which depends on the stuff needed for
+       PostgreSQL backend.
+   * Make akonadi-server on both backends with | relation preferring MySQL for
+     now. Also suggest both backends.
+   * Move akonadi-dbg to the end of debian/control.
+   * Update install files.
+   * Add NEWS and README.Debian about SQLite (and MySQL) backends.
+   * Bump build dependency to libqt4-dev 4:4.6.0. SQLite backend needs it.
+   * Drop Replaces from libakonadi-dev for very old pre-4.1 KDE versions.
+   * Switch to quilt 3.0 format:
+     - add appropriate debian/source/format;
+     - remove quilt from Build-Depends;
+     - build-depends on pkg-kde-tools (>= 0.9) for 3.0 support;
+   * Bump Standards-Versiont to 3.9.1: add Breaks next to Replaces where needed
+     or replace Conflicts with Breaks respectively,
+   * Improve passing of MYSQLD_EXECUTABLE flag to cmake.
+   * Drop 02_hardcode_debian_mysqld_path.diff, not needed any more.
+   * Add 02_sanitize_sqlite_version_check.diff patch to make akonadi QSQLite
+     driver work when it was compiled against SQLite 3.7.0 or later.
  
-  -- Modestas Vainius <modax at debian.org>  Mon, 26 Jul 2010 23:25:28 +0300
+  -- Modestas Vainius <modax at debian.org>  Fri, 13 Aug 2010 14:50:52 +0300
  
  akonadi (1.3.1-3) unstable; urgency=low
  
diff --cc debian/control
index 8bab302,c182477..d8f6dd8
--- a/debian/control
+++ b/debian/control
@@@ -4,16 -4,16 +4,16 @@@ Priority: extr
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Sune Vuorela <debian at pusling.com>, Modestas Vainius <modax 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.6.4),
-  libqt4-dev (>> 4.4.0~), shared-mime-info, libmysqlclient-dev,
-  libxslt-dev, libsoprano-dev (>= 2.1.1), xsltproc, libdbus-1-dev, libboost-program-options-dev
- Standards-Version: 3.8.4
+ Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), cmake (>= 2.6.2), automoc, pkg-kde-tools (>= 0.9),
+  libqt4-dev (>= 4:4.6.0), shared-mime-info, libmysqlclient-dev,
+  libxslt-dev, libsoprano-dev (>= 2.1.1), xsltproc, libdbus-1-dev, libboost-program-options-dev,
+  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
- Section: libs
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Suggests: akonadi-server (= ${binary:Version})

-- 
Akonadi packaging