Merge lp:~michihenning/unity-api/pkg-config into lp:unity-api

[Michi Henning]

Added missing architecture directory to pkg-config file.

Added missing architecture directory to pkg-config file.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/unity-api-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-raring-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-raring-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-raring-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-api-ci/38/rebuild

review: Approve (continuous-integration)

[Jussi Pakkanen (jpakkane)]

I'm not a packaging expert but the way Didrocks did this for libcolumbus was this:

In CMakeLists:

set(LIBDIR "lib" CACHE PATH "Destination install dir for the library")
set(libdir ${prefix}/${LIBDIR})

In foo.pc:

libdir=@libdir@
Libs: -L${libdir} -l@COL_LIB_BASENAME@

The idea being that by default it goes to lib but packagers can override it during configuration if they want to.

[Michi Henning (michihenning)]

Thanks for that, I'll try this!

[Jussi Pakkanen (jpakkane)]

The override in debian/rules is this:

override_dh_auto_configure:
        dh_auto_configure -- -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)

[lp:~michihenning/unity-api/pkg-config]

49. By Michi Henning on 2013-05-29

Updated the package config files as suggested by Jussi.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/unity-api-ci/40/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-raring-armhf-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-raring-i386-ci/40/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-api-ci/40/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michihenning/unity-api/pkg-config]

50. By Michi Henning on 2013-05-29

Jenkins got upset about the libunity-api0.install instructions. Hopefully, this will fix it.

[Didier Roche-Tolomelli (didrocks)]

This mostly looks good to me.

However, I have a test failing in my pbuilder:
17/20 Test #19: testTestUtil ..............................***Exception: Other 0.31 sec
Cannot mix incompatible Qt library (version 0x50001) with this library (version 0x50002)

18/20 Test #20: testNotifications .........................***Exception: Other 0.19 sec
Cannot mix incompatible Qt library (version 0x50001) with this library (version 0x50002)

Other than that, not sure where your commit 50 is coming from, but the .so file for me is:
debian/tmp/usr/lib/x86_64-linux-gnu/libunity-api.so.0, so the previous pattern looks fine to me (at least, it pass in my pbuilder ;)).

Just something that I didn't update on libcolumbus as well:
you need to add:
"Multi-Arch: same"
in debian/control, below Architecture on libunity-api0 and libunity-api-dev binary packages
and:
"Multi-Arch: foreign"
for the libunity-api-doc binary package

(more reference at http://wiki.debian.org/Multiarch/Implementation)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/unity-api-ci/41/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-raring-armhf-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-raring-i386-ci/41/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-api-ci/41/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Shouldn't you use ${LIBDIR} for the .pc installation path? And for the notifications .pc, too?

review: Needs Information

[lp:~michihenning/unity-api/pkg-config]

51. By Michi Henning on 2013-06-13

Added Multi-Arch to debian/rules as requested by didrocks.
Removed redundant libdir variable from CMakeLists.txt.
Adjusted libunity-api.pc.in to use LIBDIR.

52. By Michi Henning on 2013-06-13

Trying to get the install working with jenkins...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/unity-api-ci/69/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-armhf-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-i386-ci/27/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-api-ci/69/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/unity-api-ci/70/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-i386-ci/28

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-api-ci/70/rebuild

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

> Shouldn't you use ${LIBDIR} for the .pc installation path? And for the
> notifications .pc, too?

Fixed. Jenkins is happy with it too.

The notifications .pc didn't need changing because it only needs the include dir, and that was correct already.

[Michał Sawicz (saviq)]

Yeah, but

/include/unity/shell/notifications/CMakeLists.txt:21 installs directly into ${LIB_INSTALL_PREFIX}/pkgconfig - should be ${LIBDIR}/pkgconfig

review: Needs Fixing

[Michi Henning (michihenning)]

> Yeah, but
>
> /include/unity/shell/notifications/CMakeLists.txt:21 installs directly into
> ${LIB_INSTALL_PREFIX}/pkgconfig - should be ${LIBDIR}/pkgconfig

Ah, I missed that, thanks! Will fix.

[lp:~michihenning/unity-api/pkg-config]

53. By Michi Henning on 2013-06-14

Changed include/unity/shell/notifications/CMakeLists.txt to use ${LIBDIR} to install the .pc file in the correct location.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/unity-api-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-api-ci/72/rebuild

review: Approve (continuous-integration)

[Jussi Pakkanen (jpakkane)]

If this is fine by didrocks and saviq, it's fine by me.

review: Approve

[Michał Sawicz (saviq)]

Yup, looks fine for me.

review: Approve

[Michi Henning (michihenning)]

didrocks, can you please top-approve if you are cool with this now?

[Didier Roche-Tolomelli (didrocks)]

Built, check the content, and multiarched, perfect! Thanks Michi :)

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-12 21:32:35 +0000
+++ CMakeLists.txt	2013-06-14 00:32:27 +0000
@@ -126,6 +126,8 @@
 # Library install prefix
 set(LIB_INSTALL_PREFIX lib/${CMAKE_LIBRARY_ARCHITECTURE})
 
+set(LIBDIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_PREFIX} CACHE PATH "Destination install dir for the library")
+
 # Tests
 include(CTest)
 enable_testing()

=== modified file 'debian/control'
--- debian/control	2013-05-14 08:15:11 +0000
+++ debian/control	2013-06-14 00:32:27 +0000
@@ -24,6 +24,7 @@
 
 Package: libunity-api0
 Architecture: any
+Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
@@ -33,6 +34,7 @@
 Package: libunity-api-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          libboost1.49-dev (>= 1.49),
          libunity-api0 (= ${binary:Version}),
@@ -42,6 +44,7 @@
 Package: libunity-api-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Description: Documentation for Unity API
  Library to integrate with the Unity shell (documentation)

=== modified file 'debian/rules'
--- debian/rules	2013-05-13 12:22:20 +0000
+++ debian/rules	2013-06-14 00:32:27 +0000
@@ -10,3 +10,6 @@
 
 override_dh_install:
 	dh_install --fail-missing
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)

=== modified file 'include/unity/shell/notifications/CMakeLists.txt'
--- include/unity/shell/notifications/CMakeLists.txt	2013-05-13 16:11:09 +0000
+++ include/unity/shell/notifications/CMakeLists.txt	2013-06-14 00:32:27 +0000
@@ -18,5 +18,5 @@
 )
 
 install(FILES ${CMAKE_BINARY_DIR}/data/${PKGCONFIG_FILE}
-  DESTINATION ${LIB_INSTALL_PREFIX}/pkgconfig
+  DESTINATION ${LIBDIR}/pkgconfig
 )

=== modified file 'src/libunity-api.pc.in'
--- src/libunity-api.pc.in	2013-05-13 11:39:49 +0000
+++ src/libunity-api.pc.in	2013-06-14 00:32:27 +0000
@@ -16,8 +16,12 @@
 # Authored by: Michi Henning <[e-mail]>
 #
 
+prefix=@CMAKE_INSTALL_PREFIX@
+includedir=${prefix}/include
+libdir=@LIBDIR@
+
 Name: lib@UNITY_API_LIB@
 Description: Unity API library
 Version: @UNITY_API_MAJOR@.@UNITY_API_MINOR@
-Libs: -L@CMAKE_INSTALL_PREFIX@/lib -lunity-api
-Cflags: -I@CMAKE_INSTALL_PREFIX@/include
+Libs: -L${libdir} -l@UNITY_API_LIB@
+Cflags: -I${includedir}