[SCM] kfilemetadata packaging branch, kubuntu_unstable, updated. debian/5.6.2-1-32-g418c1d5

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kfilemetadata.git;a=commitdiff;h=418c1d5

The following commit has been merged in the kubuntu_unstable branch:
commit 418c1d5be131d73cb715d48e792ff6a54a716b49
Merge: 84f82a933de2a2ba6543abcdfd351e6ef83bbd4c 46af442d1de870f188135c337be86d3d049655b1
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:09:41 2015 +0200

    merge master

 debian/.gitattributes                  |   1 +
 debian/changelog                       |  59 +++++++++++++++
 debian/control                         |  40 +++++-----
 debian/copyright                       | 130 ++++++++++++++++++++-------------
 debian/libkf5filemetadata-bin.install  |   2 +-
 debian/libkf5filemetadata-data.install |   2 +-
 debian/libkf5filemetadata-dev.acc.in   |  20 +++++
 debian/libkf5filemetadata3.install     |   2 +-
 debian/libkf5filemetadata3.symbols     |   8 ++
 debian/rules                           |   4 +-
 debian/tests/acc                       |  11 +++
 debian/tests/control                   |   5 +-
 debian/tests/testsuite.xsession        |  11 +--
 debian/watch                           |   5 +-
 14 files changed, 216 insertions(+), 84 deletions(-)

diff --cc debian/changelog
index 88ec6e5,e8e4e91..29b5d44
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,28 +1,53 @@@
 +kfilemetadata-kf5 (5.9.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:25:45 +0200
 +
 +kfilemetadata-kf5 (5.9.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Jun 2015 20:22:09 +0200
 +
 +kfilemetadata-kf5 (5.6.2-0ubuntu1.1) vivid; urgency=medium
 +
 +  * Add runtime depends on catdoc LP: #1449472
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 28 Apr 2015 12:05:35 +0200
 +
 +kfilemetadata-kf5 (5.6.2-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release 
 +  * Release to Archive
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 19 Mar 2015 21:25:01 -0700
 +
+ kfilemetadata-kf5 (5.9.1-1~) UNRELEASED; urgency=medium
+ 
+   [ Maximiliano Curia ]
+   * New upstream release (5.9.0).
+   * Update symbols files.
+   * New upstream release (5.9.1).
+ 
+   [ Felix Geyer ]
+   * Move qtbase5-dev dependency from libkf5filemetadata3 to
+     libkf5filemetadata-dev. (Closes: #789655)
+   * Remove XS-Testsuite control field, dpkg adds it automatically.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:55:17 +0200
+ 
+ kfilemetadata-kf5 (5.6.2-1) experimental; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream release
+ 
+   [ Maximiliano Curia ]
+   * Prepare Debian release. (5.6.1-1)
+   * New upstream release (5.6.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:17:38 +0100
+ 
  kfilemetadata-kf5 (5.6.1-0ubuntu1) vivid; urgency=medium
  
    [ Harald Sitter ]
diff --cc debian/libkf5filemetadata3.symbols
index d8f4822,657cde4..8c4f519
--- a/debian/libkf5filemetadata3.symbols
+++ b/debian/libkf5filemetadata3.symbols
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +# SymbolsHelper-Confirmed: 5.6.95 amd64
++=======
+ # SymbolsHelper-Confirmed: 5.9.0 amd64
++>>>>>>> master
  libKF5FileMetaData.so.3 libkf5filemetadata3 #MINVER#
   _ZN13KFileMetaData12PropertyInfo8fromNameERK7QString at Base 5.0.0
   _ZN13KFileMetaData12PropertyInfoC1ENS_8Property8PropertyE at Base 5.0.0
@@@ -55,7 -55,7 +59,11 @@@
   _ZN13KFileMetaData22SimpleExtractionResultD1Ev at Base 5.0.2+git20140925
   _ZN13KFileMetaData22SimpleExtractionResultD2Ev at Base 5.0.2+git20140925
   _ZN13KFileMetaData22SimpleExtractionResultaSERKS0_ at Base 5.0.2+git20140925
++<<<<<<< HEAD
 + _ZN13KFileMetaData8TypeInfo8fromNameERK7QString at Base 5.6.95
++=======
+  _ZN13KFileMetaData8TypeInfo8fromNameERK7QString at Base 5.9.0
++>>>>>>> master
   _ZN13KFileMetaData8TypeInfoC1ENS_4Type4TypeE at Base 5.0.0
   _ZN13KFileMetaData8TypeInfoC1ERKS0_ at Base 5.0.0
   _ZN13KFileMetaData8TypeInfoC2ENS_4Type4TypeE at Base 5.0.0

-- 
kfilemetadata packaging