Merge lp:~jpakkane/thumbnailer/install-fix into lp:thumbnailer

[Jussi Pakkanen]

Fix install directory of vs-thumb.

Fix install directory of vs-thumb. Apparmor changes have already been done elsewhere so this should just work.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-saucy-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-saucy-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-saucy-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-saucy-i386-ci/12

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/thumbnailer-ci/12/rebuild

review: Approve (continuous-integration)

[Jamie Strandboge (jdstrand)]

ACK, vs-thumb on amd64 is now installed to:
/usr/lib/x86_64-linux-gnu/thumbnailer/vs-thumb

which matches the apparmor rule:
/usr/lib/@{multiarch}/thumbnailer/vs-thumb ixr,

and is policy compliant.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-02 09:43:16 +0000
+++ CMakeLists.txt	2013-10-09 14:38:25 +0000
@@ -17,7 +17,7 @@
 
 include(GNUInstallDirs)
 set(LIBDIR ${CMAKE_INSTALL_LIBDIR})
-set(SHARE_PRIV_DIR share/thumbnailer)
+set(SHARE_PRIV_DIR ${CMAKE_INSTALL_LIBDIR}/thumbnailer)
 set(SHARE_PRIV_ABS ${CMAKE_INSTALL_PREFIX}/${SHARE_PRIV_DIR})
 
 include(FindPkgConfig)

=== modified file 'debian/libthumbnailer0.install'
--- debian/libthumbnailer0.install	2013-10-02 13:39:45 +0000
+++ debian/libthumbnailer0.install	2013-10-09 14:38:25 +0000
@@ -1,2 +1,2 @@
 usr/lib/*/libthumb*.so.*
-usr/share/thumbnailer/vs-thumb
+usr/lib/*/thumbnailer/vs-thumb