[SCM] libkexiv2 packaging branch, kubuntu_xenial_archive, updated. debian/15.04.3-1-21-g728bcdd

[Clive Johnston]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 728bcddbc35f87c0ee8cc9faa4331200e7607d1e
Merge: baba1eac7e2bc9201d71c38a3cfe019505faebad 165a1be29bd9f5635f8e37d38dd57523e986a1e6
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Feb 13 12:26:21 2016 +0000

    Merged with Debian and New upstream release

 debian/.gitattributes              |   1 +
 debian/changelog                   |  48 +++--
 debian/control                     |  52 ++----
 debian/docs                        |   1 -
 debian/libkexiv2-11v5.acc          |  16 --
 debian/libkexiv2-11v5.install      |   2 -
 debian/libkexiv2-11v5.symbols      | 368 -------------------------------------
 debian/libkexiv2-data.install      |   1 -
 debian/libkexiv2-dev.install       |  13 --
 debian/libkf5kexiv2-15.0.0.install |   2 +
 debian/libkf5kexiv2-15.0.0.symbols | 258 ++++++++++++++++++++++++++
 debian/libkf5kexiv2-dev.acc.in     |  21 +++
 debian/libkf5kexiv2-dev.install    |   4 +
 debian/rules                       |   6 +-
 debian/tests/acc                   |  11 ++
 debian/tests/control               |   8 +
 debian/tests/testsuite             |   4 +
 debian/tests/testsuite.xsession    |   5 +
 18 files changed, 365 insertions(+), 456 deletions(-)

diff --cc debian/changelog
index 0983996,021c48b..3cf4053
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,47 -1,23 +1,68 @@@
- libkexiv2 (4:15.08.2-0ubuntu1) wily; urgency=medium
++libkf5kexiv2 (15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 +
++  * Merged with Debian
 +  * New upstream release
 +
-  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:57:10 +0100
++ -- Clive Johnston <clivejo at aol.com>  Sat, 13 Feb 2016 12:23:04 +0000
++
+ libkf5kexiv2 (15.12.0-2) experimental; urgency=medium
+ 
+   * Update symbols files from buildds logs (15.12.0-1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Feb 2016 10:10:50 +0100
  
- libkexiv2 (4:15.08.1-0ubuntu1) wily; urgency=medium
+ libkf5kexiv2 (15.12.0-1) experimental; urgency=medium
  
-   * New upstream release (15.08.1)
+   * New upstream release (15.12.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:22:20 +0100
+ 
++libkexiv2 (4:15.08.2-0ubuntu1) wily; urgency=medium
++
++  * New upstream release
 +
-  -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 17:40:52 +0100
++ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:57:10 +0100
 +
 +libkexiv2 (4:15.08.0-0ubuntu2) wily; urgency=medium
 +
 +  * Add back in libkexiv2-11v5 change
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 31 Aug 2015 14:36:02 +0100
 +
 +libkexiv2 (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 26 Aug 2015 17:46:18 +0100
 +
+ libkexiv2 (4:15.04.3-1) unstable; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * Update symbols files from buildds logs (4:14.12.2-1).
+   * New upstream release (15.04.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 27 Aug 2015 12:20:15 +0200
+ 
 +libkexiv2 (4:15.04.2-0ubuntu4) wily; urgency=medium
 +
 +  * Mark one new template symbol from previous upload as optional as it only
 +    exists on 64 bit arches.
 +
 + -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 06 Aug 2015 11:15:27 +0200
 +
 +libkexiv2 (4:15.04.2-0ubuntu3) wily; urgency=medium
 +
 +  * Rename library to libkexiv2-11v5 as it changes ABI with g++ 5, and adjust
 +    symbols.
 +
 + -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 06 Aug 2015 10:40:16 +0200
 +
 +libkexiv2 (4:15.04.2-0ubuntu2) wily; urgency=medium
 +
 +  * No-change rebuild against libexiv2-14.
 +
 + -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 06 Aug 2015 08:14:14 +0200
 +
  libkexiv2 (4:15.07.90-0ubuntu1) wily; urgency=medium
  
    [ José Manuel Santamaría Lema ]
diff --cc debian/control
index d831d1c,cd05c88..5729dc1
--- a/debian/control
+++ b/debian/control
@@@ -5,26 -5,23 +5,25 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Pino Toscano <pino at debian.org>,
             Sune Vuorela <sune at debian.org>,
             Maximiliano Curia <maxy at debian.org>
- Build-Depends: cmake,
+ Build-Depends: cmake (>= 2.8.12~),
                 debhelper (>= 9),
-                kde-sc-dev-latest (>= 4:4.12),
-                kdelibs5-dev,
-                libexiv2-dev (>= 0.20),
+                extra-cmake-modules (>= 1.1.0~),
+                libexiv2-dev (>= 0.24~),
                 pkg-config,
-                pkg-kde-tools (>= 0.12)
+                pkg-kde-tools (>= 0.12),
+                qtbase5-dev (>= 5.2.0~)
  Standards-Version: 3.9.6
  Homepage: http://www.kde.org/
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/libkexiv2.git/
- Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/libkexiv2.git
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/libkexiv2.git
+ Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/libkexiv2.git
  
- Package: libkexiv2-11v5
+ Package: libkf5kexiv2-15.0.0
  Section: libs
  Architecture: any
- Depends: libkexiv2-data (>= ${source:Version}),
-          ${misc:Depends},
+ Depends: ${misc:Depends},
           ${shlibs:Depends}
 +Conflicts: libkexiv2-11
 +Replaces: libkexiv2-11
  Description: Qt like interface for the libexiv2 library
   Libkexiv2 is a Qt wrapper around the Exiv2 library, used to manipulate
   pictures metadata.

-- 
libkexiv2 packaging