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

[Jose Manuel Santamaria Lema]

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

[Scarlett Gately Moore (scarlettmoore)]

review: Approve

[lp:~panfaust/kubuntu-packaging-next/knewstuff-work]

20. By Scarlett Gately Moore on 2014-06-03

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.

=== 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 @@
 
   [ Scarlett Clark ]
   * Bump depends versions
-  * Bump depends versions
+
+  [ José Manuel Santamaría Lema ]
+  * Update symbols file.
+  * Fix control file, re-adding the -dev package.
+  * Install the *.pri file in the -dev package.
 
  -- Jonathan Riddell <[e-mail]>  Mon, 02 Jun 2014 13:42:03 +0100
 

=== 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 @@
 Standards-Version: 3.9.5
 Homepage: https://projects.kde.org/projects/frameworks/knewstuff
 
-Package: libkf5newstuff5
+Package: libkf5newstuff-dev
 Section: libdevel
 Architecture: any
 Depends: libkf5-kio-dev,
          libkf5archive-dev,
-         libkf5xmlgui-dev
- libkf5attica-dev,
+         libkf5attica-dev,
+         libkf5newstuff5 (= ${binary:Version}),
+         libkf5xmlgui-dev,
          qtbase5-dev,
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
+Description: development files for knewstuff
+ Framework for downloading and sharing additional
+ application data.
+ .
+ Contains development files for knewstuff.
+
+Package: libkf5newstuff5
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Support for downloading application assets from the network.
  Framework for downloading and sharing additional
  application data.

=== 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 @@
 usr/include/KF5/
 usr/lib/*/cmake/KF5NewStuff/
 usr/lib/*/libKF5NewStuff.so
+usr/lib/*/qt5/mkspecs/modules/*

=== 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 @@
-# SymbolsHelper-Confirmed: 4.95.0 amd64
+# SymbolsHelper-Confirmed: 4.100.0 amd64
 libKF5NewStuff.so.5 libkf5newstuff5 #MINVER#
  _ZN4KNS312UploadDialog10setVersionERK7QString@Base 4.95.0
  _ZN4KNS312UploadDialog11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.95.0
@@ -126,6 +126,7 @@
  _ZN4KNS36ButtonD0Ev@Base 4.95.0
  _ZN4KNS36ButtonD1Ev@Base 4.95.0
  _ZN4KNS36ButtonD2Ev@Base 4.95.0
+ (optional=templinst)_ZNK12KConfigGroup9readEntryIbEET_PKcRKS1_@Base 4.100.0
  _ZNK4KNS312UploadDialog10metaObjectEv@Base 4.95.0
  _ZNK4KNS312UploadDialog7Private19_supportedMimeTypesEv@Base 4.95.0
  _ZNK4KNS314DownloadDialog10metaObjectEv@Base 4.95.0