Merge lp://staging/~yuningdodo/usb-creator/usb-creator.lp1361474+lp1300361-recreate-udisks-client into lp://staging/usb-creator
Proposed by
Yu Ning
| Status: | Merged |
|---|---|
| Merged at revision: | 455 |
| Proposed branch: | lp://staging/~yuningdodo/usb-creator/usb-creator.lp1361474+lp1300361-recreate-udisks-client |
| Merge into: | lp://staging/usb-creator |
| Diff against target: |
68811 lines (+67798/-0) (has conflicts) 191 files modified
.bzr-builddeb/default.conf (+2/-0) Makefile (+57/-0) Messages.sh (+24/-0) TODO (+27/-0) bin/usb-creator-gtk (+93/-0) bin/usb-creator-helper (+357/-0) bin/usb-creator-kde (+110/-0) dbus/com.ubuntu.USBCreator.conf (+23/-0) dbus/com.ubuntu.USBCreator.service (+4/-0) dbus/com.ubuntu.usbcreator.policy.in (+48/-0) debian/Debian/usb-creator-gtk-16x16.xpm (+115/-0) debian/Debian/usb-creator-gtk-32x32.xpm (+254/-0) debian/Debian/usb-creator-gtk.svg (+440/-0) debian/Debian/usb-creator-kde-16x16.xpm (+155/-0) debian/Debian/usb-creator-kde-32x32.xpm (+466/-0) debian/Debian/usb-creator-kde.svg (+1608/-0) debian/Ubuntu/usb-creator-gtk.svg (+622/-0) debian/Ubuntu/usb-creator-kde.svg (+1584/-0) debian/changelog (+1222/-0) debian/compat (+1/-0) debian/control (+67/-0) debian/copyright (+39/-0) debian/pycompat (+1/-0) debian/rules (+44/-0) debian/source/format (+1/-0) debian/source_usb-creator.py (+17/-0) debian/usb-creator-common.install (+13/-0) debian/usb-creator-gtk.conf (+31/-0) debian/usb-creator-gtk.install (+5/-0) debian/usb-creator-gtk.maintscript (+1/-0) debian/usb-creator-gtk.manpages (+1/-0) debian/usb-creator-gtk.menu (+6/-0) debian/usb-creator-kde.install (+5/-0) debian/usb-creator-kde.manpages (+1/-0) debian/usb-creator-kde.menu (+6/-0) desktop/usb-creator-gtk.desktop.in (+10/-0) desktop/usb-creator-gtk.svg (+658/-0) desktop/usb-creator-kde.desktop.in (+10/-0) desktop/usb-creator-kde.svg (+1554/-0) gui/ubuntu-nexus7-USAGE-NOTICE-en.txt (+21/-0) gui/usbcreator-gtk.ui (+973/-0) gui/usbcreator-kde.ui (+395/-0) main.py (+58/-0) man/usb-creator-gtk.8 (+66/-0) man/usb-creator-kde.8 (+62/-0) po/POTFILES.in (+38/-0) po/af.po (+492/-0) po/ar.po (+530/-0) po/ast.po (+539/-0) po/be.po (+530/-0) po/bg.po (+541/-0) po/bn.po (+508/-0) po/bs.po (+500/-0) po/ca.po (+543/-0) po/cs.po (+533/-0) po/csb.po (+534/-0) po/cv.po (+499/-0) po/da.po (+536/-0) po/de.po (+549/-0) po/dv.po (+496/-0) po/ee.po (+492/-0) po/el.po (+552/-0) po/en_AU.po (+531/-0) po/en_CA.po (+529/-0) po/en_GB.po (+539/-0) po/eo.po (+533/-0) po/es.po (+538/-0) po/et.po (+532/-0) po/eu.po (+526/-0) po/fa.po (+492/-0) po/fi.po (+540/-0) po/fo.po (+502/-0) po/fr.po (+546/-0) po/gl.po (+539/-0) po/gu.po (+500/-0) po/he.po (+535/-0) po/hi.po (+492/-0) po/hr.po (+534/-0) po/hu.po (+541/-0) po/id.po (+540/-0) po/is.po (+520/-0) po/it.po (+547/-0) po/ja.po (+536/-0) po/jv.po (+493/-0) po/kk.po (+492/-0) po/kn.po (+492/-0) po/ko.po (+538/-0) po/lt.po (+540/-0) po/lv.po (+535/-0) po/ml.po (+495/-0) po/mr.po (+492/-0) po/ms.po (+536/-0) po/nap.po (+499/-0) po/nb.po (+538/-0) po/nds.po (+495/-0) po/ne.po (+494/-0) po/nl.po (+539/-0) po/oc.po (+540/-0) po/pl.po (+536/-0) po/pt.po (+540/-0) po/pt_BR.po (+546/-0) po/ro.po (+537/-0) po/ru.po (+540/-0) po/si.po (+498/-0) po/sk.po (+539/-0) po/sl.po (+530/-0) po/sq.po (+537/-0) po/sr.po (+536/-0) po/sv.po (+544/-0) po/te.po (+492/-0) po/th.po (+505/-0) po/tr.po (+540/-0) po/ug.po (+496/-0) po/uk.po (+534/-0) po/usbcreator.pot (+519/-0) po/uz.po (+493/-0) po/vi.po (+530/-0) po/zh_CN.po (+523/-0) po/zh_HK.po (+520/-0) po/zh_TW.po (+522/-0) setup.cfg (+7/-0) setup.py (+42/-0) tests/dbus-session.conf (+64/-0) tests/dbus-session/org.freedesktop.UDisks.service (+3/-0) tests/fake_udisks.py (+176/-0) tests/run (+22/-0) tests/run-win (+13/-0) tests/test_udisks_backend.py (+93/-0) tests/test_windows_backend.py (+12/-0) tests/test_windows_frontend.py (+8/-0) tools/_include.py (+3/-0) tools/check_external_deps (+49/-0) tools/pylauncher/Makefile (+102/-0) tools/pylauncher/deletedir.c (+108/-0) tools/pylauncher/deletedir.h (+28/-0) tools/pylauncher/header.c (+121/-0) tools/pylauncher/pack.py (+76/-0) tools/pylauncher/pylauncher.c (+97/-0) tools/pylauncher/pylauncher.exe.manifest (+26/-0) tools/pylauncher/pyrun.c (+135/-0) tools/pylauncher/resources.h (+6/-0) tools/pylauncher/resources.rc (+13/-0) tools/pylauncher/str.c (+34/-0) tools/pylauncher/str.h (+9/-0) tools/pylauncher/unpack.c (+416/-0) tools/pylauncher/unpack.h (+38/-0) tools/pypack/LICENSE (+339/-0) tools/pypack/README (+69/-0) tools/pypack/altgraph/Dot.py (+252/-0) tools/pypack/altgraph/Graph.py (+626/-0) tools/pypack/altgraph/GraphAlgo.py (+148/-0) tools/pypack/altgraph/GraphStat.py (+78/-0) tools/pypack/altgraph/GraphUtil.py (+122/-0) tools/pypack/altgraph/ObjectGraph.py (+173/-0) tools/pypack/altgraph/__init__.py (+133/-0) tools/pypack/altgraph/compat.py (+183/-0) tools/pypack/libpypack/__init__.py (+1/-0) tools/pypack/libpypack/application.py (+217/-0) tools/pypack/libpypack/version.py (+4/-0) tools/pypack/modulegraph/__init__.py (+1/-0) tools/pypack/modulegraph/find_modules.py (+280/-0) tools/pypack/modulegraph/modulegraph.py (+969/-0) tools/pypack/modulegraph/pkg_resources.py (+2584/-0) tools/pypack/modulegraph/util.py (+82/-0) tools/pypack/pypack (+27/-0) usbcreator/backends/base/__init__.py (+1/-0) usbcreator/backends/base/backend.py (+212/-0) usbcreator/backends/fastboot/__init__.py (+1/-0) usbcreator/backends/fastboot/backend.py (+68/-0) usbcreator/backends/udisks/__init__.py (+1/-0) usbcreator/backends/udisks/backend.py (+368/-0) usbcreator/backends/windows/__init__.py (+1/-0) usbcreator/backends/windows/backend.py (+194/-0) usbcreator/frontends/base/__init__.py (+1/-0) usbcreator/frontends/base/frontend.py (+2/-0) usbcreator/frontends/gtk/__init__.py (+1/-0) usbcreator/frontends/gtk/frontend.py (+819/-0) usbcreator/frontends/gtk/unitysupport.py (+57/-0) usbcreator/frontends/kde/__init__.py (+1/-0) usbcreator/frontends/kde/frontend.py (+580/-0) usbcreator/frontends/kde/kde_about.py (+68/-0) usbcreator/frontends/kde/translate.py (+39/-0) usbcreator/frontends/winui/__init__.py (+1/-0) usbcreator/frontends/winui/frontend.py (+205/-0) usbcreator/frontends/winui/install_window.py (+32/-0) usbcreator/frontends/winui/main_dialog.py (+58/-0) usbcreator/frontends/winui/winui/defs.py (+5326/-0) usbcreator/frontends/winui/winui/ui.py (+759/-0) usbcreator/install.py (+692/-0) usbcreator/misc.py (+201/-0) usbcreator/remtimest.py (+85/-0) Conflict adding file .bzr-builddeb. Moved existing file to .bzr-builddeb.moved. Conflict adding file Makefile. Moved existing file to Makefile.moved. Conflict adding file Messages.sh. Moved existing file to Messages.sh.moved. Conflict adding file TODO. Moved existing file to TODO.moved. Conflict adding file bin. Moved existing file to bin.moved. Conflict adding file dbus. Moved existing file to dbus.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file desktop. Moved existing file to desktop.moved. Conflict adding file gui. Moved existing file to gui.moved. Conflict adding file main.py. Moved existing file to main.py.moved. Conflict adding file man. Moved existing file to man.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file setup.cfg. Moved existing file to setup.cfg.moved. Conflict adding file setup.py. Moved existing file to setup.py.moved. Conflict adding file tests. Moved existing file to tests.moved. Conflict adding file tools. Moved existing file to tools.moved. Conflict adding file usbcreator. Moved existing file to usbcreator.moved. |
| To merge this branch: | bzr merge lp://staging/~yuningdodo/usb-creator/usb-creator.lp1361474+lp1300361-recreate-udisks-client |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brian Murray | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Yu Ning (yuningdodo) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I'm not sure what was wrong with the merge proposal (the diff is much larger than it should have been), but I've uploaded your change to utopic. One change that I made is the formatting of the bug references. I switched it to (LP: #1361474, #1300361) as the tools will recognize these as two Launchpad bugs. Thanks!