[SCM] kdesu packaging branch, master, updated. e034520a0d01ac06db7944f60e272944c9587f05

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit e3346b36f19cdbfc8b4876287bfe36b498cd02ba
Merge: cb013a34cf1d9f6bae985801b73b43e56c949df6 7602e0b9dec48eafcaa90a0928fc4fd72996f9ea
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 10:26:35 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control
    	debian/patches/kubuntu_sudo-support.diff

 debian/changelog                         |  6 ++++++
 debian/control                           | 10 +++++-----
 debian/libkf5su5.install                 |  1 +
 debian/patches/kubuntu_sudo-support.diff | 14 +++++++-------
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index 83dbe0d,0021c5c..b517e67
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,9 +1,31 @@@
 +kdesu (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:54:02 +0100
 +
+ kdesu (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:53:38 +0100
+ 
 +kdesu (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.
 +  * Split -data package and update install files.
 +  * Update copyright information.
 +  * Update install files.
 +  * Update watch file.
 +  * Add basic autopkgtests support.
 +  * Refresh patches.
 +  * Comment out -DKDESU_USE_SUDO_DEFAULT=True.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 28 Jan 2015 12:56:13 +0100
 +
  kdesu (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index d75bdb8,d998808..b84f506
--- a/debian/control
+++ b/debian/control
@@@ -3,16 -3,19 +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),
-                libkf5coreaddons-dev (>= 5.6.0),
-                libkf5pty-dev (>= 5.6.0),
-                libkf5service-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
 -               libkf5config-dev (>= 5.7.0),
+                libkf5coreaddons-dev (>= 5.7.0),
 -               libkf5dbusaddons-dev (>= 5.7.0),
 -               libkf5i18n-dev (>= 5.7.0),
 -               libkf5kjs-dev (>= 5.7.0),
+                libkf5pty-dev (>= 5.7.0),
+                libkf5service-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/kdesu
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kdesu.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kdesu.git
@@@ -20,9 -23,7 +20,9 @@@
  Package: libkf5su-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5pty-dev (>= 5.6.0),
 -Depends: libkf5pty-dev, libkf5su5 (= ${binary:Version}), ${misc:Depends}
++Depends: libkf5pty-dev (>= 5.7.0),
 +         libkf5su5 (= ${binary:Version}),
 +         ${misc:Depends}
  Description: development files for kdesu
   Framework to handle super user actions.
   .

-- 
kdesu packaging