Merge lp://staging/~javier.collado/ubuntu/precise/checkbox/0.13.4 into lp://staging/ubuntu/precise/checkbox
| Status: | Merged |
|---|---|
| Merge reported by: | Javier Collado |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~javier.collado/ubuntu/precise/checkbox/0.13.4 |
| Merge into: | lp://staging/ubuntu/precise/checkbox |
| Diff against target: |
8665 lines (+4575/-636) 21 files modified
checkbox/lib/process.py (+1/-1) checkbox/parsers/udevadm.py (+5/-3) debian/changelog (+62/-27) debian/checkbox-gtk.install (+0/-1) debian/control (+1/-1) debian/po/cs.po (+119/-0) debian/po/oc.po (+119/-0) gtk/checkbox-gtk.desktop.in (+0/-11) jobs/disk.txt.in (+6/-6) jobs/local.txt.in (+114/-38) jobs/wireless.txt.in (+6/-6) plugins/backend_info.py (+2/-2) po/POTFILES.in (+1/-1) po/de.po (+158/-106) po/nl.po (+263/-137) po/ru.po (+129/-109) po/sd.po (+2994/-0) po/uk.po (+375/-121) scripts/create_connection (+23/-8) scripts/removable_storage_test (+196/-57) setup.cfg (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~javier.collado/ubuntu/precise/checkbox/0.13.4 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach | Approve | ||
|
Review via email:
|
|||
Description of the change
* New upstream release (LP: #949983)
* Automated translation file updates from Launchpad
* Added 'scsi' as a valid bus ID for determining product in udevadm.py
(LP: #940249)
* Added 'cciss' as a valid bus ID for determining product in udevadm.py
(LP: #942548)
* Updated command fields in composite disk jobs to address the ! in
some disk paths (LP: #942769)
* Updated create_connection to poll for registration of connection and
then attempt to bring it up (LP: #944662)
* Fixed command run by wireless_connection tests so that they fail if the
internet_test fails, but still clean up the connection file (LP: #944176)
* Fixed wireless_
(LP: #947163)
* Added python-cairo as a dependency for checkbox-gtk (LP: #940163)
* Tidied up logic for determining DISK device product and vendor
(LP: #942548)
* Fixed filename matching expression for local jobs (LP: #942273)
* Fixed duplicate System Testing applications after upgrade (LP: #940627)
* Modifications to removable_
media is not mounted prior to test running. (LP: #944623)
| Javier Collado (javier.collado) wrote | # |
In this merge request, the diff shows some changes in debian/changelog before 0.13.4. Those changes are just because I removed trailing blanks in my editor. Please ignore any change in debian/changelog prior to 0.13.4.