[SCM] akonadi-search packaging branch, kubuntu_xenial_archive, updated. debian/15.08.3-1-42-g1d36d2e

Scarlett Clark sgclark-guest at moszumanska.debian.org
Wed Feb 17 21:59:39 UTC 2016


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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 1d36d2e59909dc7be770f95f2fa1a64535395c96
Merge: 2fe4541ed32cb16da7906c587eb0cb55e4b65aaa 06b15d9988f6b28919d8ab5a3775562aed5d4954
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Feb 17 13:59:09 2016 -0800

    Debian merge: No remaining changes. ( New merge to grab new changes )

 debian/changelog                           | 15 ++++++++++
 debian/control                             | 44 ++++++++++++++----------------
 debian/libkf5akonadisearch-data.install    |  2 ++
 debian/libkf5akonadisearch-dev.install     |  3 +-
 debian/libkf5akonadisearch-plugins.install |  6 +---
 debian/libkf5akonadisearchpim5.symbols     |  4 +--
 debian/rules                               |  2 +-
 debian/tests/control                       |  2 +-
 debian/tests/testsuite                     |  7 ++++-
 9 files changed, 50 insertions(+), 35 deletions(-)

diff --cc debian/changelog
index 0a96f41,4af3060..aa21f29
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,15 +1,52 @@@
 +akonadi-search (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * Add missing dependency to krunner. 
 +  * Add new package for AkonadiSearchDebug
 +  * Add new files for above and krunner features. 
 +  * Add new symbols for akonadisearchdebug 
 +  * Add missing new files. 
 +  * Redo symbols file with pkgkde-symbolshelper. 
 +  * Loosen up the so version wildcard to fix install searchdebug.
 +
 +  [ Clive Johnston ]
 +  * New upstream release
 +
 +  [ Philip Muškovac ]
 +  * Require libkf5akonadi-dev >= 15.12 
 +  * Merge with debian git master
 +  * Refresh symbols
 +
++  [ Scarlett Clark ]
++  * Debian merge: No remaining changes. ( New merge to grab new changes ) 
++
 + -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:21:55 +0000
 +
 +akonadi-search (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 11:45:11 +0100
 +
 +akonadi-search (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 16:02:20 +0100
 +
+ akonadi-search (15.12.1-1) experimental; urgency=medium
+ 
+   * New upstream release (15.12.0).
+   * New upstream release (15.12.1). (Closes: #814378)
+   * Update symbols files.
+   * Fix typos in Vcs-* fields. (Closes: #814201) Thanks to Zhang
+     Jingqiang
+   * Bump build dependencies to match packages versions, and not
+     libraries versions.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:23:55 +0100
+ 
  akonadi-search (15.08.3-1) experimental; urgency=medium
  
    * New upstream release (15.08.3).
diff --cc debian/libkf5akonadisearch-dev.install
index 8842aef,042623e..c8a42c1
--- a/debian/libkf5akonadisearch-dev.install
+++ b/debian/libkf5akonadisearch-dev.install
@@@ -2,7 -2,6 +2,8 @@@ usr/include/KF5/AkonadiSearch
  usr/include/KF5/akonadi_search_version.h
  usr/lib/*/cmake/KF5AkonadiSearch/
  usr/lib/*/libKF5AkonadiSearchCore.so
+ usr/lib/*/libKF5AkonadiSearchDebug.so
  usr/lib/*/libKF5AkonadiSearchPIM.so
  usr/lib/*/libKF5AkonadiSearchXapian.so
 +usr/include/KF5/AkonadiSearch/Debug/
 +usr/lib/*/libKF5AkonadiSearchDebug.so

-- 
akonadi-search packaging



More information about the pkg-kde-commits mailing list