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

[Paweł Stołowski]

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.

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.

[PS Jenkins bot (ps-jenkins)]

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)

[Alejandro J. Cura (alecu)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== 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 @@
   ${APPS_INI_TARGET}.in
 )
 
+# upstart job for default departments db
+set(DEPARTMENTS_UPSTART_JOB click-scope-departments-db.conf)
+configure_file(${DEPARTMENTS_UPSTART_JOB}.in ${DEPARTMENTS_UPSTART_JOB} @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEPARTMENTS_UPSTART_JOB} DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
+
 add_custom_target(${STORE_INI_TARGET} ALL
   COMMENT "Merging translations into ${STORE_INI_TARGET}"
   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 @@
 )
 
 install(
+  FILES departments.db
+  DESTINATION "${APPS_DATA_DIR}"
+)
+
+install(
   FILES "${CMAKE_CURRENT_BINARY_DIR}/${STORE_INI_TARGET}"
   DESTINATION "${STORE_LIB_DIR}"
 )

=== 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 @@
+description "Default Click Departments Database"
+author "Pawel Stolowski <[e-mail]>"
+
+start on starting unity8
+
+script
+    DB_FILE=@APPS_DATA_DIR@/departments.db
+    [ -f $HOME/.cache/click-departments.db ] || cp $DB_FILE $HOME/.cache/click-departments.db
+end script

=== added file 'data/departments.db'
Binary 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 @@
          ubuntu-app-launch-tools,
          ubuntu-download-manager,
          ubuntu-sdk-libs,
-         sqlite3 (>= 3.8.5),
+         libsqlite3-0 (>= 3.8.5),
+         unity-scope-click-departmentsdb (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: unity (<< 7.0),
@@ -41,6 +42,30 @@
  .
  This package provides the click scope.
 
+Package: unity-scope-click-init-departments
+Architecture: armhf i386 amd64
+Depends: libsqlite3-0 (>= 3.8.5),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Breaks: unity (<< 7.0),
+Description: Click Scope Utility for Initialization of Departments
+ The click scope init-departments initializes or updates the internal database
+ of departments for installed applications. This tool is for click scope developers
+ and for customizations of ubuntu-touch image. It's not meant to be used by end users.
+ .
+ This package provides the helper init-departments tool.
+
+Package: unity-scope-click-departmentsdb
+Architecture: all
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Breaks: unity (<< 7.0),
+Description: Click Scope Departments Database
+ The click scope departments database provide the initial departments data for
+ preinstalled (default) applications.
+ .
+ This package provides departments database for preinstalled applications.
+
 Package: unity-scope-click-autopilot
 Architecture: all
 Depends: libautopilot-qt (>= 1.4),

=== 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 @@
+usr/share/unity/scopes/clickapps/departments.db
+usr/share/upstart/sessions/*.conf

=== 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 @@
+usr/sbin/init-departments

=== 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 @@
 usr/lib/*/unity-scopes/*
 usr/lib/unity-scope-click/*
-usr/share/unity/scopes/*
+usr/share/unity/scopes/clickstore/*
+usr/share/unity/scopes/clickapps/*jpg
+usr/share/unity/scopes/clickapps/*svg
 usr/share/glib-2.0/schemas/*
 usr/share/locale/*/LC_MESSAGES/unity-scope-click.mo

=== 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 @@
 target_link_libraries(${INITDEPTS}
         ${SCOPE_LIB_NAME}
     )
+
+install(TARGETS ${INITDEPTS} DESTINATION sbin)