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

[Jose Manuel Santamaria Lema]

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

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-02 12:43:12 +0000
+++ debian/changelog	2014-06-02 15:53:02 +0000
@@ -1,9 +1,19 @@
+<<<<<<< TREE
 kplotting (4.100.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream beta release
 
  -- Jonathan Riddell <[e-mail]>  Mon, 02 Jun 2014 13:43:11 +0100
 
+=======
+kplotting (4.99.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Re-add libkf5plotting-dev after faulty wrap-and-sort. 
+  * Install *.pri files in arch dependent path.
+
+ -- José Manuel Santamaría Lema <[e-mail]>  Mon, 02 Jun 2014 15:33:12 +0200
+
+>>>>>>> MERGE-SOURCE
 kplotting (4.99.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream beta release

=== modified file 'debian/control'
--- debian/control	2014-06-02 15:29:25 +0000
+++ debian/control	2014-06-02 15:53:02 +0000
@@ -12,6 +12,7 @@
 Standards-Version: 3.9.5
 Homepage: https://projects.kde.org/projects/frameworks/kplotting
 
+<<<<<<< TREE
 Package: libkf5plotting-dev
 Section: libdevel
 Architecture: any
@@ -25,6 +26,21 @@
  .
  Contains development files for kplotting.
  
+=======
+Package: libkf5plotting-dev
+Section: libdevel
+Architecture: any
+Depends: libkf5plotting5 (= ${binary:Version}), ${misc:Depends}
+Description: development files for kplotting
+ KPlotWidget is a QWidget-derived class that provides a virtual base class
+ for easy data-plotting. The idea behind KPlotWidget is that you only have
+ to specify information in "data units"; i.e., the natural units of the
+ data being plotted.  KPlotWidget automatically converts everything
+ to screen pixel units.
+ .
+ Contains development files for kplotting.
+
+>>>>>>> MERGE-SOURCE
 Package: libkf5plotting5
 Architecture: any
 Multi-Arch: same

=== modified file 'debian/libkf5plotting-dev.install'
--- debian/libkf5plotting-dev.install	2014-05-21 15:28:35 +0000
+++ debian/libkf5plotting-dev.install	2014-06-02 15:53:02 +0000
@@ -2,4 +2,4 @@
 usr/include/KF5/
 usr/lib/*/cmake/KF5Plotting/
 usr/lib/*/libKF5Plotting.so
-usr/share/qt5/mkspecs/modules/qt_KPlotting.pri
+usr/lib/*/qt5/mkspecs/modules/*