unity-scope-click

Merge lp:~stolowski/unity-scope-click/provide-default-db into lp:unity-scope-click/devel

  1. provide-default-db
  2. Merge into devel
Proposed by Paweł Stołowski
Status: Merged
Approved by: Alejandro J. Cura
Approved revision: 348
Merged at revision: 342
Proposed branch: lp:~stolowski/unity-scope-click/provide-default-db
Merge into: lp:unity-scope-click/devel
Prerequisite: lp:~stolowski/unity-scope-click/populate-departments-db
Diff against target: 124 lines (+53/-2)
7 files modified
data/CMakeLists.txt (+10/-0)
data/click-scope-departments-db.conf.in (+9/-0)
debian/control (+26/-1)
debian/unity-scope-click-departmentsdb.install (+2/-0)
debian/unity-scope-click-init-departments.install (+1/-0)
debian/unity-scope-click.install (+3/-1)
tools/init-departments/CMakeLists.txt (+2/-0)
To merge this branch: bzr merge lp:~stolowski/unity-scope-click/provide-default-db
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alejandro J. Cura (community) Approve
Review via email: mp+226849@code.launchpad.net

Commit message

Provide default departments db and an upstart job that copies it to user's home directory (unless it's there already). Added new deb packages.

Description of the change

Provide default departments db and an upstart job that copies it to user's home directory (unless it's there already). Added new deb packages.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:347
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~stolowski/unity-scope-click/provide-default-db/+merge/226849/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/198/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/172
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/172

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/198/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Looks good.

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~stolowski/unity-scope-click/provide-default-db/+merge/226849/+edit-commit-message

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

PASSED: Continuous integration, rev:348
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/214/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/188
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/188/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/188

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/214/rebuild

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-autolanding/90/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-autolanding/75
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-autolanding/75/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-autolanding/75

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt 2014-07-04 13:10:05 +0000
+++ data/CMakeLists.txt 2014-07-17 11:23:47 +0000
@@ -14,6 +14,11 @@
14 ${APPS_INI_TARGET}.in14 ${APPS_INI_TARGET}.in
15)15)
1616
17# upstart job for default departments db
18set(DEPARTMENTS_UPSTART_JOB click-scope-departments-db.conf)
19configure_file(${DEPARTMENTS_UPSTART_JOB}.in ${DEPARTMENTS_UPSTART_JOB} @ONLY)
20install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEPARTMENTS_UPSTART_JOB} DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
21
17add_custom_target(${STORE_INI_TARGET} ALL22add_custom_target(${STORE_INI_TARGET} ALL
18 COMMENT "Merging translations into ${STORE_INI_TARGET}"23 COMMENT "Merging translations into ${STORE_INI_TARGET}"
19 COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${STORE_INI_TARGET}.in ${STORE_INI_TARGET} >/dev/null24 COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${STORE_INI_TARGET}.in ${STORE_INI_TARGET} >/dev/null
@@ -35,6 +40,11 @@
35)40)
3641
37install(42install(
43 FILES departments.db
44 DESTINATION "${APPS_DATA_DIR}"
45)
46
47install(
38 FILES "${CMAKE_CURRENT_BINARY_DIR}/${STORE_INI_TARGET}"48 FILES "${CMAKE_CURRENT_BINARY_DIR}/${STORE_INI_TARGET}"
39 DESTINATION "${STORE_LIB_DIR}"49 DESTINATION "${STORE_LIB_DIR}"
40)50)
4151
=== added file 'data/click-scope-departments-db.conf.in'
--- data/click-scope-departments-db.conf.in 1970-01-01 00:00:00 +0000
+++ data/click-scope-departments-db.conf.in 2014-07-17 11:23:47 +0000
@@ -0,0 +1,9 @@
1description "Default Click Departments Database"
2author "Pawel Stolowski <pawel.stolowski@canonical.com>"
3
4start on starting unity8
5
6script
7 DB_FILE=@APPS_DATA_DIR@/departments.db
8 [ -f $HOME/.cache/click-departments.db ] || cp $DB_FILE $HOME/.cache/click-departments.db
9end script
010
=== added file 'data/departments.db'
1Binary files data/departments.db 1970-01-01 00:00:00 +0000 and data/departments.db 2014-07-17 11:23:47 +0000 differ11Binary files data/departments.db 1970-01-01 00:00:00 +0000 and data/departments.db 2014-07-17 11:23:47 +0000 differ
=== modified file 'debian/control'
--- debian/control 2014-07-11 21:56:59 +0000
+++ debian/control 2014-07-17 11:23:47 +0000
@@ -30,7 +30,8 @@
30 ubuntu-app-launch-tools,30 ubuntu-app-launch-tools,
31 ubuntu-download-manager,31 ubuntu-download-manager,
32 ubuntu-sdk-libs,32 ubuntu-sdk-libs,
33 sqlite3 (>= 3.8.5),33 libsqlite3-0 (>= 3.8.5),
34 unity-scope-click-departmentsdb (= ${binary:Version}),
34 ${misc:Depends},35 ${misc:Depends},
35 ${shlibs:Depends},36 ${shlibs:Depends},
36Breaks: unity (<< 7.0),37Breaks: unity (<< 7.0),
@@ -41,6 +42,30 @@
41 .42 .
42 This package provides the click scope.43 This package provides the click scope.
4344
45Package: unity-scope-click-init-departments
46Architecture: armhf i386 amd64
47Depends: libsqlite3-0 (>= 3.8.5),
48 ${misc:Depends},
49 ${shlibs:Depends},
50Breaks: unity (<< 7.0),
51Description: Click Scope Utility for Initialization of Departments
52 The click scope init-departments initializes or updates the internal database
53 of departments for installed applications. This tool is for click scope developers
54 and for customizations of ubuntu-touch image. It's not meant to be used by end users.
55 .
56 This package provides the helper init-departments tool.
57
58Package: unity-scope-click-departmentsdb
59Architecture: all
60Depends: ${misc:Depends},
61 ${shlibs:Depends},
62Breaks: unity (<< 7.0),
63Description: Click Scope Departments Database
64 The click scope departments database provide the initial departments data for
65 preinstalled (default) applications.
66 .
67 This package provides departments database for preinstalled applications.
68
44Package: unity-scope-click-autopilot69Package: unity-scope-click-autopilot
45Architecture: all70Architecture: all
46Depends: libautopilot-qt (>= 1.4),71Depends: libautopilot-qt (>= 1.4),
4772
=== added file 'debian/unity-scope-click-departmentsdb.install'
--- debian/unity-scope-click-departmentsdb.install 1970-01-01 00:00:00 +0000
+++ debian/unity-scope-click-departmentsdb.install 2014-07-17 11:23:47 +0000
@@ -0,0 +1,2 @@
1usr/share/unity/scopes/clickapps/departments.db
2usr/share/upstart/sessions/*.conf
03
=== added file 'debian/unity-scope-click-init-departments.install'
--- debian/unity-scope-click-init-departments.install 1970-01-01 00:00:00 +0000
+++ debian/unity-scope-click-init-departments.install 2014-07-17 11:23:47 +0000
@@ -0,0 +1,1 @@
1usr/sbin/init-departments
02
=== modified file 'debian/unity-scope-click.install'
--- debian/unity-scope-click.install 2014-07-07 10:32:36 +0000
+++ debian/unity-scope-click.install 2014-07-17 11:23:47 +0000
@@ -1,5 +1,7 @@
1usr/lib/*/unity-scopes/*1usr/lib/*/unity-scopes/*
2usr/lib/unity-scope-click/*2usr/lib/unity-scope-click/*
3usr/share/unity/scopes/*3usr/share/unity/scopes/clickstore/*
4usr/share/unity/scopes/clickapps/*jpg
5usr/share/unity/scopes/clickapps/*svg
4usr/share/glib-2.0/schemas/*6usr/share/glib-2.0/schemas/*
5usr/share/locale/*/LC_MESSAGES/unity-scope-click.mo7usr/share/locale/*/LC_MESSAGES/unity-scope-click.mo
68
=== modified file 'tools/init-departments/CMakeLists.txt'
--- tools/init-departments/CMakeLists.txt 2014-07-08 13:23:12 +0000
+++ tools/init-departments/CMakeLists.txt 2014-07-17 11:23:47 +0000
@@ -17,3 +17,5 @@
17target_link_libraries(${INITDEPTS}17target_link_libraries(${INITDEPTS}
18 ${SCOPE_LIB_NAME}18 ${SCOPE_LIB_NAME}
19 )19 )
20
21install(TARGETS ${INITDEPTS} DESTINATION sbin)

Subscribers

People subscribed via source and target branches

to all changes: