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

Proposed by Jose Manuel Santamaria Lema
Status: Superseded
Proposed branch: lp:~panfaust/kubuntu-packaging-next/kconfig-work
Merge into: lp:~kubuntu-packagers/kubuntu-packaging-next/kconfig
Diff against target: 81 lines (+16/-2)
4 files modified
debian/changelog (+9/-0)
debian/control (+6/-1)
debian/libkf5config-bin.install (+1/-0)
debian/libkf5configcore5.install (+0/-1)
To merge this branch: bzr merge lp:~panfaust/kubuntu-packaging-next/kconfig-work
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+223658@code.launchpad.net

This proposal has been superseded by a proposal from 2014-06-19.

Description of the change

* Move /usr/lib/*/libexec/kf5/kconf_update from libkf5configcore5 to libkf5config-bin.
* Library packages now recommend libkf5config-bin.

To post a comment you must log in.
31. By Scarlett Gately Moore

Merge:
[ José Manuel Santamaría Lema ]
* Move /usr/lib/*/libexec/kf5/kconf_update from libkf5configcore5 to
  libkf5config-bin.
* Library packages now recommend libkf5config-bin.
* The -dev package depends on -bin because when building other KF5 components
  cmake fails if kconf_update is not found; however this should not be
  neccesary, it's an upstream bug, when solved this dependency should be
  removed.

32. By Jonathan Riddell

released

33. By Jonathan Riddell

Initial stable upstream release

34. By Scarlett Gately Moore

[ Jonathan Riddell ]
[ Scarlett Clark ]
Fix install files

modified:
  debian/changelog
  debian/libkf5configcore5.install
  debian/libkf5configgui5.install

35. By Rohan Garg

Fix rules

36. By Rohan Garg

Add autopkgtests

37. By Scarlett Gately Moore

fix watch, add VCS

38. By Rohan Garg

Cleanup++

39. By Rohan Garg

releasing package kconfig version 5.0.0-0ubuntu1

40. By Rohan Garg

Fix autopkg testsuite

41. By Rohan Garg

releasing package kconfig version 5.0.0-0ubuntu2

42. By Rohan Garg

Tests are run with autopkgtest

43. By Rohan Garg

releasing package kconfig version 5.0.0-0ubuntu3

44. By Scarlett Gately Moore

Update Copyright

45. By Scarlett Gately Moore

Update Copyright

46. By Jose Manuel Santamaria Lema

Update libraries *.install paths so a soname bump doesn't go unnoticed.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-06-05 11:39:41 +0000
+++ debian/changelog 2014-06-19 19:25:53 +0000
@@ -10,6 +10,15 @@
10 * Remove useless Pre-Depends fields used for multiarch compat in10 * Remove useless Pre-Depends fields used for multiarch compat in
11 releases older than trusty11 releases older than trusty
1212
13 [ José Manuel Santamaría Lema ]
14 * Move /usr/lib/*/libexec/kf5/kconf_update from libkf5configcore5 to
15 libkf5config-bin.
16 * Library packages now recommend libkf5config-bin.
17 * The -dev package depends on -bin because when building other KF5 components
18 cmake fails if kconf_update is not found; however this should not be
19 neccesary, it's an upstream bug, when solved this dependency should be
20 removed.
21
13 -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 02 Jun 2014 13:35:25 +010022 -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 02 Jun 2014 13:35:25 +0100
1423
15kconfig (4.99.0-0ubuntu1) trusty; urgency=medium24kconfig (4.99.0-0ubuntu1) trusty; urgency=medium
1625
=== modified file 'debian/control'
--- debian/control 2014-06-05 11:39:41 +0000
+++ debian/control 2014-06-19 19:25:53 +0000
@@ -19,6 +19,7 @@
19Architecture: any19Architecture: any
20Depends: libkf5configcore5 (= ${binary:Version}),20Depends: libkf5configcore5 (= ${binary:Version}),
21 libkf5configgui5 (= ${binary:Version}),21 libkf5configgui5 (= ${binary:Version}),
22 libkf5config-bin (= ${binary:Version}),
22 qtbase5-dev,23 qtbase5-dev,
23 ${misc:Depends},24 ${misc:Depends},
24 ${shlibs:Depends}25 ${shlibs:Depends}
@@ -49,6 +50,7 @@
49Depends: libkf5config-data (= ${source:Version}),50Depends: libkf5config-data (= ${source:Version}),
50 ${misc:Depends},51 ${misc:Depends},
51 ${shlibs:Depends}52 ${shlibs:Depends}
53Recommends: libkf5config-bin (= ${binary:Version})
52Description: configuration settings framework for Qt54Description: configuration settings framework for Qt
53 KConfig provides an advanced configuration system. It is made of two55 KConfig provides an advanced configuration system. It is made of two
54 parts: KConfigCore and KConfigGui.56 parts: KConfigCore and KConfigGui.
@@ -76,6 +78,7 @@
76Depends: libkf5config-data (= ${source:Version}),78Depends: libkf5config-data (= ${source:Version}),
77 ${misc:Depends},79 ${misc:Depends},
78 ${shlibs:Depends}80 ${shlibs:Depends}
81Recommends: libkf5config-bin (= ${binary:Version})
79Description: configuration settings framework for Qt82Description: configuration settings framework for Qt
80 KConfig provides an advanced configuration system. It is made of two83 KConfig provides an advanced configuration system. It is made of two
81 parts: KConfigCore and KConfigGui.84 parts: KConfigCore and KConfigGui.
@@ -125,6 +128,8 @@
125Package: libkf5config-bin128Package: libkf5config-bin
126Architecture: any129Architecture: any
127Depends: ${misc:Depends}, ${shlibs:Depends}130Depends: ${misc:Depends}, ${shlibs:Depends}
131Breaks: libkf5configcore5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa1)
132Replaces: libkf5configcore5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa1)
128Description: configuration settings framework for Qt133Description: configuration settings framework for Qt
129 KConfig provides an advanced configuration system. It is made of two134 KConfig provides an advanced configuration system. It is made of two
130 parts: KConfigCore and KConfigGui.135 parts: KConfigCore and KConfigGui.
@@ -144,7 +149,7 @@
144 .149 .
145 This package is part of KDE Frameworks 5.150 This package is part of KDE Frameworks 5.
146 .151 .
147 This package contains the kreadconfig5 and kwriteconfig5 binaries.152 This package contains runtime files for KConfig.
148153
149Package: libkf5config5-dbg154Package: libkf5config5-dbg
150Priority: extra155Priority: extra
151156
=== modified file 'debian/libkf5config-bin.install'
--- debian/libkf5config-bin.install 2014-06-03 12:40:55 +0000
+++ debian/libkf5config-bin.install 2014-06-19 19:25:53 +0000
@@ -1,2 +1,3 @@
1usr/bin/kreadconfig51usr/bin/kreadconfig5
2usr/bin/kwriteconfig52usr/bin/kwriteconfig5
3usr/lib/*/libexec/kf5/kconf_update
34
=== modified file 'debian/libkf5configcore5.install'
--- debian/libkf5configcore5.install 2014-05-21 15:27:12 +0000
+++ debian/libkf5configcore5.install 2014-06-19 19:25:53 +0000
@@ -1,3 +1,2 @@
1usr/lib/*/libKF5ConfigCore*.so.4*1usr/lib/*/libKF5ConfigCore*.so.4*
2usr/lib/*/libKF5ConfigCore*.so.52usr/lib/*/libKF5ConfigCore*.so.5
3usr/lib/*/libexec/kf5/kconf_update

Subscribers

People subscribed via source and target branches