Merge lp:~stolowski/unity-scopes-api/pkg-version-into-varlib into lp:unity-scopes-api

Proposed by Paweł Stołowski
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 357
Merged at revision: 354
Proposed branch: lp:~stolowski/unity-scopes-api/pkg-version-into-varlib
Merge into: lp:unity-scopes-api
Diff against target: 32 lines (+5/-1)
3 files modified
data/CMakeLists.txt (+3/-0)
debian/libunity-scopes.install.in (+1/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~stolowski/unity-scopes-api/pkg-version-into-varlib
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marcus Tomlinson (community) Approve
Review via email: mp+272401@code.launchpad.net

Commit message

Store scopes package version in /var/lib/.../version file for fast retrieval from the shell plugin.

Description of the change

Store scopes package version in /var/lib/.../version file for fast retrieval from the shell plugin.

To post a comment you must log in.
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Nice. +1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2015-08-24 23:23:21 +0000
3+++ data/CMakeLists.txt 2015-10-02 09:47:15 +0000
4@@ -25,3 +25,6 @@
5 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${UNITY_SCOPES_LIB})
6 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${UNITY_SCOPES_LIB}
7 DESTINATION ${CMAKE_INSTALL_LIBDIR})
8+
9+add_custom_target(pkgversion ALL COMMAND dpkg-parsechangelog -l${CMAKE_SOURCE_DIR}/debian/changelog --show-field version > ${CMAKE_CURRENT_BINARY_DIR}/version)
10+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/lib/libunity-scopes)
11
12=== modified file 'debian/libunity-scopes.install.in'
13--- debian/libunity-scopes.install.in 2015-08-18 05:48:54 +0000
14+++ debian/libunity-scopes.install.in 2015-10-02 09:47:15 +0000
15@@ -1,3 +1,4 @@
16+var/lib/libunity-scopes/version
17 usr/lib/*/libunity-scopes.so.*
18 usr/lib/*/unity-scopes
19 usr/lib/*/unity-scopes/scoperegistry
20
21=== modified file 'debian/rules'
22--- debian/rules 2015-09-03 04:38:53 +0000
23+++ debian/rules 2015-10-02 09:47:15 +0000
24@@ -12,7 +12,7 @@
25 dh $@ --parallel --fail-missing --with click
26
27 override_dh_auto_configure:
28- dh_auto_configure -- -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
29+ dh_auto_configure -- -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) -DCMAKE_INSTALL_LOCALSTATEDIR=/var
30
31 # Tests are not written to be run in parallel.
32 override_dh_auto_test:

Subscribers

People subscribed via source and target branches

to all changes: