[SCM] kpackage packaging branch, kubuntu_vivid_archive, updated. 0e022749717befaf51065a858d7056d875f5c617
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Tue Feb 10 08:08:45 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kpackage.git;a=commitdiff;h=0e02274
The following commit has been merged in the kubuntu_vivid_archive branch:
commit 0e022749717befaf51065a858d7056d875f5c617
Author: Harald Sitter <sitter at kde.org>
Date: Tue Feb 10 09:06:15 2015 +0100
import changes from ppa and further fix the packaging
* 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
* Fix man page install path.
---
debian/changelog | 10 +++++++++-
debian/control | 12 +++++++-----
debian/kpackagetool5.install | 1 +
debian/libkf5package5.install | 1 -
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 450c7a7..36e26c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
kpackage (5.7.0-0ubuntu1) UNRELEASED; 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.
- -- Harald Sitter <sitter at kde.org> Mon, 09 Feb 2015 10:00:40 +0100
+ -- Scarlett Clark <sgclark at kubuntu.org> Mon, 09 Feb 2015 19:20:12 -0800
kpackage (5.6.0-0ubuntu1) vivid; urgency=medium
diff --git a/debian/control b/debian/control
index c494b9a..d274f3d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,11 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Build-Depends: cmake,
debhelper (>= 9.0.0),
extra-cmake-modules (>= 1.7.0),
- kdoctools-dev,
- libkf5archive-dev,
- libkf5config-dev,
- libkf5coreaddons-dev,
- libkf5i18n-dev,
+ 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
Standards-Version: 3.9.6
@@ -22,6 +22,8 @@ Package: kpackagetool5
Section: kde
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libkf5package5 (<< 5.7.0-0ubuntu1~)
+Replaces: libkf5package5 (<< 5.7.0-0ubuntu1~)
Description: command line kpackage tool
KPackage provides classes for applications to manage user installable packages
of non-binary assets.
diff --git a/debian/kpackagetool5.install b/debian/kpackagetool5.install
index b5f8830..acc6dff 100644
--- a/debian/kpackagetool5.install
+++ b/debian/kpackagetool5.install
@@ -1,2 +1,3 @@
usr/bin/kpackagetool5
usr/share/man/man1/kpackagetool5.1
+usr/share/man/*/man1/kpackagetool5.1
diff --git a/debian/libkf5package5.install b/debian/libkf5package5.install
index 475838e..21d67f9 100644
--- a/debian/libkf5package5.install
+++ b/debian/libkf5package5.install
@@ -2,4 +2,3 @@ usr/lib/*/libKF5Package.so.5
usr/lib/*/libKF5Package.so.5.*
usr/share/kservicetypes5/kpackage-packagestructure.desktop
usr/share/locale/
-usr/share/man/*/man1/kpackagetool.1
--
kpackage packaging
More information about the pkg-kde-commits
mailing list