Merge lp://staging/~jfi/ubuntu/quantal/psensor/new-upstream into lp://staging/ubuntu/quantal/psensor
| Status: | Merged |
|---|---|
| Merged at revision: | 14 |
| Proposed branch: | lp://staging/~jfi/ubuntu/quantal/psensor/new-upstream |
| Merge into: | lp://staging/ubuntu/quantal/psensor |
| Diff against target: |
2846 lines (+188/-1677) 76 files modified
.pc/LP1021900.patch/src/lib/psensor.c (+0/-461) .pc/LP968912.patch/src/lib/psensor.c (+0/-461) .pc/applied-patches (+0/-3) .pc/drop_g_thread_init.patch/src/main.c (+0/-539) NEWS (+7/-0) configure (+10/-10) configure.ac (+1/-1) debian/changelog (+30/-0) debian/control (+2/-2) debian/copyright (+2/-2) debian/patches/LP968912.patch (+0/-59) debian/patches/drop_g_thread_init.patch (+0/-16) debian/patches/series (+0/-2) po/fr.po (+9/-9) po/psensor.pot (+12/-12) po/tr.po (+12/-12) po/zh_CN.po (+12/-12) src/cfg.c (+1/-1) src/cfg.h (+1/-1) src/compat.h (+1/-1) src/graph.c (+1/-1) src/graph.h (+1/-1) src/lib/amd.c (+3/-11) src/lib/amd.h (+2/-1) src/lib/color.c (+1/-1) src/lib/color.h (+1/-1) src/lib/cpu.c (+1/-1) src/lib/cpu.h (+1/-1) src/lib/hdd.c (+1/-1) src/lib/hdd.h (+1/-1) src/lib/lmsensor.c (+1/-1) src/lib/lmsensor.h (+1/-1) src/lib/log.c (+1/-1) src/lib/log.h (+1/-1) src/lib/measure.c (+1/-1) src/lib/measure.h (+1/-1) src/lib/nvidia.c (+1/-1) src/lib/nvidia.h (+1/-1) src/lib/p_io.c (+1/-1) src/lib/p_io.h (+1/-1) src/lib/psensor.c (+2/-2) src/lib/psensor.h (+1/-1) src/lib/psensor_json.c (+1/-1) src/lib/psensor_json.h (+1/-1) src/lib/url.c (+1/-1) src/lib/url.h (+1/-1) src/main.c (+25/-3) src/psensor.1 (+2/-2) src/rsensor.c (+1/-1) src/rsensor.h (+1/-1) src/server/psensor-server.1 (+2/-2) src/server/server.c (+2/-2) src/server/server.h (+1/-1) src/server/sysinfo.c (+1/-1) src/server/sysinfo.h (+1/-1) src/ui.c (+2/-2) src/ui.h (+1/-1) src/ui_appindicator.c (+1/-1) src/ui_appindicator.h (+1/-1) src/ui_color.c (+1/-1) src/ui_color.h (+1/-1) src/ui_graph.c (+1/-1) src/ui_graph.h (+1/-1) src/ui_notify.c (+1/-1) src/ui_notify.h (+1/-1) src/ui_pref.c (+1/-1) src/ui_pref.h (+1/-1) src/ui_sensorlist.c (+1/-1) src/ui_sensorlist.h (+1/-1) src/ui_sensorpref.c (+1/-1) src/ui_sensorpref.h (+1/-1) src/ui_status.c (+1/-1) src/ui_status.h (+1/-1) src/ui_unity.c (+1/-1) src/ui_unity.h (+1/-1) www/psensor.js (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~jfi/ubuntu/quantal/psensor/new-upstream |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrew Starr-Bochicchio (community) | Approve | ||
| James Page | Pending | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2012-07-13.
Description of the change
Merge from debian testing to update to new upstream release which removes 2 patches in the Ubuntu package.
The new debian packaging is changing builddep libcurl4-
The new upstream release is modifying:
- src/lib/amd.c which is not compiled on ubuntu
- src/main.c to remove the call of g_thread_init (corresponding to the ubuntu patch drop_g_
- src/lib/psensor.c to fix LP #968912 (corresponding to the ubuntu patch LP968912.patch)
- all sources files to update the end date of the copyright
It should fix the 2 conflicts files reported by 'merge-o-matic' see https:/
| Jean-Philippe Orsini (jfi) wrote | # |
| Andrew Starr-Bochicchio (andrewsomething) wrote | # |
| Jean-Philippe Orsini (jfi) wrote | # |
Hi Jean-Philippe
Thanks for taking the time to prepare this merge from Debian unstable.
You need to document what has happened to all of the changes that where made since this package was last merged from Debian in the changelog entry for 0.6.2.17-2ubuntu1; if patches or changes have been dropped this should be documented with reasons why.
Please update
Thanks.