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

[Jose Manuel Santamaria Lema]

1st change - Adjust the install files to install *.pri in multiarch localtions, without this the package would fail to build agains the latest cmake-extra-modules because of this change:
http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/extra-cmake-modules/revision/17
If this change is ok I will make more merge requests like this for the rest of affected packages.

2nd change - Add libfam optional build dependency, see the output of cmake:
- without libfam: https://launchpadlibrarian.net/174689027/buildlog_ubuntu-trusty-amd64.kcoreaddons_4.99.0-0ubuntu1~ubuntu14.04~ppa2_UPLOADING.txt.gz
- with libfam: https://launchpadlibrarian.net/176435306/buildlog_ubuntu-trusty-amd64.kcoreaddons_4.99.0-0ubuntu1~santa2_UPLOADING.txt.gz

[Dmitry Shachnev (mitya57)]

Why did you override dh_auto_test? Please document that in changelog or revert.

[Jonathan Riddell (jr)]

merged the .install change, that'll need done throughout
we don't use libfam deliberately, it's not in main and Linux has built in ways to notify which are used.
uncommented debian/rules change dropped
thanks!

review: Approve

[Jose Manuel Santamaria Lema (panfaust)]

The override_dh_auto_test change was included accidentally, I need more practice with bzr ;). I did it in my local because sometimes the test fail in a very unreproducible way, but I won't try to fix that unless I know exactly what's wrong, so thank you for discarding that unintentional change.

[Dmitry Shachnev (mitya57)]

Tip: instead of modifying debian/rules, you can build with DEB_BUILD_OPTIONS=nocheck.

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-05 14:40:26 +0000
+++ debian/changelog	2014-05-29 00:06:31 +0000
@@ -1,7 +1,12 @@
 kcoreaddons (4.99.0-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Jonathan Riddell ]
   * New upstream beta release
 
+  [ José Manuel Santamaría Lema ]
+  * Install *.pri files in arch dependent path.
+  * Add libfam-dev to build depends.
+
  -- Jonathan Riddell <[e-mail]>  Mon, 05 May 2014 15:39:43 +0100
 
 kcoreaddons (4.98.0-0ubuntu1) trusty; urgency=medium

=== modified file 'debian/control'
--- debian/control	2014-05-21 15:57:46 +0000
+++ debian/control	2014-05-29 00:06:31 +0000
@@ -5,6 +5,7 @@
 Build-Depends: cmake,
                debhelper (>= 8.0.0),
                extra-cmake-modules (>= 0.0.13),
+               libfam-dev,
                pkg-kde-tools,
                qt5-default,
                qtbase5-dev,

=== modified file 'debian/libkf5coreaddons-dev.install'
--- debian/libkf5coreaddons-dev.install	2014-05-21 15:27:18 +0000
+++ debian/libkf5coreaddons-dev.install	2014-05-29 00:06:31 +0000
@@ -2,4 +2,4 @@
 usr/lib/*/cmake/*
 usr/lib/*/libKF5CoreAddons.so
 usr/share/mime/packages/kde5.xml
-usr/share/qt5/mkspecs/modules/qt_KCoreAddons.pri
+usr/lib/*/qt5/mkspecs/modules/*

=== modified file 'debian/rules'
--- debian/rules	2014-03-03 14:34:08 +0000
+++ debian/rules	2014-05-29 00:06:31 +0000
@@ -4,3 +4,6 @@
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=libkf5coreaddons5-dbg
+
+override_dh_auto_test:
+