[SCM] kunitconversion packaging branch, master, updated. 947f94ebe18841c020378218f96a336c285e284d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kunitconversion.git;a=commitdiff;h=9665cad

The following commit has been merged in the master branch:
commit 9665cad5da0fd0c5c749093c2146af32146c2451
Merge: 5da91594227533ada192e830190691812a04ec7b 5efae495a2320ac43908df0e6a17324babf11109
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 5 09:54:59 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control

 debian/changelog | 6 ++++++
 debian/control   | 2 ++
 2 files changed, 8 insertions(+)

diff --cc debian/changelog
index 08142c7,69979b0..754bca9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,9 +1,28 @@@
 +kunitconversion (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:40:16 +0100
 +
+ kunitconversion (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:30:00 +0100
+ 
 +kunitconversion (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update install files.
 +  * Update watch file.
 +  * Update copyright information.
 +  * Add basic autopkgtests support.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 26 Jan 2015 15:26:38 +0100
 +
  kunitconversion (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index f3b9593,56c639c..1f55e43
--- a/debian/control
+++ b/debian/control
@@@ -3,14 -3,15 +3,16 @@@ Section: lib
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 -               debhelper (>= 9.0.0),
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
 +               extra-cmake-modules (>= 1.6.0),
 +               libkf5i18n-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
 -               libkf5config-dev (>= 5.7.0),
+                libkf5i18n-dev (>= 5.7.0),
 -               libkf5kjs-dev (>= 5.7.0),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev
 -Standards-Version: 3.9.5
 +               qtbase5-dev (>= 5.2.0)
 +Standards-Version: 3.9.6
 +XS-Testsuite: autopkgtest
  Homepage: https://projects.kde.org/projects/frameworks/kunitconversion
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kunitconversion.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kunitconversion.git

-- 
kunitconversion packaging