Ubuntu
ubuntuone-control-panel package

Merge lp://qastaging/~nataliabidart/ubuntu/precise/ubuntuone-control-panel/ubuntuone-control-panel-2.99.0 into lp://qastaging/ubuntu/precise/ubuntuone-control-panel

  1. Precise (12.04)
  2. ubuntuone-control-panel-2.99.0
  3. Merge into precise
Proposed by Natalia Bidart
Status: Merged
Merged at revision: 35
Proposed branch: lp://qastaging/~nataliabidart/ubuntu/precise/ubuntuone-control-panel/ubuntuone-control-panel-2.99.0
Merge into: lp://qastaging/ubuntu/precise/ubuntuone-control-panel
Diff against target: 2947 lines (+1252/-451)
58 files modified
PKG-INFO (+2/-2)
bin/ubuntuone-control-panel-qt (+1/-1)
data/qt/device_remote.ui (+50/-0)
data/qt/signin.ui (+1/-1)
data/qt/ubuntuone.qss (+9/-2)
data/source_ubuntuone-control-panel.py (+39/-0)
debian/changelog (+11/-0)
debian/control (+7/-7)
debian/watch (+1/-1)
run-tests (+4/-3)
run-tests.bat (+3/-2)
setup.py (+12/-5)
ubuntuone/controlpanel/dbustests/__init__.py (+5/-2)
ubuntuone/controlpanel/dbustests/test_dbus_service.py (+8/-9)
ubuntuone/controlpanel/dbustests/test_gui_service.py (+8/-2)
ubuntuone/controlpanel/dbustests/test_sd_client/test_linux.py (+4/-1)
ubuntuone/controlpanel/gui/__init__.py (+8/-4)
ubuntuone/controlpanel/gui/gtk/tests/__init__.py (+4/-2)
ubuntuone/controlpanel/gui/gtk/tests/test_gui.py (+18/-8)
ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py (+11/-6)
ubuntuone/controlpanel/gui/gtk/tests/test_package_manager.py (+4/-0)
ubuntuone/controlpanel/gui/gtk/tests/test_widgets.py (+8/-3)
ubuntuone/controlpanel/gui/qt/__init__.py (+12/-2)
ubuntuone/controlpanel/gui/qt/device.py (+23/-7)
ubuntuone/controlpanel/gui/qt/devices.py (+4/-1)
ubuntuone/controlpanel/gui/qt/folders.py (+0/-4)
ubuntuone/controlpanel/gui/qt/gotoweb.py (+3/-1)
ubuntuone/controlpanel/gui/qt/main/__init__.py (+41/-7)
ubuntuone/controlpanel/gui/qt/main/linux.py (+7/-34)
ubuntuone/controlpanel/gui/qt/main/windows.py (+10/-34)
ubuntuone/controlpanel/gui/qt/tests/__init__.py (+47/-10)
ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py (+1/-0)
ubuntuone/controlpanel/gui/qt/tests/test_common.py (+44/-14)
ubuntuone/controlpanel/gui/qt/tests/test_devices.py (+2/-1)
ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py (+5/-2)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+0/-4)
ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py (+5/-1)
ubuntuone/controlpanel/gui/tests/test_url_sign.py (+14/-1)
ubuntuone/controlpanel/tests/__init__.py (+7/-1)
ubuntuone/controlpanel/tests/test_backend.py (+10/-5)
ubuntuone/controlpanel/tests/test_cache.py (+4/-1)
ubuntuone/controlpanel/tests/test_login_client.py (+2/-1)
ubuntuone/controlpanel/tests/test_replication_client.py (+4/-2)
ubuntuone/controlpanel/tests/test_sd_client.py (+5/-3)
ubuntuone/controlpanel/tests/test_utils.py (+0/-142)
ubuntuone/controlpanel/tests/test_web_client.py (+15/-10)
ubuntuone/controlpanel/utils.py (+0/-73)
ubuntuone/controlpanel/utils/__init__.py (+87/-0)
ubuntuone/controlpanel/utils/tests/__init__.py (+18/-0)
ubuntuone/controlpanel/utils/tests/test_linux.py (+38/-0)
ubuntuone/controlpanel/utils/tests/test_utils.py (+151/-0)
ubuntuone/controlpanel/utils/tests/test_windows.py (+179/-0)
ubuntuone/controlpanel/utils/windows.py (+73/-0)
ubuntuone/controlpanel/web_client/__init__.py (+18/-8)
ubuntuone/controlpanel/web_client/libsoup.py (+52/-7)
ubuntuone/controlpanel/web_client/tests/test_libsoup.py (+106/-0)
ubuntuone/controlpanel/web_client/tests/test_txwebclient.py (+31/-9)
ubuntuone/controlpanel/web_client/txwebclient.py (+16/-5)
To merge this branch: bzr merge lp://qastaging/~nataliabidart/ubuntu/precise/ubuntuone-control-panel/ubuntuone-control-panel-2.99.0
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+86455@code.qastaging.launchpad.net

Description of the change

- New upstream release.
- debian/watch: updated url to download the latest stable-3-0 tarball.
- debian/control:
  - updated versions for dependencies (ubuntuone-client and
    ubuntu-sso-client).
  - update Standards-Version to 3.9.2.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Traceback when attempting to launch the control panel:

     from ubuntuone.controlpanel.utils import (ERROR_TYPE, ERROR_MESSAGE,
 ImportError: No module named utils

You need to add the new files to debian/python-ubuntuone-control-panel.install

review: Needs Fixing
Revision history for this message
Ken VanDine (ken-vandine) wrote :

I fixed this myself, approving.

review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Ken,

Thanks a lot for fixing that! I forgot to push that change, sorry.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches