Merge lp://qastaging/~logan/ubuntu/quantal/smartmontools/new-upstream into lp://qastaging/ubuntu/quantal/smartmontools
Proposed by
Logan Rosen
| Status: | Merged |
|---|---|
| Merged at revision: | 29 |
| Proposed branch: | lp://qastaging/~logan/ubuntu/quantal/smartmontools/new-upstream |
| Merge into: | lp://qastaging/ubuntu/quantal/smartmontools |
| Diff against target: |
26022 lines (+16644/-8643) 53 files modified
.pc/52_remove-pragma.diff/atacmds.h (+0/-995) .pc/53_use-smartd-runner-by-default.diff/smartd.conf (+0/-144) .pc/54_remove-Id-from-smartd.conf.diff/smartd.conf (+0/-144) .pc/61_cciss-doc.patch/smartd.8.in (+0/-791) .pc/61_cciss-doc.patch/smartd.conf (+0/-142) .pc/61_cciss-doc.patch/smartd.conf.5.in (+0/-1586) .pc/63_removable.patch/smartd.conf (+0/-148) .pc/applied-patches (+0/-8) .pc/fix-generic.diff/os_generic.cpp (+0/-281) .pc/kfreebsd.patch/cciss.cpp (+0/-235) .pc/manpage.diff/smartd.conf.5.in (+0/-1597) CHANGELOG (+38/-1) Doxyfile (+0/-241) Makefile.am (+6/-6) Makefile.in (+1893/-0) NEWS (+4/-3) aclocal.m4 (+1046/-0) atacmds.h (+15/-0) autogen.sh (+2/-2) cciss.cpp (+0/-4) config.guess (+1522/-0) config.h.in (+205/-0) config.sub (+1766/-0) configure (+8322/-0) configure.in (+4/-4) debian/changelog (+8/-0) debian/control (+3/-2) debian/rules (+3/-1) depcomp (+688/-0) do_release (+0/-146) drivedb.h (+35/-7) install-sh (+527/-0) m4/pkg.m4 (+158/-0) missing (+331/-0) os_freebsd.cpp (+3/-2) os_generic.cpp (+0/-1) os_linux.cpp (+2/-2) os_os2.cpp (+0/-554) os_os2.h (+0/-70) os_os2/configure.os2 (+0/-9) os_os2/hdreg.h (+0/-333) os_win32.cpp (+11/-7) os_win32/runcmd_vc10.vcxproj (+0/-85) os_win32/smartctl_vc10.vcxproj (+0/-304) os_win32/smartctl_vc10.vcxproj.filters (+0/-154) os_win32/smartd_vc10.vcxproj (+0/-301) os_win32/smartd_vc10.vcxproj.filters (+0/-154) os_win32/smartmontools_vc10.sln (+0/-38) os_win32/syslogevt_vc10.vcxproj (+0/-103) smartctl.8.in (+41/-8) smartd.8.in (+0/-4) smartd.conf (+3/-7) smartd.conf.5.in (+8/-19) |
| To merge this branch: | bzr merge lp://qastaging/~logan/ubuntu/quantal/smartmontools/new-upstream |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Luke Yelavich (community) | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Uploaded, thanks for your work. I accidentally posted a comment to the bug referred to in the changelog, and I suggested there that you might also consider preparing a package for Debian, since Debian has a bug requesting the newest upstream release which you ahve packaged.
Thanks again.