Merge lp://qastaging/~ubuntu-branches/ubuntu/saucy/checkbox/saucy-proposed-201308281228 into lp://qastaging/ubuntu/saucy-proposed/checkbox
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/saucy/checkbox/saucy-proposed-201308281228 |
| Merge into: | lp://qastaging/ubuntu/saucy-proposed/checkbox |
| Diff against target: |
7511 lines (+5851/-0) (has conflicts) 141 files modified
debian/changelog (+64/-0) debian/po/ast.po (+5/-0) debian/po/cs.po (+5/-0) debian/po/de.po (+5/-0) debian/po/en_AU.po (+5/-0) debian/po/en_GB.po (+5/-0) debian/po/es.po (+5/-0) debian/po/fr.po (+5/-0) debian/po/gl.po (+5/-0) debian/po/he.po (+5/-0) debian/po/hu.po (+5/-0) debian/po/id.po (+5/-0) debian/po/it.po (+5/-0) debian/po/ja.po (+5/-0) debian/po/nl.po (+5/-0) debian/po/oc.po (+5/-0) debian/po/pl.po (+5/-0) debian/po/pt_BR.po (+5/-0) debian/po/ro.po (+5/-0) debian/po/ru.po (+5/-0) debian/po/tr.po (+5/-0) debian/po/uk.po (+5/-0) debian/po/zh_CN.po (+5/-0) debian/po/zh_TW.po (+5/-0) jobs/mediacard.txt.in (+91/-0) jobs/resource.txt.in (+6/-0) plainbox/MANIFEST.in.OTHER (+9/-0) plainbox/contrib/policykit_auth_admin_keep/org.freedesktop.policykit.pkexec.policy (+30/-0) plainbox/contrib/policykit_yes/org.freedesktop.policykit.pkexec.policy.OTHER (+29/-0) plainbox/docs/dev/architecture.rst.OTHER (+40/-0) plainbox/docs/dev/old.rst.OTHER (+343/-0) plainbox/docs/dev/reference.rst.OTHER (+179/-0) plainbox/docs/dev/resources.rst.OTHER (+259/-0) plainbox/docs/dev/trusted-launcher.rst (+209/-0) plainbox/docs/usage.rst.OTHER (+93/-0) plainbox/mk-venv.sh.OTHER (+195/-0) plainbox/plainbox/impl/box.py.OTHER (+130/-0) plainbox/plainbox/impl/commands/checkbox.py.OTHER (+100/-0) plainbox/plainbox/impl/commands/run.py.OTHER (+340/-0) plainbox/plainbox/impl/commands/special.py.OTHER (+159/-0) plainbox/plainbox/impl/commands/sru.py.OTHER (+271/-0) plainbox/plainbox/impl/commands/test_run.py.OTHER (+142/-0) plainbox/plainbox/impl/config.py.OTHER (+544/-0) plainbox/plainbox/impl/job.py.OTHER (+259/-0) plainbox/plainbox/impl/runner.py.OTHER (+421/-0) plainbox/plainbox/impl/secure/checkbox_trusted_launcher.py.OTHER (+395/-0) plainbox/plainbox/impl/secure/test_checkbox_trusted_launcher.py.OTHER (+280/-0) plainbox/plainbox/impl/test_box.py.OTHER (+260/-0) plainbox/plainbox/impl/test_job.py.OTHER (+370/-0) plainbox/setup.py.OTHER (+60/-0) po/ace.po (+5/-0) po/af.po (+5/-0) po/am.po (+5/-0) po/ar.po (+5/-0) po/ast.po (+5/-0) po/az.po (+5/-0) po/be.po (+5/-0) po/bg.po (+5/-0) po/bn.po (+5/-0) po/bo.po (+5/-0) po/br.po (+5/-0) po/bs.po (+5/-0) po/ca.po (+5/-0) po/ca@valencia.po (+5/-0) po/ckb.po (+5/-0) po/cs.po (+5/-0) po/cy.po (+5/-0) po/da.po (+5/-0) po/de.po (+5/-0) po/dv.po (+5/-0) po/el.po (+5/-0) po/en_AU.po (+5/-0) po/en_CA.po (+5/-0) po/en_GB.po (+5/-0) po/eo.po (+5/-0) po/es.po (+5/-0) po/et.po (+5/-0) po/eu.po (+5/-0) po/fa.po (+5/-0) po/fi.po (+5/-0) po/fr.po (+5/-0) po/ga.po (+5/-0) po/gd.po (+5/-0) po/gl.po (+5/-0) po/he.po (+5/-0) po/hi.po (+5/-0) po/hr.po (+5/-0) po/hu.po (+5/-0) po/hy.po (+5/-0) po/id.po (+5/-0) po/is.po (+5/-0) po/it.po (+5/-0) po/ja.po (+5/-0) po/jbo.po (+5/-0) po/ka.po (+5/-0) po/kk.po (+5/-0) po/km.po (+5/-0) po/kn.po (+5/-0) po/ko.po (+5/-0) po/ku.po (+5/-0) po/ky.po (+5/-0) po/lt.po (+5/-0) po/lv.po (+5/-0) po/mk.po (+5/-0) po/ml.po (+5/-0) po/mr.po (+5/-0) po/ms.po (+5/-0) po/my.po (+5/-0) po/nb.po (+5/-0) po/nds.po (+5/-0) po/ne.po (+5/-0) po/nl.po (+5/-0) po/nn.po (+5/-0) po/oc.po (+5/-0) po/pl.po (+5/-0) po/ps.po (+5/-0) po/pt.po (+5/-0) po/pt_BR.po (+5/-0) po/ro.po (+5/-0) po/ru.po (+5/-0) po/sd.po (+5/-0) po/shn.po (+5/-0) po/si.po (+5/-0) po/sk.po (+5/-0) po/sl.po (+5/-0) po/sq.po (+5/-0) po/sr.po (+5/-0) po/sv.po (+5/-0) po/ta.po (+5/-0) po/te.po (+5/-0) po/th.po (+5/-0) po/tr.po (+5/-0) po/ug.po (+5/-0) po/uk.po (+5/-0) po/ur.po (+5/-0) po/uz.po (+5/-0) po/vi.po (+5/-0) po/zh_CN.po (+5/-0) po/zh_HK.po (+5/-0) po/zh_TW.po (+5/-0) scripts/color_depth_info (+8/-0) Text conflict in debian/changelog Text conflict in debian/po/ast.po Text conflict in debian/po/cs.po Text conflict in debian/po/de.po Text conflict in debian/po/en_AU.po Text conflict in debian/po/en_GB.po Text conflict in debian/po/es.po Text conflict in debian/po/fr.po Text conflict in debian/po/gl.po Text conflict in debian/po/he.po Text conflict in debian/po/hu.po Text conflict in debian/po/id.po Text conflict in debian/po/it.po Text conflict in debian/po/ja.po Text conflict in debian/po/nl.po Text conflict in debian/po/oc.po Text conflict in debian/po/pl.po Text conflict in debian/po/pt_BR.po Text conflict in debian/po/ro.po Text conflict in debian/po/ru.po Text conflict in debian/po/tr.po Text conflict in debian/po/uk.po Text conflict in debian/po/zh_CN.po Text conflict in debian/po/zh_TW.po Text conflict in jobs/mediacard.txt.in Conflict adding files to plainbox. Created directory. Conflict because plainbox is not versioned, but has versioned children. Versioned directory. Contents conflict in plainbox/MANIFEST.in Contents conflict in plainbox/contrib/policykit_yes/org.freedesktop.policykit.pkexec.policy Conflict adding files to plainbox/docs. Created directory. Conflict because plainbox/docs is not versioned, but has versioned children. Versioned directory. Conflict adding files to plainbox/docs/dev. Created directory. Conflict because plainbox/docs/dev is not versioned, but has versioned children. Versioned directory. Contents conflict in plainbox/docs/dev/architecture.rst Contents conflict in plainbox/docs/dev/old.rst Contents conflict in plainbox/docs/dev/reference.rst Contents conflict in plainbox/docs/dev/resources.rst Contents conflict in plainbox/docs/usage.rst Contents conflict in plainbox/mk-venv.sh Conflict adding files to plainbox/plainbox. Created directory. Conflict because plainbox/plainbox is not versioned, but has versioned children. Versioned directory. Conflict adding files to plainbox/plainbox/impl. Created directory. Conflict because plainbox/plainbox/impl is not versioned, but has versioned children. Versioned directory. Contents conflict in plainbox/plainbox/impl/box.py Conflict adding files to plainbox/plainbox/impl/commands. Created directory. Conflict because plainbox/plainbox/impl/commands is not versioned, but has versioned children. Versioned directory. Contents conflict in plainbox/plainbox/impl/commands/checkbox.py Contents conflict in plainbox/plainbox/impl/commands/run.py Contents conflict in plainbox/plainbox/impl/commands/special.py Contents conflict in plainbox/plainbox/impl/commands/sru.py Contents conflict in plainbox/plainbox/impl/commands/test_run.py Contents conflict in plainbox/plainbox/impl/config.py Contents conflict in plainbox/plainbox/impl/job.py Contents conflict in plainbox/plainbox/impl/runner.py Conflict adding files to plainbox/plainbox/impl/secure. Created directory. Conflict because plainbox/plainbox/impl/secure is not versioned, but has versioned children. Versioned directory. Contents conflict in plainbox/plainbox/impl/secure/checkbox_trusted_launcher.py Contents conflict in plainbox/plainbox/impl/secure/test_checkbox_trusted_launcher.py Contents conflict in plainbox/plainbox/impl/test_box.py Contents conflict in plainbox/plainbox/impl/test_job.py Contents conflict in plainbox/setup.py Text conflict in po/ace.po Text conflict in po/af.po Text conflict in po/am.po Text conflict in po/ar.po Text conflict in po/ast.po Text conflict in po/az.po Text conflict in po/be.po Text conflict in po/bg.po Text conflict in po/bn.po Text conflict in po/bo.po Text conflict in po/br.po Text conflict in po/bs.po Text conflict in po/ca.po Text conflict in po/ca@valencia.po Text conflict in po/ckb.po Text conflict in po/cs.po Text conflict in po/cy.po Text conflict in po/da.po Text conflict in po/de.po Text conflict in po/dv.po Text conflict in po/el.po Text conflict in po/en_AU.po Text conflict in po/en_CA.po Text conflict in po/en_GB.po Text conflict in po/eo.po Text conflict in po/es.po Text conflict in po/et.po Text conflict in po/eu.po Text conflict in po/fa.po Text conflict in po/fi.po Text conflict in po/fr.po Text conflict in po/ga.po Text conflict in po/gd.po Text conflict in po/gl.po Text conflict in po/he.po Text conflict in po/hi.po Text conflict in po/hr.po Text conflict in po/hu.po Text conflict in po/hy.po Text conflict in po/id.po Text conflict in po/is.po Text conflict in po/it.po Text conflict in po/ja.po Text conflict in po/jbo.po Text conflict in po/ka.po Text conflict in po/kk.po Text conflict in po/km.po Text conflict in po/kn.po Text conflict in po/ko.po Text conflict in po/ku.po Text conflict in po/ky.po Text conflict in po/lt.po Text conflict in po/lv.po Text conflict in po/mk.po Text conflict in po/ml.po Text conflict in po/mr.po Text conflict in po/ms.po Text conflict in po/my.po Text conflict in po/nb.po Text conflict in po/nds.po Text conflict in po/ne.po Text conflict in po/nl.po Text conflict in po/nn.po Text conflict in po/oc.po Text conflict in po/pl.po Text conflict in po/ps.po Text conflict in po/pt.po Text conflict in po/pt_BR.po Text conflict in po/ro.po Text conflict in po/ru.po Text conflict in po/sd.po Text conflict in po/shn.po Text conflict in po/si.po Text conflict in po/sk.po Text conflict in po/sl.po Text conflict in po/sq.po Text conflict in po/sr.po Text conflict in po/sv.po Text conflict in po/ta.po Text conflict in po/te.po Text conflict in po/th.po Text conflict in po/tr.po Text conflict in po/ug.po Text conflict in po/uk.po Text conflict in po/ur.po Text conflict in po/uz.po Text conflict in po/vi.po Text conflict in po/zh_CN.po Text conflict in po/zh_HK.po Text conflict in po/zh_TW.po Text conflict in scripts/color_depth_info |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/saucy/checkbox/saucy-proposed-201308281228 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/saucy-proposed/checkbox reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/saucy/checkbox/saucy-proposed-201308281228. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.
If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https:/
(this is an automatically generated message)
Unmerged revisions
- 1884. By Daniel Manrique
-
* New upstream release (LP: #1180545):
* Launchpad automated translation updates
[ Alberto Milone ]
* scripts/graphics_ stress_ test, scripts/ rotation_ test: make sure to
always reset the "screen" variable. Somehow the NVIDIA driver manages
to make it unusable after the first time. (LP: #1172667)[ Brendan Donegan ]
* checkbox/parsers/ submission. py - publish kernel-release information to
interested parties.
* scripts/rendercheck_ test - change nargs='+' to action='append' for blacklist
option so it works as expected.
jobs/rendercheck. txt.in - blacklist gradients test as it is known to produce
false positives. (LP: #1093718)
* plugins/hexr_transport. py - added plugin for submitting to HEXR and
certification based on certify_new_transport from checkbox- certification.
examples/checkbox- qt.ini - blacklisted hexr_transport as we won't use it
examples/checkbox- cli.ini - blacklisted hexr_transport as we won't use it
examples/checkbox- urwid.ini - blacklisted hexr_transport as we won't use it [ Daniel Manrique ]
* Ensured that button strings from the "continue" dialog are translatable
(LP: #1176695)[ Jeff Lane ]
* checkbox/parsers/ cpuinfo. py - split on first instance of ':' in cpuinfo
output lines to avoid splitting into more than 2 items. Also fixed a pep8
issue discovered while working on this. (LP: #1180496)
* scripts/cpu_offlining: Modified script to no longer offline cpu0 to resolve
a bug on ARM. Modified output so most of it is redirected to stderr for
fail cases, we don't need that much for success cases. (LP: #1078897)
* jobs/mediacard.txt.in: Modified test instructions to be less confusing
(LP: #970857)
* scripts/cpu_topology: define the cpuinfo nested dicts on creation rather
than define elements during parsing of /proc/cpuinfo (LP: #1111878)
* scripts/lsmod_info: Corrected error handling for the check_output() call to
trap the correct error. (LP: #1103647)
* jobs/camera.txt.in: removed an extraneous requres line for gir1.2
scripts/camera_ test: added code to determine what version of gst we're
using and set video type and plugin accordingly. (LP: #1100594)
* scripts/network_ check: added ability to specify custom target URL for
debugging failures (LP: #1128017)
* scripts/removable_ storage_ test: Added error handling to trap OSError on
non-writable media and modified output to handle subsequent
ZeroDivisionError issues when summarizing test results.
jobs/media.txt. in: Modified instructions for SD/SDHC to specify using
UNLOCKED cards to avoid issues when testing read-only media (LP: #1153894)[ Sylvain Pineau ]
* jobs/suspend.txt.in, scripts/gpu_test: Remove the need of running the script
with the root user, restore the workspaces switch and the HTML5 video
playback ; remove the extra suspend/resume (LP: #1172851)
* checkbox/parsers/ udevadm. py: Only filter devices without product AND vendor
information (LP: #1167733)
