Merge lp:~ted/indicator-messages/upstart-job into lp:~indicator-applet-developers/indicator-messages/trunk.13.10

[Ted Gould]

Add Upstart job configuration

Well, the goal of this was to just switch to Upstart, but then I fixed the pkglibexec thing while I was there, and then did a multi-arch conversion. Somewhere it had to stop.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:358
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/28

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

review: Approve (continuous-integration)

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

359. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

Unmerged revisions

359. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

358. By Ted Gould on 2013-08-21

Not sure how the dbus dir trickled in

357. By Ted Gould on 2013-08-21

Refixing the service binary

356. By Ted Gould on 2013-08-21

Merge in consolidate branch

355. By Ted Gould on 2013-07-12

Make everything work with pkglibexec and install the right files

354. By Ted Gould on 2013-07-12

Drop the D-Bus service directory

353. By Ted Gould on 2013-07-12

Switching to pkglibexec dir

352. By Ted Gould on 2013-07-12

Switching to an upstart job

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-08-20 10:38:10 +0000
+++ data/Makefile.am	2013-08-27 20:14:48 +0000
@@ -1,10 +1,10 @@
 SUBDIRS = icons
 
-dbus_servicesdir = $(datadir)/dbus-1/services
-dbus_services_DATA = indicator-messages.service
+upstart_jobsdir = $(datadir)/upstart/sessions
+upstart_jobs_DATA = indicator-messages.conf
 
-%.service: %.service.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+%.conf: %.conf.in
+	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 gsettings_SCHEMAS = com.canonical.indicator.messages.gschema.xml
 @GSETTINGS_RULES@
@@ -14,6 +14,6 @@
 
 EXTRA_DIST = \
 	$(gsettings_SCHEMAS) \
-	indicator-messages.service.in
+	indicator-messages.conf.in
 
-CLEANFILES = indicator-messages.service
+CLEANFILES = indicator-messages.conf

=== added file 'data/indicator-messages.conf.in'
--- data/indicator-messages.conf.in	1970-01-01 00:00:00 +0000
+++ data/indicator-messages.conf.in	2013-08-27 20:14:48 +0000
@@ -0,0 +1,11 @@
+description "Indicator Messages Backend"
+
+# Want to move to indicator-services-[start|end], but that's not all
+# there yet.  Use the signals that exist today for now.
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec @pkglibexecdir@/indicator-messages-service

=== removed file 'data/indicator-messages.service.in'
--- data/indicator-messages.service.in	2011-01-27 23:00:31 +0000
+++ data/indicator-messages.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.messages
-Exec=@libexecdir@/indicator-messages-service

=== modified file 'debian/gir1.2-messagingmenu-1.0.install'
--- debian/gir1.2-messagingmenu-1.0.install	2012-08-23 11:28:52 +0000
+++ debian/gir1.2-messagingmenu-1.0.install	2013-08-27 20:14:48 +0000
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0/*.typelib
+usr/lib/*/girepository-1.0/*.typelib /usr/lib/girepository-1.0/

=== modified file 'debian/indicator-messages.install'
--- debian/indicator-messages.install	2013-08-20 10:38:10 +0000
+++ debian/indicator-messages.install	2013-08-27 20:14:48 +0000
@@ -1,5 +1,5 @@
-usr/lib/indicator-messages/indicator-messages-service
-usr/share/dbus-1
+usr/lib/*/indicator-messages/indicator-messages-service
+usr/share/upstart
 usr/share/glib-2.0
 usr/share/icons
 usr/share/unity/indicators

=== modified file 'debian/libmessaging-menu-dev.install'
--- debian/libmessaging-menu-dev.install	2013-08-20 10:38:10 +0000
+++ debian/libmessaging-menu-dev.install	2013-08-27 20:14:48 +0000
@@ -1,5 +1,5 @@
-usr/lib/libmessaging-menu.so 
-usr/lib/pkgconfig
+usr/lib/*/libmessaging-menu.so 
+usr/lib/*/pkgconfig
 usr/include /usr/
 usr/share/gir-1.0/
 usr/share/vala/

=== modified file 'debian/libmessaging-menu0.install'
--- debian/libmessaging-menu0.install	2012-08-23 11:28:52 +0000
+++ debian/libmessaging-menu0.install	2013-08-27 20:14:48 +0000
@@ -1,1 +1,1 @@
-usr/lib/libmessaging-menu.so.* /usr/lib/
+usr/lib/*/libmessaging-menu.so.*

=== modified file 'debian/rules'
--- debian/rules	2012-11-13 18:45:32 +0000
+++ debian/rules	2013-08-27 20:14:48 +0000
@@ -9,7 +9,7 @@
 	NO_CONFIGURE=1 dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
-	dh_auto_configure -- --libdir="\$${prefix}/lib" --libexecdir="\$${prefix}/lib/indicator-messages" --enable-gtk-doc
+	dh_auto_configure -- --enable-gtk-doc
 
 override_dh_install:
 	find debian/tmp/usr/lib -name *.la -delete

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-08-22 12:44:10 +0000
+++ src/Makefile.am	2013-08-27 20:14:48 +0000
@@ -1,7 +1,7 @@
 
 EXTRA_DIST =
 
-libexec_PROGRAMS = indicator-messages-service
+pkglibexec_PROGRAMS = indicator-messages-service
 
 indicator_messages_service_SOURCES = \
 	messages-service.c \