Merge ~wxl/kubuntu-packaging/+git/kcoreaddons:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/kcoreaddons:kubuntu_unstable

Proposed by ԜаӀtеr Ⅼарсһуnѕkі
Status: Merged
Merged at revision: 21b4137656d59cd489ccac547ef58e0cbcdf86f9
Proposed branch: ~wxl/kubuntu-packaging/+git/kcoreaddons:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/kcoreaddons:kubuntu_unstable
Diff against target: 34 lines (+5/-1)
3 files modified
debian/changelog (+3/-0)
debian/control (+1/-1)
debian/not-installed (+1/-0)
Reviewer Review Type Date Requested Status
Simon Quigley Approve
Review via email: mp+311868@code.launchpad.net

Description of the change

To deal with http://kci.pangea.pub/job/zesty_unstable_kcoreaddons/26/parsed_console/
 * re: debhelper-but-no-misc-depends, add ${misc:Depends} to libkf5coreaddons-dev in debian/control
 * re: extra-license-file, add not-installed to remove usr/share/kf5/licenses/*

To post a comment you must log in.
Revision history for this message
Simon Quigley (tsimonq2) wrote :

Looks sane to me, thanks! :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 737244a..6d694c5 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -13,6 +13,9 @@ kcoreaddons (5.27.0-1ubuntu1) UNRELEASED; urgency=medium
6 [ Simon Quigley ]
7 * Merge from Debian
8
9+ [ Walter Lapchynski ]
10+ * Added not-installed to remove additional license locations
11+
12 -- Clive Johnston <clivejo@kubuntu.org> Sun, 16 Oct 2016 21:47:51 +0100
13
14 kcoreaddons (5.27.0-1) unstable; urgency=medium
15diff --git a/debian/control b/debian/control
16index 7242372..1ba1e6b 100644
17--- a/debian/control
18+++ b/debian/control
19@@ -24,7 +24,7 @@ Section: libdevel
20 Depends: libkf5coreaddons-bin-dev (= ${binary:Version}),
21 libkf5coreaddons5 (= ${binary:Version}),
22 qtbase5-dev (>= 5.6.1~),
23- ${shlibs:Depends}
24+ ${shlibs:Depends}, ${misc:Depends}
25 Breaks: libkf5service-dev (<= 5.2.0)
26 Replaces: libkf5service-dev (<= 5.2.0)
27 Description: KDE Frameworks 5 addons to QtCore - development files
28diff --git a/debian/not-installed b/debian/not-installed
29new file mode 100644
30index 0000000..efd9f67
31--- /dev/null
32+++ b/debian/not-installed
33@@ -0,0 +1 @@
34+usr/share/kf5/licenses/*

Subscribers

People subscribed via source and target branches