[SCM] akonadi1 packaging branch, kubuntu_wily_archive, updated. 628b438b5c68165d1bdc084096a7b42923238235

Wed Sep 2 08:20:20 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/akonadi1.git;a=commitdiff;h=96053dc

The following commit has been merged in the kubuntu_wily_archive branch:
commit 96053dc43f9353840386ea296eee5bd662d26b2b
Merge: 806dfbe5841777d30b7cb3fc2455f5b6374063f7 27183fcba6d8b572ccd614f669f76944551c03cb
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Sep 2 09:57:32 2015 +0200

    Merge branch 'master' into kubuntu_wily_archive
    
    Conflicts:
    	debian/control

 debian/akonadi-server.manpages                     |   1 +
 debian/changelog                                   |  59 ++++++
 debian/control                                     |   5 +-
 debian/copyright                                   | 221 +++++++++++----------
 debian/libakonadiprotocolinternals1.symbols        |   4 +-
 debian/man/akonadictl.1                            |  39 ++++
 debian/not-installed                               |   1 +
 debian/patches/postgresql-data-checksums.patch     |  18 ++
 debian/patches/postgresql9.4.patch                 |  22 ++
 debian/patches/series                              |  18 +-
 debian/patches/upstream-MOVEcomplete.patch         |  59 ++++++
 ...do_not_crash_when_setmntent_returns_NULL.patch} |   0
 ...uffer_overflow_in_AKTEST_FAKESERVER_MAIN.patch} |   0
 ...ion => upstream-fix_typo_in_if_condition.patch} |   0
 ...upstream-prevent-QTimer-negative-interval.patch |  27 +++
 debian/patches/upstream-use-QAtomicInt.patch       |  37 ++++
 ... upstream_dont_call_insert_from_Q_ASSERT.patch} |   0
 ...ream_dont_leak_old_external_payload_files.patch | 135 +++++++++++++
 .../upstream_opt-0002-intern-entity-strings.patch  | 176 ++++++++++++++++
 .../patches/upstream_opt-0003-QMutexLocker.patch   | 112 +++++++++++
 .../upstream_opt-0004-one-hash-lookup.patch        |  32 +++
 .../upstream_opt-0005-optimize-queries.patch       | 107 ++++++++++
 22 files changed, 954 insertions(+), 119 deletions(-)

diff --cc debian/changelog
index f3b683e,09eaa73..f053a8b

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,49 -1,62 +1,108 @@@
+ akonadi (1.13.0-8) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update symbols files.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 29 Aug 2015 00:41:28 +0200
+ 
+ akonadi (1.13.0-7) unstable; urgency=medium
+ 
+   * Team upload.
+   * Removed some patches introduced in previous upload due to regressions
+     causing invalid SQL commands.
+ 
+  -- Dmitry Smirnov <onlyjob at debian.org>  Mon, 20 Jul 2015 12:30:32 +1000
+ 
+ akonadi (1.13.0-6) unstable; urgency=medium
+ 
+   * Team upload.
+   * New "upstream-MOVEcomplete.patch" (fixes deadlock).
+   * Bunch of optimisation patches from upstream 1.13 branch.
+   * Install "akonadictl.1" man page.
+   * copyright: reviewed, converted to copyright-format-1.0 and updated.
+ 
+  -- Dmitry Smirnov <onlyjob at debian.org>  Mon, 20 Jul 2015 03:26:42 +1000
+ 
+ akonadi (1.13.0-5) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream patches:
+     + upstream-use-QAtomicInt.patch
+     + upstream-prevent-QTimer-negative-interval.patch
+   * Initialise PSQL database with "--data-checksums" (Closes: #791807).
+   * Build-Depends: removed "mysql-server-core" (not needed on build time).
+ 
+  -- Dmitry Smirnov <onlyjob at debian.org>  Sun, 19 Jul 2015 20:31:33 +1000
+ 
+ akonadi (1.13.0-4) unstable; urgency=medium
+ 
+   * Team upload.
+   * backend-mysql: depend on MySQL-5.6 or any MySQL flavour (Closes: #746651)
+     Depends:
+     - mysql-server-core-5.5 | mysql-server-core
+     + mysql-server-core-5.6 | virtual-mysql-server-core
+   * Standards-Version: 3.9.6.
+   * xs-testsuite-header-in-debian-control: removed "XS-Testsuite" header.
+   * Updated Vcs-Browser URL.
+   * Patches renamed to consistently end with ".patch".
+   * New patch to add PostgreSQL 9.4 search path (Closes: #791805).
+ 
+  -- Dmitry Smirnov <onlyjob at debian.org>  Mon, 13 Jul 2015 23:56:38 +1000
+ 
+ akonadi (1.13.0-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Apply upstream_dont_leak_old_external_payload_files.patch which fixes a bug
+     that let old files be kept when they should be removed.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Tue, 30 Jun 2015 12:03:32 -0300
+ 
 +akonadi (1.13.0-2ubuntu5) wily; urgency=medium
 +
 +  * No change rebuild for boost1.58/libstdc++6.
 +
 + -- Dimitri John Ledkov <dimitri.j.ledkov at linux.intel.com>  Sun, 02 Aug 2015 11:57:02 +0100
 +
 +akonadi (1.13.0-2ubuntu4) vivid; urgency=medium
 +
 +  * debian/rules: re-enable the override_dh_installinit target, disabled
 +    in an earlier merge from debian. This allows dh-apparmor to create
 +    the postinst for the akonadi-backend-mysql package, which creates
 +    the missing part of that package's apparmor profile at install time
 +    (LP: #1440501)
 +
 + -- Steve Beattie <sbeattie at ubuntu.com>  Wed, 15 Apr 2015 10:48:33 -0700
 +
 +akonadi (1.13.0-2ubuntu3) vivid; urgency=medium
 +
 +  * Still prefer mysql 5.6, but allow any mysql implementation that provides
 +    virtual-mysql-server-core and virtual-mysql-client-core
 +    (LP: #1336005)
 +  * Force dependency on akonadi-backend-mysql for akonadi-server.
 +    (was accidentally dropped in the last debian merge)
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Wed, 15 Apr 2015 16:57:20 +0200
 +
 +akonadi (1.13.0-2ubuntu2) vivid; urgency=medium
 +
 +  * Allow using mariadb 10.0 as backend for akonadi-backend-mysql
 +    (LP: #1441119)
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Thu, 09 Apr 2015 18:25:44 +0200
 +
 +akonadi (1.13.0-2ubuntu1) vivid; urgency=medium
 +
 +  * Merge from Debian unstable.  Remaining changes:
 +    - Add a mysqld-akonadi wrapper script.
 +    - Add apparmor profile for mysqld-akonadi (usr.sbin.mysqld-akonadi).
 +    - Make akonadi-backend-mysql depend on mysql-server-core-5.5 and
 +      mysql-client-core-5.5 or *5.6 instead of mysql-server-core.
 +    - Force dependency on akonadi-backend-mysql for akonadi-server.
 +    - Keep debian/libakonadiprotocolinternals1.symbols from Ubuntu
 +    - Add Kubuntu to the maintainers as we are moving to debian git.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 31 Oct 2014 14:50:27 +0000
 +
  akonadi (1.13.0-2) unstable; urgency=medium
  
    [ Pino Toscano ]

-- 
akonadi1 packaging

