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

[Ted Gould]

Switching DBus service to an Upstart Job.

Switching DBus service to an Upstart Job.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:191
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-armhf-ci/25/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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

192. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:192
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-armhf-ci/26/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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

193. By Ted Gould on 2013-10-29

Updating to trunk

194. By Ted Gould on 2013-10-29

Add in the autostart config

Unmerged revisions

194. By Ted Gould on 2013-10-29

Add in the autostart config

193. By Ted Gould on 2013-10-29

Updating to trunk

192. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

191. By Ted Gould on 2013-08-27

Switching the dvus service to an upstart job

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-07-04 20:14:54 +0000
+++ data/Makefile.am	2013-10-29 16:30:39 +0000
@@ -10,17 +10,30 @@
 dist_indicators_DATA = com.canonical.indicator.power
 
 #
-# the dbus service file
-#
-
-dbus_servicesdir = $(datadir)/dbus-1/services
-dbus_services_DATA = indicator-power.service
-dbus_services_in = $(dbus_services_DATA:.service=.service.in)
-$(dbus_services_DATA): $(dbus_services_in)
-	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-BUILT_SOURCES += $(dbus_services_DATA)
-CLEANFILES += $(dbus_services_DATA)
-EXTRA_DIST += $(dbus_services_in)
+# the upstart job file
+#
+
+upstart_jobsdir = $(datadir)/upstart/sessions
+upstart_jobs_DATA = indicator-power.conf
+upstart_jobs_in = $(upstart_jobs_DATA:.conf=.conf.in)
+$(upstart_jobs_DATA): $(upstart_jobs_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(upstart_jobs_DATA)
+CLEANFILES += $(upstart_jobs_DATA)
+EXTRA_DIST += $(upstart_jobs_in)
+
+#
+# the xdg autostart job file
+#
+
+xdg_autostartdir = /etc/xdg/autostart
+xdg_autostart_DATA = indicator-power.desktop
+xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
+$(xdg_autostart_DATA): $(xdg_autostart_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(xdg_autostart_DATA)
+CLEANFILES += $(xdg_autostart_DATA)
+EXTRA_DIST += $(xdg_autostart_in)
 
 #
 # the gettings

=== modified file 'data/com.canonical.indicator.power'
--- data/com.canonical.indicator.power	2013-07-24 05:10:17 +0000
+++ data/com.canonical.indicator.power	2013-10-29 16:30:39 +0000
@@ -11,3 +11,6 @@
 
 [desktop_greeter]
 ObjectPath=/com/canonical/indicator/power/desktop_greeter
+
+[phone_greeter]
+ObjectPath=/com/canonical/indicator/power/desktop_greeter

=== added file 'data/indicator-power.conf.in'
--- data/indicator-power.conf.in	1970-01-01 00:00:00 +0000
+++ data/indicator-power.conf.in	2013-10-29 16:30:39 +0000
@@ -0,0 +1,11 @@
+description "Indicator Power 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-power-service

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

=== removed file 'data/indicator-power.service.in'
--- data/indicator-power.service.in	2013-07-04 20:14:54 +0000
+++ data/indicator-power.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.power
-Exec=@pkglibexecdir@/indicator-power-service

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-08 02:34:02 +0000
+++ debian/changelog	2013-10-29 16:30:39 +0000
@@ -1,3 +1,19 @@
+indicator-power (12.10.6+14.04.20131029.1-0ubuntu1) trusty; urgency=low
+
+  [ Sebastien Bacher ]
+  * Don't leak the g_file_get_contents value, reported by valgrind .
+
+  [ Marcus Tomlinson ]
+  * Added torch icons to either end of brightness slider. (LP: #1227250)
+
+  [ Ted Gould ]
+  * Adding a phone_greeter profile.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 210
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 29 Oct 2013 10:31:03 +0000
+
 indicator-power (12.10.6+13.10.20131008-0ubuntu1) saucy; urgency=low
 
   [ Ted Gould ]

=== modified file 'src/ib-brightness-control.c'
--- src/ib-brightness-control.c	2013-10-01 18:50:10 +0000
+++ src/ib-brightness-control.c	2013-10-29 16:30:39 +0000
@@ -126,6 +126,7 @@
         g_error_free (error);
     } else {
         value = atoi (svalue);
+        g_free (svalue);
     }
 
     g_free (filename);