Merge lp:~panfaust/kubuntu-packaging/kcompletion-work into lp:~kubuntu-packagers/kubuntu-packaging-next/kcompletion

Proposed by Jose Manuel Santamaria Lema
Status: Merged
Merged at revision: 26
Proposed branch: lp:~panfaust/kubuntu-packaging/kcompletion-work
Merge into: lp:~kubuntu-packagers/kubuntu-packaging-next/kcompletion
Diff against target: 45 lines (+18/-1)
3 files modified
debian/changelog (+7/-0)
debian/control (+10/-0)
debian/libkf5completion-dev.install (+1/-1)
To merge this branch: bzr merge lp:~panfaust/kubuntu-packaging/kcompletion-work
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+221657@code.launchpad.net

Description of the change

* Re-add -dev package after a faulty wrap-and-sort.
* Install *.pri files in arch dependent path.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-05-29 09:36:48 +0000
3+++ debian/changelog 2014-06-02 04:54:12 +0000
4@@ -1,3 +1,10 @@
5+kcompletion (4.99.0-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Re-add -dev package after a faulty wrap-and-sort.
8+ * Install *.pri files in arch dependent path.
9+
10+ -- José Manuel Santamaría Lema <panfaust@gmail.com> Mon, 02 Jun 2014 03:39:00 +0200
11+
12 kcompletion (4.99.0-0ubuntu1) trusty; urgency=medium
13
14 [ Jonathan Riddell ]
15
16=== modified file 'debian/control'
17--- debian/control 2014-05-21 15:57:37 +0000
18+++ debian/control 2014-06-02 04:54:12 +0000
19@@ -18,6 +18,16 @@
20 Standards-Version: 3.9.5
21 Homepage: https://projects.kde.org/projects/frameworks/kcompletion
22
23+Package: libkf5completion-dev
24+Section: libdevel
25+Architecture: any
26+Depends: libkf5completion5 (= ${binary:Version}), ${misc:Depends}
27+Description: development files for kcompletion
28+ KCompletion provides widgets with advanced completion support as well as a
29+ lower-level completion class which can be used with your own widgets.
30+ .
31+ Contains development files for kcompletion.
32+
33 Package: libkf5completion5
34 Section: libdevel
35 Architecture: any
36
37=== modified file 'debian/libkf5completion-dev.install'
38--- debian/libkf5completion-dev.install 2014-05-21 15:27:07 +0000
39+++ debian/libkf5completion-dev.install 2014-06-02 04:54:12 +0000
40@@ -1,4 +1,4 @@
41 usr/include/KF5/
42 usr/lib/*/cmake/KF5Completion/
43 usr/lib/*/libKF5Completion.so
44-usr/share/qt5/mkspecs/modules/qt_KCompletion.pri
45+usr/lib/*/qt5/mkspecs/modules/*

Subscribers

People subscribed via source and target branches