Libertine Scope

Merge lp:~townsend/libertine-scope/fix-package-name into lp:libertine-scope

  1. fix-package-name
  2. Merge into devel
Proposed by Christopher Townsend
Status: Merged
Approved by: Larry Price
Approved revision: 56
Merged at revision: 56
Proposed branch: lp:~townsend/libertine-scope/fix-package-name
Merge into: lp:libertine-scope
Diff against target: 34 lines (+4/-3)
2 files modified
CMakeLists.txt (+2/-1)
scope/apps/CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~townsend/libertine-scope/fix-package-name
Reviewer Review Type Date Requested Status
Larry Price Approve
Libertine CI Bot continuous-integration Approve
Review via email: mp+300774@code.launchpad.net

Commit message

Set a new FULLY_QUALIFIED_NAME variable for places that need it and revert PACKAGE_NAME back to what it was.

To post a comment you must log in.
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:56
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/51/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/196
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/156
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/156
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/156
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/156
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/156
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/156
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/152/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/199
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/184
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/184
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/184
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/177
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/177/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/177
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/177/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/177
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/177/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/177
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/177/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/177
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/177/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/177
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/177/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/51/rebuild

review: Approve (continuous-integration)
Revision history for this message
Larry Price (larryprice) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-07-21 14:05:20 +0000
3+++ CMakeLists.txt 2016-07-21 14:15:27 +0000
4@@ -36,7 +36,8 @@
5 set(APPS_DATA_DIR ${CMAKE_INSTALL_FULL_DATADIR}/unity/scopes/libertine-scope/)
6 set(SCOPE_NAME "libertine-scope")
7 set(SCOPE_DISPLAY_NAME "Desktop Apps")
8-set(PACKAGE_NAME "libertine-scope.ubuntu_${SCOPE_NAME}")
9+set(PACKAGE_NAME "libertine-scope.ubuntu")
10+set(FULLY_QUALIFIED_NAME "${PACKAGE_NAME}_${SCOPE_NAME}")
11 option(CLICK_MODE "Installs to a contained location" off)
12
13 add_definitions(-DSCOPE_NAME="${SCOPE_NAME}")
14
15=== modified file 'scope/apps/CMakeLists.txt'
16--- scope/apps/CMakeLists.txt 2016-07-12 19:33:08 +0000
17+++ scope/apps/CMakeLists.txt 2016-07-21 14:15:27 +0000
18@@ -30,14 +30,14 @@
19
20 set_target_properties(apps
21 PROPERTIES
22- OUTPUT_NAME ${PACKAGE_NAME}
23+ OUTPUT_NAME ${FULLY_QUALIFIED_NAME}
24 )
25
26 install(TARGETS apps
27 LIBRARY DESTINATION "${APPS_LIB_DIR}"
28 )
29
30-set(APPS_INI_TARGET ${PACKAGE_NAME}.ini)
31+set(APPS_INI_TARGET ${FULLY_QUALIFIED_NAME}.ini)
32 configure_file(
33 ${APPS_INI_TARGET}.in.in
34 ${APPS_INI_TARGET}.in

Subscribers

People subscribed via source and target branches