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

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

Description of the change

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

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:53 +0000
3+++ debian/changelog 2014-06-01 23:22:07 +0000
4@@ -1,3 +1,10 @@
5+kconfigwidgets (4.99.0-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Install *.pri files in arch dependent path.
8+ * Re-add -dev package after a faulty wrap-and-sort.
9+
10+ -- José Manuel Santamaría Lema <panfaust@gmail.com> Sun, 01 Jun 2014 23:47:21 +0200
11+
12 kconfigwidgets (4.99.0-0ubuntu1) trusty; urgency=medium
13
14 * New upstream beta release
15
16=== modified file 'debian/control'
17--- debian/control 2014-05-21 15:57:43 +0000
18+++ debian/control 2014-06-01 23:22:07 +0000
19@@ -26,6 +26,17 @@
20 Standards-Version: 3.9.5
21 Homepage: https://projects.kde.org/projects/frameworks/kconfigwidgets
22
23+Package: libkf5configwidgets-dev
24+Section: libdevel
25+Architecture: any
26+Depends: libkf5configwidgets5 (= ${binary:Version}), ${misc:Depends}
27+Description: development files for kconfigwidgets
28+ KConfigWidgets provides easy-to-use classes to create
29+ configuration dialogs, as well as a set of widgets which
30+ uses KConfig to store their settings.
31+ .
32+ Contains development files for kconfigwidgets.
33+
34 Package: libkf5configwidgets5
35 Section: libdevel
36 Architecture: any
37
38=== modified file 'debian/libkf5configwidgets-dev.install'
39--- debian/libkf5configwidgets-dev.install 2014-05-21 15:27:15 +0000
40+++ debian/libkf5configwidgets-dev.install 2014-06-01 23:22:07 +0000
41@@ -1,4 +1,4 @@
42 usr/include/KF5/
43 usr/lib/*/cmake/KF5ConfigWidgets/
44 usr/lib/*/libKF5ConfigWidgets.so
45-usr/share/qt5/mkspecs/modules/qt_KConfigWidgets.pri
46+usr/lib/*/qt5/mkspecs/modules/*

Subscribers

People subscribed via source and target branches