[SCM] libkexiv2 packaging branch, kde4.12, updated. debian/4.11.5-2-6-g1573355

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/libkexiv2.git;a=commitdiff;h=5b76aed

The following commit has been merged in the kde4.12 branch:
commit 5b76aed8fdf2708bf23ba4128be7335e2d9c4bb5
Merge: f7a228af6b8c8f332afc72022a967a93d9277438 f2df0f7d206cb14350c8c3fa5c8e7b4828c65f64
Author: Pino Toscano <pino at debian.org>
Date:   Sat Feb 22 18:51:55 2014 +0100

    Merge remote-tracking branch 'origin/master' into kde4.12
    
    Conflicts:
    	debian/changelog

 debian/changelog            |  7 +++++++
 debian/libkexiv2-11.symbols | 51 +++++++++++++++++++++++----------------------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --cc debian/changelog
index 5aac049,9837ec5..157843f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
 +libkexiv2 (4:4.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Bump kde-sc-dev-latest build dependency.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 11:31:32 +0100
 +
+ libkexiv2 (4:4.11.5-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update symbols file.
+ 
+  -- Pino Toscano <pino at debian.org>  Sat, 22 Feb 2014 18:38:36 +0100
+ 
  libkexiv2 (4:4.11.5-1) unstable; urgency=low
  
    * New upstream release.

-- 
libkexiv2 packaging