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

Proposed by Jose Manuel Santamaria Lema
Status: Merged
Merged at revision: 20
Proposed branch: lp:~panfaust/kubuntu-packaging-next/knewstuff-work
Merge into: lp:~kubuntu-packagers/kubuntu-packaging-next/knewstuff
Diff against target: 79 lines (+23/-7)
4 files modified
debian/changelog (+5/-1)
debian/control (+15/-5)
debian/libkf5newstuff-dev.install (+1/-0)
debian/libkf5newstuff5.symbols (+2/-1)
To merge this branch: bzr merge lp:~panfaust/kubuntu-packaging-next/knewstuff-work
Reviewer Review Type Date Requested Status
Scarlett Gately Moore Approve
Review via email: mp+221959@code.launchpad.net

Description of the change

* Install the *.pri file in the -dev package.
* Fix control file, re-adding the -dev package.
* Update symbols file.
* Remove duplicate changelog entry.

To post a comment you must log in.
Revision history for this message
Scarlett Gately Moore (scarlettmoore) :
review: Approve
20. By Scarlett Gately Moore

Merge:
[ José Manuel Santamaría Lema ]
* Update symbols file.
* Fix control file, re-adding the -dev package.
* Install the *.pri file in the -dev package.

modified:
  debian/changelog
  debian/control
  debian/libkf5newstuff-dev.install
  debian/libkf5newstuff5.symbols
pending merges:
  José Manuel Santamaría Lema 2014-06-03 Install the *.pri file in the -dev package.
    José Manuel Santamaría Lema 2014-06-03 Fix control file, re-adding the -dev package.
    José Manuel Santamaría Lema 2014-06-03 Update symbols file.
    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
=== modified file 'debian/changelog'
--- debian/changelog 2014-06-02 18:53:28 +0000
+++ debian/changelog 2014-06-03 21:12:51 +0000
@@ -5,7 +5,11 @@
55
6 [ Scarlett Clark ]6 [ Scarlett Clark ]
7 * Bump depends versions7 * Bump depends versions
8 * Bump depends versions8
9 [ José Manuel Santamaría Lema ]
10 * Update symbols file.
11 * Fix control file, re-adding the -dev package.
12 * Install the *.pri file in the -dev package.
913
10 -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 02 Jun 2014 13:42:03 +010014 -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 02 Jun 2014 13:42:03 +0100
1115
1216
=== modified file 'debian/control'
--- debian/control 2014-06-02 18:53:28 +0000
+++ debian/control 2014-06-03 21:12:51 +0000
@@ -36,16 +36,26 @@
36Standards-Version: 3.9.536Standards-Version: 3.9.5
37Homepage: https://projects.kde.org/projects/frameworks/knewstuff37Homepage: https://projects.kde.org/projects/frameworks/knewstuff
3838
39Package: libkf5newstuff539Package: libkf5newstuff-dev
40Section: libdevel40Section: libdevel
41Architecture: any41Architecture: any
42Depends: libkf5-kio-dev,42Depends: libkf5-kio-dev,
43 libkf5archive-dev,43 libkf5archive-dev,
44 libkf5xmlgui-dev44 libkf5attica-dev,
45 libkf5attica-dev,45 libkf5newstuff5 (= ${binary:Version}),
46 libkf5xmlgui-dev,
46 qtbase5-dev,47 qtbase5-dev,
47 ${misc:Depends},48 ${misc:Depends}
48 ${shlibs:Depends}49Description: development files for knewstuff
50 Framework for downloading and sharing additional
51 application data.
52 .
53 Contains development files for knewstuff.
54
55Package: libkf5newstuff5
56Section: libdevel
57Architecture: any
58Depends: ${misc:Depends}, ${shlibs:Depends}
49Description: Support for downloading application assets from the network.59Description: Support for downloading application assets from the network.
50 Framework for downloading and sharing additional60 Framework for downloading and sharing additional
51 application data.61 application data.
5262
=== modified file 'debian/libkf5newstuff-dev.install'
--- debian/libkf5newstuff-dev.install 2014-05-21 15:28:23 +0000
+++ debian/libkf5newstuff-dev.install 2014-06-03 21:12:51 +0000
@@ -1,3 +1,4 @@
1usr/include/KF5/1usr/include/KF5/
2usr/lib/*/cmake/KF5NewStuff/2usr/lib/*/cmake/KF5NewStuff/
3usr/lib/*/libKF5NewStuff.so3usr/lib/*/libKF5NewStuff.so
4usr/lib/*/qt5/mkspecs/modules/*
45
=== modified file 'debian/libkf5newstuff5.symbols'
--- debian/libkf5newstuff5.symbols 2014-02-04 18:41:33 +0000
+++ debian/libkf5newstuff5.symbols 2014-06-03 21:12:51 +0000
@@ -1,4 +1,4 @@
1# SymbolsHelper-Confirmed: 4.95.0 amd641# SymbolsHelper-Confirmed: 4.100.0 amd64
2libKF5NewStuff.so.5 libkf5newstuff5 #MINVER#2libKF5NewStuff.so.5 libkf5newstuff5 #MINVER#
3 _ZN4KNS312UploadDialog10setVersionERK7QString@Base 4.95.03 _ZN4KNS312UploadDialog10setVersionERK7QString@Base 4.95.0
4 _ZN4KNS312UploadDialog11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.95.04 _ZN4KNS312UploadDialog11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.95.0
@@ -126,6 +126,7 @@
126 _ZN4KNS36ButtonD0Ev@Base 4.95.0126 _ZN4KNS36ButtonD0Ev@Base 4.95.0
127 _ZN4KNS36ButtonD1Ev@Base 4.95.0127 _ZN4KNS36ButtonD1Ev@Base 4.95.0
128 _ZN4KNS36ButtonD2Ev@Base 4.95.0128 _ZN4KNS36ButtonD2Ev@Base 4.95.0
129 (optional=templinst)_ZNK12KConfigGroup9readEntryIbEET_PKcRKS1_@Base 4.100.0
129 _ZNK4KNS312UploadDialog10metaObjectEv@Base 4.95.0130 _ZNK4KNS312UploadDialog10metaObjectEv@Base 4.95.0
130 _ZNK4KNS312UploadDialog7Private19_supportedMimeTypesEv@Base 4.95.0131 _ZNK4KNS312UploadDialog7Private19_supportedMimeTypesEv@Base 4.95.0
131 _ZNK4KNS314DownloadDialog10metaObjectEv@Base 4.95.0132 _ZNK4KNS314DownloadDialog10metaObjectEv@Base 4.95.0

Subscribers

People subscribed via source and target branches