ubiquity

Merge lp:~jbicha/ubiquity/disable-u1-for-ubuntu-gnome into lp:ubiquity

  1. disable-u1-for-ubuntu-gnome
  2. Merge into trunk
Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 5988
Proposed branch: lp:~jbicha/ubiquity/disable-u1-for-ubuntu-gnome
Merge into: lp:ubiquity
Diff against target: 26 lines (+7/-1)
2 files modified
bin/ubiquity (+1/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~jbicha/ubiquity/disable-u1-for-ubuntu-gnome
Reviewer Review Type Date Requested Status
Ubuntu Installer Team Pending
Review via email: mp+183519@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubiquity'
2--- bin/ubiquity 2013-09-02 12:29:15 +0000
3+++ bin/ubiquity 2013-09-02 17:53:26 +0000
4@@ -539,7 +539,7 @@
5 if not options.u1_sso or not osextras.find_on_path('u1sdtool'):
6 os.environ['UBIQUITY_NO_SSO'] = '1'
7
8- if misc.get_release().name in ["Edubuntu", ]:
9+ if misc.get_release().name in ["Edubuntu", "Ubuntu GNOME"]:
10 os.environ['UBIQUITY_NO_SSO'] = '1'
11
12 if options.wireless:
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2013-09-02 12:47:09 +0000
16+++ debian/changelog 2013-09-02 17:53:26 +0000
17@@ -1,3 +1,9 @@
18+ubiquity (2.15.17) UNRELEASED; urgency=low
19+
20+ * Disable Ubuntu One plugin for Ubuntu GNOME too (LP: #1218175)
21+
22+ -- Jeremy Bicha <jbicha@ubuntu.com> Mon, 02 Sep 2013 13:50:25 -0400
23+
24 ubiquity (2.15.16) saucy; urgency=low
25
26 * Disable ubuntu one plugin on Edubuntu flavour.

Subscribers

People subscribed via source and target branches

to status/vote changes: