kubuntu-packaging-next

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

  1. kactivities-work
  2. Merge into kactivities
Proposed by Jose Manuel Santamaria Lema
Status: Merged
Merged at revision: 33
Proposed branch: lp:~panfaust/kubuntu-packaging-next/kactivities-work
Merge into: lp:~kubuntu-packagers/kubuntu-packaging-next/kactivities
Diff against target: 48 lines (+6/-5)
3 files modified
debian/changelog (+4/-1)
debian/control (+1/-0)
debian/libkf5activities5.symbols (+1/-4)
To merge this branch: bzr merge lp:~panfaust/kubuntu-packaging-next/kactivities-work
Reviewer Review Type Date Requested Status
Scarlett Gately Moore Approve
Review via email: mp+221955@code.launchpad.net

Description of the change

* Remove a dupe changelog entry.
* Add missing build depend on kio.
* Update symbols files. NOTE: I didn't check ABI breaks, since ABI compatibility isn't guaranteed yet for kf5.

To post a comment you must log in.
Revision history for this message
Scarlett Gately Moore (scarlettmoore) :
review: Approve
lp:~panfaust/kubuntu-packaging-next/kactivities-work updated
33. By Scarlett Gately Moore

Merge:
[ José Manuel Santamaría Lema ]
* Add kf5-kio-dev build depend.
* Update symbols file.

modified:
  debian/changelog
  debian/control
  debian/libkf5activities5.symbols
pending merges:
  José Manuel Santamaría Lema 2014-06-03 Update symbols file.
    José Manuel Santamaría Lema 2014-06-03 Add kf5-kio-dev build depend.
    José Manuel Santamaría Lema 2014-06-03 Remove duplicate changelog entry.

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-06-02 18:49:27 +0000
3+++ debian/changelog 2014-06-03 20:29:47 +0000
4@@ -5,7 +5,10 @@
5
6 [ Scarlett Clark ]
7 * Bump depends versions
8- * Bump depends versions
9+
10+ [ José Manuel Santamaría Lema ]
11+ * Add kf5-kio-dev build depend.
12+ * Update symbols file.
13
14 -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 02 Jun 2014 13:33:09 +0100
15
16
17=== modified file 'debian/control'
18--- debian/control 2014-06-02 18:49:27 +0000
19+++ debian/control 2014-06-03 20:29:47 +0000
20@@ -7,6 +7,7 @@
21 debhelper (>= 9.0.0),
22 extra-cmake-modules (>= 0.0.14),
23 libboost-dev,
24+ kf5-kio-dev (>= 4.100.0),
25 libkf5config-dev (>= 4.100.0),
26 libkf5coreaddons-dev (>= 4.100.0),
27 libkf5dbusaddons-dev (>= 4.100.0),
28
29=== modified file 'debian/libkf5activities5.symbols'
30--- debian/libkf5activities5.symbols 2014-03-31 17:14:18 +0000
31+++ debian/libkf5activities5.symbols 2014-06-03 20:29:47 +0000
32@@ -1,4 +1,4 @@
33-# SymbolsHelper-Confirmed: 4.98.0 amd64
34+# SymbolsHelper-Confirmed: 4.100.0 amd64
35 libKF5Activities.so.5 libkf5activities5 #MINVER#
36 _ZN11KActivities10Controller11addActivityERK7QString@Base 4.96.0
37 _ZN11KActivities10Controller11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.96.0
38@@ -44,10 +44,7 @@
39 _ZN11KActivities4Info11nameChangedERK7QString@Base 4.96.0
40 _ZN11KActivities4Info11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.96.0
41 _ZN11KActivities4Info11qt_metacastEPKc@Base 4.96.0
42- _ZN11KActivities4Info12linkResourceERK7QString@Base 4.96.0
43 _ZN11KActivities4Info12stateChangedENS0_5StateE@Base 4.96.0
44- _ZN11KActivities4Info14unlinkResourceERK7QString@Base 4.96.0
45- _ZN11KActivities4Info16isResourceLinkedERK7QString@Base 4.96.0
46 _ZN11KActivities4Info16staticMetaObjectE@Base 4.96.0
47 _ZN11KActivities4Info5addedEv@Base 4.96.0
48 _ZN11KActivities4Info7removedEv@Base 4.96.0

Subscribers

People subscribed via source and target branches