[SCM] libkexiv2 packaging branch, master, updated. debian/4.11.5-1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit add4b332dd57c6402c7e1d0ef269d183212bd54f
Merge: a854061da9200610897f7cc5399451bed9c625eb d655c1c2b418621ca5e3d10d795030b912a1798a
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Dec 30 10:44:05 2013 -0300

    Merge branch 'master' of git://git.debian.org/pkg-kde/kde-sc/libkexiv2
    
    Conflicts:
    	debian/changelog

 debian/changelog | 6 ++++++
 debian/control   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 5b7ba31,f20dc14..1e2e4cf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +libkexiv2 (4:4.11.4-1) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Dec 2013 16:00:39 +0100
 +
+ libkexiv2 (4:4.11.3-2) unstable; urgency=low
+ 
+   * Add the pkg-config build dependency.
+ 
+  -- Pino Toscano <pino at debian.org>  Wed, 25 Dec 2013 18:07:29 +0100
+ 
  libkexiv2 (4:4.11.3-1) unstable; urgency=low
  
    * New upstream release.

-- 
libkexiv2 packaging