lp:~jfi/ubuntu/quantal/psensor/new-upstream

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/quantal/psensor at revision 14

Andrew Starr-Bochicchio (community): Approve on 2012-07-25

James Page: Pending requested 2012-07-20

Ubuntu branches: Pending requested 2012-07-20

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

18. By Jean-Philippe Orsini on 2012-07-18

Updated changelog:
 - added LP1021900.patch as remaining changes
 - added information about the drop of 2 patches with reason

17. By Jean-Philippe Orsini on 2012-07-16

Merged with last revision of lp:ubuntu/psensor

16. By Jean-Philippe Orsini on 2012-07-16

removed useless patches

15. By Jean-Philippe Orsini on 2012-07-13

* 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

14. By Jean-Philippe Orsini on 2012-07-13

drop patches which has been integrated into the 0.6.2.17 release of psensor

13. By Jean-Philippe Orsini on 2012-07-13

* merge with debian sid
* debian/control
   - replaced libcurl4-openssl-dev build dep to
     libcurl4-gnutls-dev. (Closes: #668180)
* New upstream release
    - Fixed sensor type displayed in sensor preferences. (Closes LP: #968912)
* debian/control
    - Switched to Standards-Version 3.9.3.
* debian/copyright
    - Changed end date to 2012.

12. By Chris J Arges on 2012-06-15

No change upload to get the latest version of libmicrohttpd.

11. By Jean-Philippe Orsini on 2012-03-30

* debian/patches/LP968912.patch
  - fixed displayed sensor type. (LP: #968912)

10. By Jean-Philippe Orsini on 2012-01-22

* debian/control
  + Modified build-dep to add libunity-dev. (Closes LP: #919962)
  + Applied wrap-and-sort.

9. By Jean-Philippe Orsini on 2012-01-22

* debian/control
  + Modified build-dep to libappindicator3-dev. (Closes LP: #919959)