Merge lp:~ted/indicator-session/upstart-job into lp:indicator-session/13.10

[Ted Gould]

Manage service lifecycle using Upstart

Upstart job for indicator-session

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:395
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/97/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/35/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-session-ci/97/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks for the work, some questions:

- why do we need/want to export G_MESSAGES_DEBUG from the job? Should that be the default in the source if that should be the default behaviour?

- do we win anything from the change today? (said differently: do we need this cycle? I'm for using upstart, but that indicator doesn't seem a candidate for much dynamic rules and we still have environment issues with upstart job atm)

- you restrict the session to Ubuntu, wasn't the indicator used by gnome-panel sessions as well?

review: Needs Information

[Ted Gould (ted)]

On Tue, 2013-08-27 at 18:29 +0000, Sebastien Bacher wrote:

> - why do we need/want to export G_MESSAGES_DEBUG from the job? Should
> that be the default in the source if that should be the default
> behaviour?

I figured this was a good way to start, as the change may break
things :-) I think that we should look at removing it as we start to
get more stable.

> - do we win anything from the change today? (said differently: do we
> need this cycle? I'm for using upstart, but that indicator doesn't
> seem a candidate for much dynamic rules and we still have environment
> issues with upstart job atm)

The biggest driver for the change today is from QA. They want to be
able to shutdown the individual services without having them restart so
that they can replace them with mocks.

> - you restrict the session to Ubuntu, wasn't the indicator used by
> gnome-panel sessions as well?

Uhm, that's interesting. I'm not sure what the mask should be there, !=
ubuntu-touch ?

[Sebastien Bacher (seb128)]

> I figured this was a good way to start, as the change may break things :-) I think that we should look at removing it as we start to get more stable.

you expect the upstart change to trigger code bugs? that's debugging mode and we don't want to have to patch all jobs at beta time ... having upstart exporting that variable for all jobs during unstable cycles seems like it would be a better way?

> The biggest driver for the change today is from QA. They want to be able to shutdown the individual services without having them restart so that they can replace them with mocks.

that's fair enough, still I would prefer if we could resolve the current env issues we have before adding extra jobs (we still have e.g indicator-session running gnome-control-center with the wrong XDG_CURRENT_DESKTOP sometimes, which leads to have unity controls not listed)

> Uhm, that's interesting. I'm not sure what the mask should be there, != ubuntu-touch ?

that's a good question, I'm not sure either what's the right set ... "!= ubuntu-touch" seems wrong though, afaik indicators are only used in Unity, gnome-panel, xfce (and maybe lxde), and I'm not sure if indicator-session is being using in xfce/lxde (they use e.g -sound I think). We should probably reach to flavor being doing those changes, as we might create issues for them otherwise

review: Needs Fixing

[Ted Gould (ted)]

On Tue, 2013-08-27 at 19:01 +0000, Sebastien Bacher wrote:

> > I figured this was a good way to start, as the change may break
> things :-) I think that we should look at removing it as we start to
> get more stable.
>
>
>
> you expect the upstart change to trigger code bugs? that's debugging
> mode and we don't want to have to patch all jobs at beta time ...
> having upstart exporting that variable for all jobs during unstable
> cycles seems like it would be a better way?

No, but I expect there were a lot of messages and bugs that we can debug
today that we couldn't before because all the log files were
intermingled and the messages and warnings got lost. I'm expecting
apport bugs to be much more useful and I'm trying to optimize that as we
start to fix and refine.

I'm not against making it a global setting. My only comment would be
there that probably most applications aren't looking at the logs, but we
would be for indicators. I have no problem generating them though. I
don't feel like that's a decision I can make, my field of influence is
the indicators :-)

> > The biggest driver for the change today is from QA. They want to be
> able to shutdown the individual services without having them restart
> so that they can replace them with mocks.
>
>
>
> that's fair enough, still I would prefer if we could resolve the
> current env issues we have before adding extra jobs (we still have e.g
> indicator-session running gnome-control-center with the wrong
> XDG_CURRENT_DESKTOP sometimes, which leads to have unity controls not
> listed)

We should fix those bugs, I agree. These branches have been around for
a while, and this change has been planned. It is later than I'd like,
but I'd rather get it done and move on.

> > Uhm, that's interesting. I'm not sure what the mask should be
> there, != ubuntu-touch ?
>
>
>
> that's a good question, I'm not sure either what's the right set ...
> "!= ubuntu-touch" seems wrong though, afaik indicators are only used
> in Unity, gnome-panel, xfce (and maybe lxde), and I'm not sure if
> indicator-session is being using in xfce/lxde (they use e.g -sound I
> think). We should probably reach to flavor being doing those changes,
> as we might create issues for them otherwise

So let's leave it is not filtering right now. The reality is that the
phone won't have indicator-session installed in most cases, and even if
it was, it would only take a bit of RAM not really hurt anything.

[lp:~ted/indicator-session/upstart-job]

396. By Ted Gould on 2013-08-27

Drop session specification

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:396
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/98/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/36/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-session-ci/98/rebuild

review: Approve (continuous-integration)

[lp:~ted/indicator-session/upstart-job]

397. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:397
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/37/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-session-ci/99/rebuild

review: Approve (continuous-integration)

[lp:~ted/indicator-session/upstart-job]

398. By Ted Gould on 2013-10-29

Merge trunk

399. By Ted Gould on 2013-10-29

XDG Autostart file

Unmerged revisions

399. By Ted Gould on 2013-10-29

XDG Autostart file

398. By Ted Gould on 2013-10-29

Merge trunk

397. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

396. By Ted Gould on 2013-08-27

Drop session specification

395. By Ted Gould on 2013-08-27

Merging trunk

394. By Ted Gould on 2013-05-29

Attaching bug

393. By Ted Gould on 2013-05-29

Dropping the DBus service file

392. By Ted Gould on 2013-05-29

Adding an upstart job config

=== modified file '.bzrignore'
--- .bzrignore	2013-05-02 17:09:51 +0000
+++ .bzrignore	2013-10-29 00:33:43 +0000
@@ -253,3 +253,4 @@
 dbus-user.c
 dbus-user.h
 tests/test-service
+indicator-session.conf

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-07-02 02:00:17 +0000
+++ data/CMakeLists.txt	2013-10-29 00:33:43 +0000
@@ -17,24 +17,45 @@
 
 
 ##
-##  DBus Service File
-##
-
-# where to install
-set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services")
-message (STATUS "${DBUS_SERVICE_DIR} is the DBus Service File install dir")
-
-set (SERVICE_NAME "${CMAKE_PROJECT_NAME}.service")
-set (SERVICE_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}")
-set (SERVICE_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in")
-
-# build it
-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
-configure_file ("${SERVICE_FILE_IN}" "${SERVICE_FILE}")
-
-# install it
-install (FILES "${SERVICE_FILE}"
-         DESTINATION "${DBUS_SERVICE_DIR}")
+##  Upstart Config File
+##
+
+# where to install
+set (UPSTART_JOB_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/sessions")
+message (STATUS "${UPSTART_JOB_DIR} is the Upstart Job install dir")
+
+set (UPSTART_JOB_NAME "${CMAKE_PROJECT_NAME}.conf")
+set (UPSTART_JOB_FILE "${CMAKE_CURRENT_BINARY_DIR}/${UPSTART_JOB_NAME}")
+set (UPSTART_JOB_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${UPSTART_JOB_NAME}.in")
+
+# build it
+set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
+configure_file ("${UPSTART_JOB_FILE_IN}" "${UPSTART_JOB_FILE}")
+
+# install it
+install (FILES "${UPSTART_JOB_FILE}"
+         DESTINATION "${UPSTART_JOB_DIR}")
+
+
+##
+##  XDG Autostart Config File
+##
+
+# where to install
+set (XDG_AUTOSTART_DIR "/etc/xdg/autostart")
+message (STATUS "${XDG_AUTOSTART_DIR} is the XDG Autostart install dir")
+
+set (XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.desktop")
+set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")
+set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")
+
+# build it
+set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
+configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
+
+# install it
+install (FILES "${XDG_AUTOSTART_FILE}"
+         DESTINATION "${XDG_AUTOSTART_DIR}")
 
 
 ##

=== modified file 'data/com.canonical.indicator.session'
--- data/com.canonical.indicator.session	2013-07-05 12:24:39 +0000
+++ data/com.canonical.indicator.session	2013-10-29 00:33:43 +0000
@@ -9,3 +9,5 @@
 [desktop_greeter]
 ObjectPath=/com/canonical/indicator/session/desktop_greeter
 
+[ubiquity]
+ObjectPath=/com/canonical/indicator/session/desktop_greeter

=== added file 'data/indicator-session.conf.in'
--- data/indicator-session.conf.in	1970-01-01 00:00:00 +0000
+++ data/indicator-session.conf.in	2013-10-29 00:33:43 +0000
@@ -0,0 +1,8 @@
+description "Indicator Session Service"
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec @pkglibexecdir@/indicator-session-service

=== added file 'data/indicator-session.desktop.in'
--- data/indicator-session.desktop.in	1970-01-01 00:00:00 +0000
+++ data/indicator-session.desktop.in	2013-10-29 00:33:43 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Session
+Exec=@pkglibexecdir@/indicator-session-service
+NotShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+

=== removed file 'data/indicator-session.service.in'
--- data/indicator-session.service.in	2013-06-20 19:43:23 +0000
+++ data/indicator-session.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.session
-Exec=@pkglibexecdir@/indicator-session-service

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-23 05:57:52 +0000
+++ debian/changelog	2013-10-29 00:33:43 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 indicator-session (12.10.5+13.10.20131023.1-0ubuntu1) saucy; urgency=low
 
   [ Lars Uebernickel ]
@@ -9,6 +10,15 @@
 
  -- Ubuntu daily release <[e-mail]>  Wed, 23 Oct 2013 05:57:52 +0000
 
+=======
+indicator-session (12.10.5+13.10.20131004-0ubuntu2) UNRELEASED; urgency=low
+
+  * Define "ubiquity" indicator profile, reusing the greeter object. (LP:
+    #1241539)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Fri, 18 Oct 2013 13:18:38 +0100
+
+>>>>>>> MERGE-SOURCE
 indicator-session (12.10.5+13.10.20131004-0ubuntu1) saucy; urgency=low
 
   [ Charles Kerr ]