Merge lp://staging/~noskcaj/ubuntu/vivid/gsmartcontrol/merge into lp://staging/ubuntu/vivid/gsmartcontrol
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~noskcaj/ubuntu/vivid/gsmartcontrol/merge |
| Merge into: | lp://staging/ubuntu/vivid/gsmartcontrol |
| Diff against target: |
1759 lines (+40/-1665) 7 files modified
.pc/04_compat_with_smartmontools_6.patch/src/applib/smartctl_parser.cpp (+0/-1636) .pc/05_fix_ATA_version.patch/src/applib/smartctl_parser.cpp (+1/-4) .pc/applied-patches (+1/-1) debian/changelog (+15/-0) debian/patches/04_compat_with_smartmontools_6.patch (+0/-23) debian/patches/compat_with_smartmontools_6.patch (+22/-0) debian/patches/series (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/vivid/gsmartcontrol/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
To post a comment you must log in.
Unmerged revisions
- 14. By Jackson Doak
-
* Merge from debian. Remaining changes:
- Add 05_fix_ATA_version. patch. Correctly report the ATA/SATA version
* Non-maintainer upload.
* Handle empty sections in recent versions of smartmontools; thanks to
Francesco Presel for the patch. Closes: #722989.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.