Merge lp:~pete-woods/mediascanner2/add-system-session-files into lp:mediascanner2

[Pete Woods]

Add SystemD session files

Add SystemD session files

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:341
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/16/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1702
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1709
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1484
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1484/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1484
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1484/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1484
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1484/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1484
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1484/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1484
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1484/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1484
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1484/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/16/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:342
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/19/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1737
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1744
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1519
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1519/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1519
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1519/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1519
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1519/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1519
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1519/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1519
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1519/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1519
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1519/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/19/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-03-02 10:40:56 +0000
+++ CMakeLists.txt	2017-03-02 10:40:56 +0000
@@ -69,6 +69,19 @@
   DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions
 )
 
+# Install SystemD user unit
+configure_file(mediascanner-2.0.service.in mediascanner-2.0.service)
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/mediascanner-2.0.service
+  DESTINATION lib/systemd/user
+)
+
+# Install upstart-systemd override
+install(
+  FILES mediascanner-2.0.override
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/systemd-session/upstart
+)
+
 enable_coverage_report(
   TARGETS
     mediascanner

=== modified file 'debian/mediascanner2.0.install'
--- debian/mediascanner2.0.install	2015-11-02 09:38:48 +0000
+++ debian/mediascanner2.0.install	2017-03-02 10:40:56 +0000
@@ -1,7 +1,8 @@
 usr/bin/mediascanner-service-2.0
 usr/lib/*/mediascanner-2.0/mediascanner-dbus-2.0
 usr/lib/*/mediascanner-2.0/mediascanner-extractor
+usr/lib/systemd
 usr/share/dbus-1/services/*
-usr/share/upstart/sessions/*
+usr/share/upstart
 debian/usr.bin.mediascanner-service-2.0 etc/apparmor.d
 debian/usr.lib.mediascanner-2.0.mediascanner-extractor etc/apparmor.d

=== added file 'mediascanner-2.0.override'
--- mediascanner-2.0.override	1970-01-01 00:00:00 +0000
+++ mediascanner-2.0.override	2017-03-02 10:40:56 +0000
@@ -0,0 +1,1 @@
+manual

=== added file 'mediascanner-2.0.service.in'
--- mediascanner-2.0.service.in	1970-01-01 00:00:00 +0000
+++ mediascanner-2.0.service.in	2017-03-02 10:40:56 +0000
@@ -0,0 +1,9 @@
+[Unit]
+Description=Media Scanner
+PartOf=graphical-session.target
+
+[Service]
+Type=dbus
+BusName=com.canonical.MediaScanner2.Daemon
+ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/mediascanner-service-2.0
+Restart=on-failure