Merge lp:~ballogy/dee-qt/install-pkgconfig-file into lp:dee-qt/0.2

[Balló György]

Currently, pkgconfig file is not installed by make. This change fix this problem, similar to bamf-qt and gconf-qt:
http://bazaar.launchpad.net/~unity-2d-team/bamf-qt/trunk/view/head:/CMakeLists.txt#L126
http://bazaar.launchpad.net/~unity-2d-team/gconf-qt/trunk/view/head:/CMakeLists.txt#L95

[Olivier Tilloy (osomon)]

This looks good, thanks György. One remark, and one tiny thing to fix before we can merge it:

 - The comment is useless: if the destination target is a relative path (which it is), it will be installed relative to ${CMAKE_INSTALL_PREFIX}. Please remove it.

 - The file debian/libqtdee-dev.install needs to be updated. The change would be something like:

    -libqtdee.pc usr/lib/pkgconfig/
    +usr/lib/pkgconfig/libqtdee.pc

review: Needs Fixing

[Balló György (ballogy)]

Now I fixed these things.

[Olivier Tilloy (osomon)]

Looks good to go now!

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-dee-qt/4/console reported an error when processing this lp:~ballogy/dee-qt/install-pkgconfig-file branch.
Not merging it.

[Balló György (ballogy)]

It seems to me that the error was unrelated to this change. Please approve it again.

[Olivier Tilloy (osomon)]

Indeed it's unrelated to your change, the build failure is in the trunk itself, at least on Ubuntu Oneiric: the build dependency on libdee-dev was bumped to >= 1.0.0 at revision 57, whereas the version in oneiric is 0.5.22-0ubuntu1.

This doesn't look right, I'll contact the author of this revision to ask for more information. I'll leave the status of the merge request to 'Needs Review' for now, as re-accepting it would only trigger the same error again. Sorry about that, I hope we can sort it out quickly, and thanks for your patience!

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-11-23 10:00:21 +0000
+++ CMakeLists.txt	2012-01-05 20:32:23 +0000
@@ -94,6 +94,10 @@
     DESTINATION ${INCLUDE_INSTALL_DIR}
     )
 
+install(FILES libqtdee.pc
+    DESTINATION lib/pkgconfig
+    )
+
 ## QtDeeQml
 install(TARGETS QtDeeQml
     LIBRARY DESTINATION ${IMPORT_INSTALL_DIR}

=== modified file 'debian/libqtdee-dev.install'
--- debian/libqtdee-dev.install	2011-01-11 17:56:52 +0000
+++ debian/libqtdee-dev.install	2012-01-05 20:32:23 +0000
@@ -1,3 +1,3 @@
 usr/lib/libQtDee.so
 usr/include/QtDee/*.h
-libqtdee.pc usr/lib/pkgconfig/
+usr/lib/pkgconfig/libqtdee.pc