[SCM] kpackage packaging branch, master, updated. bf4df5b85ac49028c2db8f93f7dc9ea3701a153b

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 855af3acf38ce215458f4b07706b287fce151826
Merge: 79a2f83b667cd9739f7022257682ec711692bf90 7411e20262f0593d4386c1a8ea37ffcfd26e0f2b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 09:38:52 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control
    	debian/kpackagetool5.install
    	debian/libkf5package5.install
    	debian/not-installed

 debian/changelog     | 14 ++++++++++++++
 debian/control       | 19 +++++++++++--------
 debian/not-installed |  4 +---
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index b726621,fa51ded..d04c12a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,17 +1,36 @@@
 +kpackage (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:52:52 +0100
 +
+ kpackage (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   [ Harald Sitter ]
+   * New upstream release
+   * Version frameworks5 build dependencies to enable automatic version
+     manipulation by our scripts.
+   * Move all manpages for kpackagetool5 to the kpackagetool5 package
+     + kpackagetool5 now breaks older versions of libkf5package5
+ 
+   [ Scarlett Clark ]
+   * Fix man page install path.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Feb 2015 16:37:25 +0100
+ 
 +kpackage (5.6.0-1) experimental; urgency=medium
 +
 +  * Initial debian release.
 +  * Update build dependencies to build against experimenta and to follow
 +    cmake.
 +  * Split -data package and update install files.
 +  * Update watch file.
 +  * Update copyright information.
 +  * Add missing dev dependency (thanks to acc headers check)
 +  * Add myself as uploader.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 28 Jan 2015 09:21:38 +0100
 +
  kpackage (5.6.0-0ubuntu1) vivid; urgency=medium
  
    [ Harald Sitter ]
diff --cc debian/control
index 1f965ab,d274f3d..5edc5f0
--- a/debian/control
+++ b/debian/control
@@@ -2,17 -2,16 +2,18 @@@ Source: kpackag
  Section: libs
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 -Build-Depends: cmake,
 -               debhelper (>= 9.0.0),
 +Uploaders: Maximiliano Curia <maxy at debian.org>
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
-                kdoctools-dev (>= 5.6.0),
-                libkf5archive-dev (>= 5.6.0),
-                libkf5config-dev (>= 5.6.0),
-                libkf5coreaddons-dev (>= 5.6.0),
-                libkf5i18n-dev (>= 5.6.0),
-                pkg-kde-tools (>= 0.15.16~),
+                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),
+                libkf5i18n-dev (>= 5.7.0),
+                pkg-kde-tools,
 -               qtbase5-dev
++               pkg-kde-tools (>> 0.15.15),
 +               qtbase5-dev (>= 5.2.0)
  Standards-Version: 3.9.6
  Homepage: https://projects.kde.org/projects/frameworks/kpackage
  XS-Testsuite: autopkgtest
@@@ -23,6 -22,8 +24,8 @@@ Package: kpackagetool
  Section: kde
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
 -Breaks: libkf5package5 (<< 5.7.0-0ubuntu1~)
 -Replaces: libkf5package5 (<< 5.7.0-0ubuntu1~)
++Breaks: libkf5package5 (<< 5.7.0-1~)
++Replaces: libkf5package5 (<< 5.7.0-1~)
  Description: command line kpackage tool
   KPackage provides classes for applications to manage user installable packages
   of non-binary assets.
@@@ -34,10 -35,7 +37,10 @@@
  Package: libkf5package-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5coreaddons-dev (>= 5.6.0),
 -Depends: libkf5package5 (= ${binary:Version}), ${misc:Depends}
++Depends: libkf5coreaddons-dev (>= 5.7.0),
 +         libkf5package5 (= ${binary:Version}),
 +         qtbase5-dev (>= 5.2.0),
 +         ${misc:Depends}
  Description: development files for kpackage
   KPackage provides classes for applications to manage user installable packages
   of non-binary assets.
diff --cc debian/not-installed
index 06cea66,e086d7c..357954d
--- a/debian/not-installed
+++ b/debian/not-installed
@@@ -1,5 -1,7 +1,3 @@@
  # mangled to .gz by dh_man
 -./usr/share/man/de/man1/kpackagetool5.1
  ./usr/share/man/man1/kpackagetool5.1
--./usr/share/man/nl/man1/kpackagetool5.1
 -./usr/share/man/pt_BR/man1/kpackagetool5.1
--./usr/share/man/sv/man1/kpackagetool5.1
--./usr/share/man/uk/man1/kpackagetool5.1
++./usr/share/man/*/man1/kpackagetool5.1

-- 
kpackage packaging