Merge lp://qastaging/~dobey/ubuntuone-installer/new-logo into lp://qastaging/ubuntuone-installer

The top of the U1 shape part of the logo should be aligned 12px from the top, not the top of the 'b'. It looks visually off now, but I understand it is impossible to lift the logo image up by 6px, without moving the text up too. We should consider using the alternative brand mark to avoid this in future versions.

http://ubuntuone.com/0uP8qddPaI9dfFaiNCRMHi is a screen shot of the installer with fixed spacing of the content.

Can we have some tests added for this, I'm not that concern about adding tests for the spacing (that is just stupid) but I'd like to see at least a test asserting that the correct logo is used.

Also AFAIK the data/u1logo.svg is not present in the setup.py, is that intentional? I thin that we should ensure that if a user uses the setup.py all the required data is copied.

How do you mean to "test that the correct logo is used" exactly?

The image is picked up automatically, as it was before, by DistutilsExtra.auto.

The attempt to merge lp:~dobey/ubuntuone-installer/new-logo into lp:ubuntuone-installer failed. Below is the output from the failed tests.

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 337, in <module>
    main()
  File "/usr/bin/u1trial", line 317, in main
    suite = trial_runner.get_suite(config)
  File "/usr/bin/u1trial", line 196, in get_suite
    config['ignore-paths']))
  File "/usr/bin/u1trial", line 180, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 120, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/mnt/tarmac/cache/ubuntuone-installer/trunk/ubuntuone/installer/tests/test_gui.py", line 18, in <module>
    from gi.repository import Gtk
  File "/usr/lib/python2.7/dist-packages/gi/importer.py", line 76, in load_module
    dynamic_module._load()
  File "/usr/lib/python2.7/dist-packages/gi/module.py", line 224, in _load
    overrides_modules = __import__('gi.overrides', fromlist=[self._namespace])
  File "/usr/lib/python2.7/dist-packages/gi/overrides/Gtk.py", line 1533, in <module>
    raise RuntimeError("Gtk couldn't be initialized")
RuntimeError: Gtk couldn't be initialized

The attempt to merge lp:~dobey/ubuntuone-installer/new-logo into lp:ubuntuone-installer failed. Below is the output from the failed tests.

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 337, in <module>
    main()
  File "/usr/bin/u1trial", line 317, in main
    suite = trial_runner.get_suite(config)
  File "/usr/bin/u1trial", line 196, in get_suite
    config['ignore-paths']))
  File "/usr/bin/u1trial", line 180, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 120, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/mnt/tarmac/cache/ubuntuone-installer/trunk/ubuntuone/installer/tests/test_gui.py", line 21, in <module>
    from ubuntuone.installer import gui
  File "/mnt/tarmac/cache/ubuntuone-installer/trunk/ubuntuone/installer/gui.py", line 18, in <module>
    import aptdaemon.gtk3widgets as aptgtk
ImportError: No module named aptdaemon.gtk3widgets