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

[Jose Manuel Santamaria Lema]

* Install *.pri files in arch dependent path.
* Re-add -dev package and fix Multiarch fields after a faulty wrap-and-sort.

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-29 09:38:00 +0000
+++ debian/changelog	2014-06-01 23:18:06 +0000
@@ -1,3 +1,11 @@
+kjobwidgets (4.99.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Install *.pri files in arch dependent path.
+  * Re-add -dev package and fix Multiarch fields after a faulty wrap-
+    and-sort.
+
+ -- José Manuel Santamaría Lema <[e-mail]>  Sun, 01 Jun 2014 21:53:55 +0200
+
 kjobwidgets (4.99.0-0ubuntu1) trusty; urgency=medium
 
   [ Jonathan Riddell ]

=== modified file 'debian/control'
--- debian/control	2014-05-21 15:58:45 +0000
+++ debian/control	2014-06-01 23:18:06 +0000
@@ -17,10 +17,30 @@
 Standards-Version: 3.9.5
 Homepage: https://projects.kde.org/projects/frameworks/kjobwidgets
 
+Package: libkf5jobwidgets-dev
+Section: libdevel
+Architecture: any
+Depends: libkf5jobwidgets5 (= ${binary:Version}), ${misc:Depends}
+Description: Widgets for tracking KJob instances
+ Window class that associates this job with a window given by
+ window. This is used by KDialogJobUiDelegate as parent widget
+ for error messages, KWidgetJobTracker as parent widget for
+ progress dialogs, KIO::AbstractJobInteractionInterface as
+ parent widget for rename/skip dialogs and possibly more.
+ Overload that takes a QWindow.
+ .
+ Timestamp handling to update the last user action timestamp
+ to the given time. Returns the last user action timestamp.
+ .
+ Contains development files for kjobwidgets.
+
 Package: libkf5jobwidgets5
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libkf5jobwidgets5-data (= ${source:Version})
+Multi-Arch: same
+Depends: libkf5jobwidgets5-data (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Widgets for tracking KJob instances
  Window class that associates this job with a window given by
  window. This is used by KDialogJobUiDelegate as parent widget
@@ -31,12 +51,11 @@
  .
  Timestamp handling to update the last user action timestamp
  to the given time. Returns the last user action timestamp.
-Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 
 Package: libkf5jobwidgets5-data
 Architecture: all
-Multi-Arch: same
+Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Widgets for tracking KJob instances

=== modified file 'debian/libkf5jobwidgets-dev.install'
--- debian/libkf5jobwidgets-dev.install	2014-05-21 15:28:20 +0000
+++ debian/libkf5jobwidgets-dev.install	2014-06-01 23:18:06 +0000
@@ -5,4 +5,4 @@
 usr/share/dbus-1/interfaces/kf5_org.kde.JobView.xml
 usr/share/dbus-1/interfaces/kf5_org.kde.JobViewServer.xml
 usr/share/dbus-1/interfaces/kf5_org.kde.JobViewV2.xml
-usr/share/qt5/mkspecs/modules/qt_KJobWidgets.pri
+usr/lib/*/qt5/mkspecs/modules/*