Bluetooth Menu

Merge lp:~ted/indicator-bluetooth/startup-cleanup into lp:indicator-bluetooth/14.10

  1. startup-cleanup
  2. Merge into trunk.14.10
Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 87
Merged at revision: 84
Proposed branch: lp:~ted/indicator-bluetooth/startup-cleanup
Merge into: lp:indicator-bluetooth/14.10
Diff against target: 146 lines (+40/-18)
8 files modified
configure.ac (+1/-0)
data/Makefile.am (+3/-13)
data/indicator-bluetooth.conf.in (+2/-4)
data/indicator-bluetooth.desktop.in (+2/-0)
data/upstart/Makefile.am (+17/-0)
data/upstart/indicator-bluetooth.desktop.in (+1/-0)
debian/changelog (+13/-0)
src/bluez.vala (+1/-1)
To merge this branch: bzr merge lp:~ted/indicator-bluetooth/startup-cleanup
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+222090@code.launchpad.net

This proposal supersedes a proposal from 2014-02-22.

Commit message

Synchronize process management across indicators

Description of the change

This merge goes along with all of the other "startup-cleanup" merges to create a consistent startup for all indicators.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:86
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-armhf-ci/11/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-bluetooth-ci/34/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote : Posted in a previous version of this proposal

I built debs for all the startup-cleanup branches and tested them out; WfM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-ci/35/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-bluetooth-ci/35/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Re-tested in Utopic and, unsurprisingly, the patch still works.

review: Approve
lp:~ted/indicator-bluetooth/startup-cleanup updated
88. By Mathieu Trudel-Lapierre

Toggle rfkill again so that we have a chance of persisting the bluetooth state across reboots.

89. By Ted Gould

Changlog for CI Train

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-09-25 20:06:30 +0000
3+++ configure.ac 2014-09-22 14:02:11 +0000
4@@ -59,6 +59,7 @@
5 AC_OUTPUT([
6 Makefile
7 data/Makefile
8+data/upstart/Makefile
9 po/Makefile.in
10 src/Makefile
11 ])
12
13=== modified file 'data/Makefile.am'
14--- data/Makefile.am 2013-12-18 12:53:29 +0000
15+++ data/Makefile.am 2014-09-22 14:02:11 +0000
16@@ -2,6 +2,8 @@
17 EXTRA_DIST =
18 CLEANFILES =
19
20+SUBDIRS = upstart
21+
22 # the indicator bus file
23 indicatorsdir = $(datadir)/unity/indicators
24 dist_indicators_DATA = com.canonical.indicator.bluetooth
25@@ -16,17 +18,6 @@
26 EXTRA_DIST += $(upstart_jobs_in)
27 CLEANFILES += $(upstart_jobs_DATA)
28
29-# the upstart version of the xdg autostart job file
30-# see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100
31-upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart
32-upstart_xdg_autostart_DATA = indicator-bluetooth.desktop
33-upstart_xdg_autostart_in = indicator-bluetooth.upstart.desktop.in
34-$(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in)
35- $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
36-BUILT_SOURCES += $(upstart_xdg_autostart_DATA)
37-EXTRA_DIST += $(upstart_xdg_autostart_in)
38-CLEANFILES += $(upstart_xdg_autostart_DATA)
39-
40 # the xdg autostart job file
41 xdg_autostartdir = /etc/xdg/autostart
42 xdg_autostart_DATA = indicator-bluetooth.desktop
43@@ -45,8 +36,7 @@
44 EXTRA_DIST += \
45 com.canonical.indicator.bluetooth.gschema.xml.in \
46 indicator-bluetooth.conf.in \
47- indicator-bluetooth.desktop.in \
48- indicator-bluetooth.upstart.desktop.in
49+ indicator-bluetooth.desktop.in
50
51 CLEANFILES += \
52 $(dbus_services_DATA) \
53
54=== modified file 'data/indicator-bluetooth.conf.in'
55--- data/indicator-bluetooth.conf.in 2013-12-06 17:00:26 +0000
56+++ data/indicator-bluetooth.conf.in 2014-09-22 14:02:11 +0000
57@@ -1,11 +1,9 @@
58 description "Indicator Bluetooth Backend"
59
60-# Want to move to indicator-services-[start|end], but that's not all
61-# there yet. Use the signals that exist today for now.
62-
63-start on indicators-loaded or indicator-services-start
64+start on indicator-services-start
65 stop on desktop-end or indicator-services-end
66
67 respawn
68+respawn limit 2 10
69
70 exec @pkglibexecdir@/indicator-bluetooth-service
71
72=== modified file 'data/indicator-bluetooth.desktop.in'
73--- data/indicator-bluetooth.desktop.in 2013-12-18 12:53:49 +0000
74+++ data/indicator-bluetooth.desktop.in 2014-09-22 14:02:11 +0000
75@@ -5,3 +5,5 @@
76 NoDisplay=true
77 StartupNotify=false
78 Terminal=false
79+OnlyShowIn=Unity;GNOME;
80+AutostartCondition=GNOME3 unless-session gnome
81
82=== added directory 'data/upstart'
83=== added file 'data/upstart/Makefile.am'
84--- data/upstart/Makefile.am 1970-01-01 00:00:00 +0000
85+++ data/upstart/Makefile.am 2014-09-22 14:02:11 +0000
86@@ -0,0 +1,17 @@
87+BUILT_SOURCES =
88+EXTRA_DIST =
89+CLEANFILES =
90+
91+# the upstart version of the xdg autostart job file
92+# see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100
93+upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart
94+upstart_xdg_autostart_DATA = indicator-bluetooth.desktop
95+upstart_xdg_autostart_in = indicator-bluetooth.desktop.in
96+$(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in)
97+ $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
98+BUILT_SOURCES += $(upstart_xdg_autostart_DATA)
99+EXTRA_DIST += $(upstart_xdg_autostart_in)
100+CLEANFILES += $(upstart_xdg_autostart_DATA)
101+
102+EXTRA_DIST += \
103+ indicator-bluetooth.upstart.desktop.in
104
105=== renamed file 'data/indicator-bluetooth.upstart.desktop.in' => 'data/upstart/indicator-bluetooth.desktop.in'
106--- data/indicator-bluetooth.upstart.desktop.in 2013-12-18 12:53:29 +0000
107+++ data/upstart/indicator-bluetooth.desktop.in 2014-09-22 14:02:11 +0000
108@@ -5,4 +5,5 @@
109 NoDisplay=true
110 StartupNotify=false
111 Terminal=false
112+OnlyShowIn=Unity;
113 Hidden=true
114
115=== modified file 'debian/changelog'
116--- debian/changelog 2014-02-07 16:19:46 +0000
117+++ debian/changelog 2014-09-22 14:02:11 +0000
118@@ -1,3 +1,16 @@
119+indicator-bluetooth (0.0.6+14.04.20140207-0ubuntu3) UNRELEASED; urgency=medium
120+
121+ * Synchronize process management across indicators
122+
123+ -- Ted Gould <ted@ubuntu.com> Mon, 22 Sep 2014 09:00:47 -0500
124+
125+indicator-bluetooth (0.0.6+14.04.20140207-0ubuntu2) trusty; urgency=medium
126+
127+ * Toggle rfkill again so that we have a chance of persisting the bluetooth
128+ state across reboots. (LP: #1232828)
129+
130+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 10 Apr 2014 15:38:13 -0400
131+
132 indicator-bluetooth (0.0.6+14.04.20140207-0ubuntu1) trusty; urgency=low
133
134 [ Ted Gould ]
135
136=== modified file 'src/bluez.vala'
137--- src/bluez.vala 2013-12-06 16:08:49 +0000
138+++ src/bluez.vala 2014-09-22 14:02:11 +0000
139@@ -35,7 +35,7 @@
140 set { _powered = value; update_enabled(); }
141 }
142
143- private KillSwitch killswitch = null;
144+ private KillSwitch killswitch = new RfKillSwitch ();
145
146 private string adapter_path = null;
147

Subscribers

People subscribed via source and target branches