Merge lp:~ted/indicator-display/release-to-ci-train into lp:indicator-display/14.10

Proposed by Ted Gould on 2014-09-05
Status: Merged
Approved by: Ted Gould on 2014-09-06
Approved revision: 5
Merged at revision: 3
Proposed branch: lp:~ted/indicator-display/release-to-ci-train
Merge into: lp:indicator-display/14.10
Diff against target: 29 lines (+5/-1)
3 files modified
.bzr-builddeb/default.conf (+2/-0)
README (+1/-1)
tests/manual (+2/-0)
To merge this branch: bzr merge lp:~ted/indicator-display/release-to-ci-train
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2014-09-05
Indicator Applet Developers 2014-09-05 Pending
Review via email: mp+233583@code.launchpad.net

Commit message

First release in CI Train

Description of the change

When the train is rockin', don't come a knockin'.

To post a comment you must log in.
4. By Ted Gould on 2014-09-05

Do a split build by default

5. By Ted Gould on 2014-09-05

Put in disclaimer about current builds

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2014-09-05 22:13:02 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== modified file 'README'
10--- README 2014-08-13 14:27:04 +0000
11+++ README 2014-09-05 22:13:02 +0000
12@@ -1,1 +1,1 @@
13-Control of display related things.
14+Control of display related things, currently rotation lock.
15
16=== modified file 'tests/manual'
17--- tests/manual 2014-08-21 16:58:23 +0000
18+++ tests/manual 2014-09-05 22:13:02 +0000
19@@ -3,10 +3,12 @@
20 <dl>
21 <dt>On the phone, enable the orientation lock in ubuntu-system-settings.</dt>
22 <dd>The rotation lock indicator should appear, and its switch menuitem should be set to 'true'.</dd>
23+ <dd>NOTE: Current builds this is broken, until it is fixed in system settings you can set it with: <tt>gsettings set com.ubuntu.touch.system orientation-lock 'LandscapeOrientation'</tt></dd>
24
25 <dt>With the orientation locked, click on the indicator's switch menuitem to toggle from locked to unlocked.</dd>
26 <dd>The rotation lock indicator should disappear</dd>
27 <dd>In ubuntu-system-settings, the orientation lock control should change to 'none'.</dd>
28+ <dd>NOTE: Current builds this is broken, until it is fixed in system settings you can get it with: <tt>gsettings get com.ubuntu.touch.system orientation-lock</tt></dd>
29 </dl>
30
31

Subscribers

People subscribed via source and target branches