[SCM] kservice packaging branch, master, updated. 2eccd48bbc9978ab3b15c6fcb5df1e033e1a4f50

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 3e7f0a634514faffe9778c060ab767fa48d4e327
Merge: 40465f0559168a86df90a84e22b5bc14c7fe8600 69599cdf5579bb10db34272c8d7b98acbc836c88
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 10:29:31 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control
    	debian/not-installed
    	debian/patches/kubuntu_rename-application-menu-file.diff

 debian/changelog                                   |  6 ++++++
 debian/control                                     | 22 +++++++++----------
 debian/not-installed                               | 10 ++-------
 .../kubuntu_rename-application-menu-file.diff      | 25 +++++++++++-----------
 4 files changed, 31 insertions(+), 32 deletions(-)

diff --cc debian/changelog
index dda1c76,a41686c..b39a75c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,9 +1,29 @@@
 +kservice (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:09 +0100
 +
+ kservice (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:13:33 +0100
+ 
 +kservice (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 copyright information.
 +  * Update install files.
 +  * Update watch file.
 +  * Add acc autopkgtests.
 +  * Refresh patches.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 27 Jan 2015 13:43:23 +0100
 +
  kservice (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index d3b3680,b24151a..4902c49
--- a/debian/control
+++ b/debian/control
@@@ -3,22 -3,25 +3,22 @@@ 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,
 +Build-Depends: cmake (>= 2.8.12),
                 dbus-x11,
 -               debhelper (>= 9.0.0),
 +               debhelper (>= 9),
                 docbook-xml,
                 docbook-xsl,
-                extra-cmake-modules (>= 1.6.0),
-                kdoctools-dev (>= 5.6.0),
-                libkf5config-dev (>= 5.6.0),
-                libkf5coreaddons-dev (>= 5.6.0),
-                libkf5crash-dev (>= 5.6.0),
-                libkf5dbusaddons-dev (>= 5.6.0),
-                libkf5i18n-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
+                kdoctools-dev (>= 5.7.0),
 -               libkf5archive-dev (>= 5.7.0),
+                libkf5config-dev (>= 5.7.0),
+                libkf5coreaddons-dev (>= 5.7.0),
+                libkf5crash-dev (>= 5.7.0),
+                libkf5dbusaddons-dev (>= 5.7.0),
+                libkf5i18n-dev (>= 5.7.0),
 -               libkf5kjs-dev (>= 5.7.0),
 -               libkf5windowsystem-dev (>= 5.7.0),
                 libxml2-utils,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev
 -Standards-Version: 3.9.5
 +               qtbase5-dev (>= 5.2.0)
 +Standards-Version: 3.9.6
  Homepage: https://projects.kde.org/projects/frameworks/kservice
  XS-Testsuite: autopkgtest
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kservice.git
@@@ -27,10 -30,10 +27,10 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5service-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5config-dev (>= 5.6.0),
-          libkf5coreaddons-dev (>= 5.6.0),
-          libkf5dbusaddons-dev (>= 5.6.0),
-          libkf5i18n-dev (>= 5.6.0),
 -Depends: libkf5config-dev,
 -         libkf5coreaddons-dev,
 -         libkf5dbusaddons-dev,
 -         libkf5i18n-dev,
++Depends: libkf5config-dev (>= 5.7.0),
++         libkf5coreaddons-dev (>= 5.7.0),
++         libkf5dbusaddons-dev (>= 5.7.0),
++         libkf5i18n-dev (>= 5.7.0),
           libkf5service5 (= ${binary:Version}),
           ${misc:Depends},
           ${shlibs:Depends}
diff --cc debian/not-installed
index d2b2dd7,18de047..eb763ac
--- a/debian/not-installed
+++ b/debian/not-installed
@@@ -1,11 -1,12 +1,5 @@@
 -#installed by libkf5service5.manpages
 +#installed by libkf5service-bin.manpages and libkf5service-dev.manpages
  ./usr/share/man/man8/desktoptojson.8
  ./usr/share/man/man8/kbuildsycoca5.8
 -./usr/share/man/it/man8/kbuildsycoca5.8
--./usr/share/man/nl/man8/desktoptojson.8
--./usr/share/man/nl/man8/kbuildsycoca5.8
--./usr/share/man/pt_BR/man8/desktoptojson.8
--./usr/share/man/pt_BR/man8/kbuildsycoca5.8
--./usr/share/man/sv/man8/desktoptojson.8
--./usr/share/man/sv/man8/kbuildsycoca5.8
--./usr/share/man/uk/man8/desktoptojson.8
--./usr/share/man/uk/man8/kbuildsycoca5.8
++./usr/share/man/*/man8/desktoptojson.8
++./usr/share/man/*/man8/kbuildsycoca5.8

-- 
kservice packaging