[SCM] Akonadi packaging branch, master, updated. debian/16.04.3-5-31-g66fe978

Maximiliano Curia maxy at moszumanska.debian.org
Sun Aug 20 23:20:40 UTC 2017


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

The following commit has been merged in the master branch:
commit 0d9fb9747810844e36bbfcb20a74c96a1c5beec7
Merge: d00e72f5b7c857fe07a92572c8787bff1c38c136 1aa56e6bbdce945f77d349ea785b4c8db3ec9bfa
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Aug 15 14:03:04 2017 +0200

    Merge remote-tracking branch 'origin/debian/sid'

 debian/README.Debian                               |   2 +-
 debian/akonadi-server.install                      |   1 +
 debian/changelog                                   |  51 ++
 debian/control                                     |  18 +-
 debian/copyright                                   |   2 +-
 debian/libkf5akonadicore-bin.install               |   1 -
 debian/libkf5akonadicore5.symbols                  |   6 +-
 debian/libkf5akonadiwidgets5.symbols               |   4 +-
 .../Delete-the-properties-window-if-closed.patch   |  21 +
 .../patches/QSqlite3-fix-build-with-Qt-5.7.patch   | 909 +++++++++++++++++++++
 debian/patches/fix_build_with_qt_5.9.diff          |  24 +
 .../kubuntu_disable_secure_file_priv_check.diff    |  32 +
 debian/patches/series                              |   5 +
 debian/rules                                       |   3 +-
 debian/source.lintian-overrides                    |   1 -
 15 files changed, 1062 insertions(+), 18 deletions(-)

diff --cc debian/akonadi-server.install
index 604447e,5839db5..701bf8b
--- a/debian/akonadi-server.install
+++ b/debian/akonadi-server.install
@@@ -4,9 -4,10 +4,10 @@@ usr/bin/akonadi_agent_serve
  usr/bin/akonadi_control
  usr/bin/akonadi_rds
  usr/bin/akonadictl
+ usr/bin/akonadiselftest
  usr/bin/akonadiserver
  usr/bin/asapcat
 -usr/share/dbus-1/services/org.freedesktop.Akonadi.Control.service
 -usr/share/mime/packages/akonadi-mime.xml
  usr/share/config.kcfg/resourcebase.kcfg
 +usr/share/dbus-1/services/org.freedesktop.Akonadi.Control.service
  usr/share/kf5/akonadi/akonadi-xml.xsd
 +usr/share/mime/packages/akonadi-mime.xml
diff --cc debian/changelog
index d7ae8c7,fa2afb7..35627aa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,54 +1,71 @@@
 +akonadi (4:16.08.2-1~1.gbp15616e) UNRELEASED; urgency=medium
 +
 +  ** SNAPSHOT build @15616e11f11092f52ae325cda540763c5f2d55b7 **
 +
 +  [ Maximiliano Curia ]
 +  * Use mysql default metapackages
 +  * Add qtbase5-private-dev build dependency.
 +
 +  [ Automatic packaging ]
 +  * Update symbols files with the buildds results
 +  * Update build-deps and deps with the info from cmake
 +  * Refresh patches
 +  * Update symbols files
 +  * Update build-deps and deps with the info from cmake
 +
 + -- Automatic packaging <maxy+jenkins at gnuservers.com.ar>  Thu, 13 Oct 2016 20:35:33 +0200
 +
+ akonadi (4:16.04.3-5) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Maximiliano Curia ]
+   * Add new patch: Delete-the-properties-window-if-closed.patch.
+     Thanks to Nancy Anthracite for reporting (Closes: 845553)
+ 
+   [ Dmitry Shachnev ]
+   * Add a patch from upstream to fix build with Qt 5.9.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 07 Jul 2017 16:33:59 +0300
+ 
+ akonadi (4:16.04.3-4) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sandro Knauß ]
+   * Add patch from kubuntu: kubuntu_disable_secure_file_priv_check.diff
+     - fix compatibility with stricter defaults in mysql security update.
+       (Closes: 843534) Thanks to fld for the report and Marc Deslauriers
+       for the patch.
+   * Fix known typos.
+   * Update Build-Deps to use default-libmysqlclient-dev instead of
+     libmysqlclient-dev.
+   * Add Multi-Arch Hinters from tracker.
+   * Remove unused source.lintian-overrides file.
+   * Merge libkf5akonadicore-bin into akonadi-server package.
+ 
+   [ Maximiliano Curia ]
+   * Use mysql default metapackages
+   * Replace dbus-launch with dbus-run-session in tests.
+     Thanks to Simon McVittie for reporting (Closes: 835827)
+ 
+  -- Sandro Knauß <hefee at debian.org>  Tue, 22 Nov 2016 21:42:07 +0100
+ 
+ akonadi (4:16.04.3-3) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sandro Knauß ]
+   * Backport patch from upstream to build QSqlite3 backend with Qt5.7.1
+     - QSqlite3-fix-build-with-Qt-5.7.patch
+     - Closes: 842502
+     - The original patch written by Daniel Vratil:
+       068c0bd5f93232eea97e492354eff2b9b62c6643
+     - Added qtbase5-private-dev to build deps
+   * Update symbols files from buildds logs (4:16.04.3-2+b1).
+ 
+  -- Sandro Knauß <hefee at debian.org>  Wed, 02 Nov 2016 01:15:34 +0100
+ 
  akonadi (4:16.04.3-2) unstable; urgency=medium
  
    [ Automatic packaging ]
diff --cc debian/control
index b898e29,f313ed5..64c7f20
--- a/debian/control
+++ b/debian/control
@@@ -54,11 -49,8 +54,12 @@@ Depends: akonadi-backend-mysql (= ${sou
  Suggests: akonadi-backend-mysql (= ${source:Version}),
            akonadi-backend-postgresql (= ${source:Version}),
            akonadi-backend-sqlite (= ${binary:Version})
 -Breaks: kdepimlibs-data (<<  4:16.04), kmail (<< 4:16.04), korganizer (<< 4:16.04), akonadiconsole (<< 4:16.04), libkf5akonadicore-bin (<< 4:16.04.3-4)
 +Breaks: akonadiconsole (<< 4:16.04),
 +        kdepimlibs-data (<<  4:16.04),
 +        kmail (<< 4:16.04),
-         korganizer (<< 4:16.04)
- Replaces: kdepimlibs-data (<<  4:16.04)
++        korganizer (<< 4:16.04),
++        libkf5akonadicore-bin (<< 4:16.04.3-4)
+ Replaces: kdepimlibs-data (<<  4:16.04), libkf5akonadicore-bin (<< 4:16.04.3-4)
  Description: Akonadi PIM storage service
   Akonadi is an extensible cross-desktop Personal Information Management (PIM)
   storage service. It provides a common framework for applications to store and
diff --cc debian/libkf5akonadicore5.symbols
index 8e0b271,d69b735..5d984cd
--- a/debian/libkf5akonadicore5.symbols
+++ b/debian/libkf5akonadicore5.symbols
@@@ -2255,8 -2239,10 +2255,8 @@@ libKF5AkonadiCore.so.5 libkf5akonadicor
   _ZNK7Akonadi9ItemModel8rowCountERK11QModelIndex at Base 15.07.90
   _ZNK7Akonadi9ItemModel9mimeTypesEv at Base 15.07.90
   _ZNK7Akonadi9UnlinkJob10metaObjectEv at Base 15.07.90
 - (optional=templinst|arch=armel)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE10_M_destroyEv at Base 4:15.08.2
   (optional=templinst|arch=armel)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE10_M_releaseEv at Base 4:15.08.2
-  (optional=templinst|arch=!armel)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv at Base 15.07.90
+  (optional=templinst|arch=!armel !mips !mips64el !mipsel)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv at Base 15.07.90
 - (optional=templinst|arch=!armel)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv at Base 15.07.90
   _ZTIN5boost16exception_detail10clone_baseE at Base 15.07.90
   _ZTIN5boost9exceptionE at Base 15.07.90
   _ZTIN7Akonadi10GetLockJobE at Base 15.07.90

-- 
Akonadi packaging



More information about the pkg-kde-commits mailing list