← Back to branch summary

~jfi/ubuntu/trusty/psensor/fix-LP1290072

~jfi/ubuntu/trusty/psensor/fix-LP1290072

Viewing all changes in revision 14.

Committer: Package Import Robot
Author(s): Jean-Philippe Orsini
Date: 2012-07-13 02:22:18 UTC
mfrom: (3.1.6 sid)
Revision ID: package-import@ubuntu.com-20120713022218-oyyxo4sjonw5wn7h

Tags: 0.6.2.17-2ubuntu1

* Merge from Debian testing.  Remaining changes:
  + Modifed build-dep to add NVidia and Application Indicator support
  + Only add an nvidia-settings build-dep on i386 and amd6
  + debian/patches/LP1021900.patch: added degree Celcius symbol
* Remove drop_g_thread_init.patch: fixed upstream since 0.6.2.17
* Remove LP968912.patch: fixed upstream since 0.6.2.17

files removed:
.pc/LP968912.patch

.pc/LP968912.patch/src

.pc/LP968912.patch/src/lib

.pc/LP968912.patch/src/lib/psensor.c

.pc/drop_g_thread_init.patch

.pc/drop_g_thread_init.patch/src

.pc/drop_g_thread_init.patch/src/main.c

debian/patches/LP968912.patch

debian/patches/drop_g_thread_init.patch

files modified:
.pc/applied-patches

NEWS

configure

configure.ac

debian/changelog

debian/control

debian/copyright

debian/patches/series

po/fr.gmo

po/fr.po

po/psensor.pot

po/tr.gmo

po/tr.po

po/zh_CN.gmo

po/zh_CN.po

src/cfg.c

src/cfg.h

src/compat.h

src/graph.c

src/graph.h

src/lib/amd.c

src/lib/amd.h

src/lib/color.c

src/lib/color.h

src/lib/cpu.c

src/lib/cpu.h

src/lib/hdd.c

src/lib/hdd.h

src/lib/lmsensor.c

src/lib/lmsensor.h

src/lib/log.c

src/lib/log.h

src/lib/measure.c

src/lib/measure.h

src/lib/nvidia.c

src/lib/nvidia.h

src/lib/p_io.c

src/lib/p_io.h

src/lib/psensor.h

src/lib/psensor_json.c

src/lib/psensor_json.h

src/lib/url.c

src/lib/url.h

src/main.c

src/psensor.1

src/rsensor.c

src/rsensor.h

src/server/psensor-server.1

src/server/server.c

src/server/server.h

src/server/sysinfo.c

src/server/sysinfo.h

src/ui.c

src/ui.h

src/ui_appindicator.c

src/ui_appindicator.h

src/ui_color.c

src/ui_color.h

src/ui_graph.c

src/ui_graph.h

src/ui_notify.c

src/ui_notify.h

src/ui_pref.c

src/ui_pref.h

src/ui_sensorlist.c

src/ui_sensorlist.h

src/ui_sensorpref.c

src/ui_sensorpref.h

src/ui_status.c

src/ui_status.h

src/ui_unity.c

src/ui_unity.h

www/psensor.js

Show diffs side-by-side

added added

removed removed

.pc/LP968912.patch/

.pc/LP968912.patch/src/

.pc/LP968912.patch/src/lib/

.pc/LP968912.patch/src/lib/psensor.c

.pc/applied-patches

.pc/drop_g_thread_init.patch/

.pc/drop_g_thread_init.patch/src/

.pc/drop_g_thread_init.patch/src/main.c

debian/changelog

debian/copyright

debian/patches/LP968912.patch

debian/patches/drop_g_thread_init.patch

debian/patches/series

src/lib/color.c

src/lib/color.h

src/lib/lmsensor.c

src/lib/lmsensor.h

src/lib/measure.c

src/lib/measure.h

src/lib/nvidia.c

src/lib/nvidia.h

src/lib/psensor.h

src/lib/psensor_json.c

src/lib/psensor_json.h

src/server/psensor-server.1

src/server/server.c

src/server/server.h

src/server/sysinfo.c

src/server/sysinfo.h

src/ui_appindicator.c

src/ui_appindicator.h

src/ui_notify.c

src/ui_notify.h

src/ui_sensorlist.c

src/ui_sensorlist.h

src/ui_sensorpref.c

src/ui_sensorpref.h

src/ui_status.c

src/ui_status.h

Older »