[SCM] kdnssd packaging branch, master, updated. fbe65d38cf4a1e77dfa32ff16e673b48c9096696

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdnssd.git;a=commitdiff;h=9c35423

The following commit has been merged in the master branch:
commit 9c35423496b7c2b783b442757eae29a56f1ab40d
Merge: 47f70ff3256aaf1f53c6f0fd7b3dfec9a796e673 e415f1839caac6a0b191f93af2d4b817a5323927
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 2 12:14:41 2015 +0100

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

 debian/changelog | 34 ++++++++++++++++++++++++++++++++++
 debian/control   |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index e780199,50912db..cc092e2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,37 +1,59 @@@
 +kdnssd-kf5 (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:35:25 +0100
 +
+ kdnssd-kf5 (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 17:01:20 +0100
+ 
 +kdnssd-kf5 (5.6.0-1) experimental; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * Do not build depend on qt5-default, we only need qtbase5-dev
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.6.0).
 +  * Bump build dependencies to build against the experimental versions.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update copyright information.
 +  * Update install files.
 +  * Update build dependencies to follow cmake.
 +  * Add basic autopkgtests support.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 26 Jan 2015 10:24:51 +0100
 +
+ kdnssd-kf5 (5.6.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 06 Jan 2015 20:19:15 +0100
+ 
+ kdnssd-kf5 (5.5.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 11:05:44 +0100
+ 
+ kdnssd-kf5 (5.4.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Nov 2014 15:12:33 +0100
+ 
+ kdnssd-kf5 (5.3.0-0ubuntu1) utopic; urgency=medium
+ 
+   [ Harald Sitter ]
+   * Do not build depend on qt5-default, we only need qtbase5-dev
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 07 Oct 2014 11:25:18 +0100
+ 
  kdnssd-kf5 (5.2.0-0ubuntu1) utopic; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 9cbedcf,b1a0e4b..22db089
--- a/debian/control
+++ b/debian/control
@@@ -3,16 -3,16 +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),
+                extra-cmake-modules (>= 1.7.0),
                 libavahi-common-dev,
 -               libkf5config-dev (>= 5.7.0),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev,
 +               qtbase5-dev (>= 5.2.0),
                 qttools5-dev,
                 qttools5-dev-tools
 -Standards-Version: 3.9.5
 +Standards-Version: 3.9.6
 +XS-Testsuite: autopkgtest
  Homepage: https://projects.kde.org/projects/frameworks/kdnssd
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kdnssd.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kdnssd.git

-- 
kdnssd packaging