lp:~noskcaj/ubuntu/saucy/psensor/1.8
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/saucy/psensor/1.8
Branch merges
- Andrew Starr-Bochicchio (community): Approve
- Ubuntu branches: Pending requested
-
Diff: 30350 lines (+18579/-5383)142 files modified.pc/.quilt_patches (+0/-1)
.pc/.quilt_series (+0/-1)
.pc/.version (+0/-1)
Makefile.am (+24/-17)
Makefile.in (+74/-29)
NEWS (+135/-0)
README (+151/-111)
README.html (+677/-0)
aclocal.m4 (+50/-5)
config.h.in (+13/-16)
configure (+603/-314)
configure.ac (+54/-22)
debian/changelog (+76/-0)
debian/compat (+2/-1)
debian/control (+10/-6)
debian/psensor-common.install (+3/-0)
debian/psensor.install (+2/-0)
debian/rules (+1/-0)
doc/Makefile.am (+4/-0)
doc/Makefile.in (+467/-0)
doc/faq.html (+665/-0)
doc/faq.txt (+228/-0)
icons/hicolor/14x14/Makefile.in (+34/-2)
icons/hicolor/16x16/Makefile.in (+34/-2)
icons/hicolor/22x22/Makefile.in (+34/-2)
icons/hicolor/24x24/Makefile.in (+34/-2)
icons/hicolor/32x32/Makefile.in (+34/-2)
icons/hicolor/48x48/Makefile.am (+1/-1)
icons/hicolor/48x48/Makefile.in (+35/-3)
icons/hicolor/64x64/Makefile.in (+34/-2)
icons/hicolor/scalable/Makefile.in (+34/-2)
icons/ubuntu-mono-dark/apps/22/Makefile.in (+34/-2)
icons/ubuntu-mono-dark/status/22/Makefile.in (+34/-2)
icons/ubuntu-mono-light/status/22/Makefile.in (+34/-2)
po/LINGUAS (+2/-0)
po/POTFILES.in (+17/-10)
po/de.po (+680/-0)
po/es.po (+647/-0)
po/fr.po (+562/-394)
po/hu.po (+683/-0)
po/it.po (+682/-0)
po/lv.po (+654/-0)
po/psensor.pot (+504/-364)
po/pt_BR.po (+653/-0)
po/ru.po (+664/-0)
po/sl.po (+626/-0)
po/sr.po (+634/-0)
po/tr.po (+509/-369)
po/uk.po (+655/-0)
po/zh_CN.po (+540/-375)
src/Makefile.am (+30/-4)
src/Makefile.in (+129/-55)
src/cfg.c (+409/-320)
src/cfg.h (+50/-26)
src/compat.h (+0/-26)
src/description.txt (+9/-3)
src/glade/Makefile.am (+1/-0)
src/glade/Makefile.in (+35/-2)
src/glade/psensor-pref.glade (+703/-509)
src/glade/psensor.glade (+238/-0)
src/glade/sensor-edit.glade (+288/-102)
src/graph.c (+114/-68)
src/graph.h (+5/-2)
src/lib/Makefile.am (+15/-6)
src/lib/Makefile.in (+70/-33)
src/lib/amd.c (+145/-116)
src/lib/amd.h (+2/-2)
src/lib/bool.h (+30/-0)
src/lib/color.c (+7/-6)
src/lib/color.h (+17/-14)
src/lib/cpu.c (+4/-3)
src/lib/cpu.h (+1/-1)
src/lib/hdd.c (+0/-256)
src/lib/hdd.h (+9/-1)
src/lib/hdd_atasmart.c (+192/-0)
src/lib/hdd_hddtemp.c (+260/-0)
src/lib/lmsensor.c (+32/-22)
src/lib/lmsensor.h (+1/-1)
src/lib/log.c (+28/-1)
src/lib/log.h (+4/-1)
src/lib/measure.c (+2/-2)
src/lib/measure.h (+2/-5)
src/lib/nvidia.c (+14/-8)
src/lib/nvidia.h (+1/-1)
src/lib/p_io.c (+0/-296)
src/lib/p_io.h (+0/-70)
src/lib/pio.c (+105/-0)
src/lib/pio.h (+25/-0)
src/lib/psensor.c (+178/-67)
src/lib/psensor.h (+75/-39)
src/lib/psensor_json.c (+4/-3)
src/lib/psensor_json.h (+8/-2)
src/lib/slog.c (+195/-0)
src/lib/slog.h (+29/-0)
src/lib/url.c (+1/-1)
src/lib/url.h (+1/-1)
src/main.c (+200/-136)
src/psensor.1 (+13/-38)
src/psensor.schemas (+274/-0)
src/rsensor.c (+5/-5)
src/rsensor.h (+1/-1)
src/server/Makefile.am (+8/-2)
src/server/Makefile.in (+52/-9)
src/server/description.txt (+45/-1)
src/server/psensor-server.1 (+56/-6)
src/server/server.c (+114/-61)
src/server/server.h (+13/-6)
src/server/sysinfo.c (+8/-2)
src/server/sysinfo.h (+1/-1)
src/ui.c (+171/-158)
src/ui.h (+22/-6)
src/ui_appindicator.c (+102/-59)
src/ui_appindicator.h (+2/-1)
src/ui_color.c (+35/-16)
src/ui_color.h (+5/-5)
src/ui_graph.c (+18/-106)
src/ui_graph.h (+2/-2)
src/ui_notify.c (+32/-11)
src/ui_notify.h (+1/-1)
src/ui_pref.c (+32/-9)
src/ui_pref.h (+1/-1)
src/ui_sensorlist.c (+154/-203)
src/ui_sensorlist.h (+2/-14)
src/ui_sensorpref.c (+261/-200)
src/ui_sensorpref.h (+1/-1)
src/ui_status.c (+14/-3)
src/ui_status.h (+3/-1)
src/ui_unity.c (+9/-4)
src/ui_unity.h (+3/-2)
tests/Makefile.am (+44/-4)
tests/Makefile.in (+301/-24)
tests/checkpatch.pl (+288/-118)
tests/test-cppcheck.sh (+7/-0)
tests/test-io-dir-list.sh (+11/-0)
tests/test_io_dir_list.c (+105/-0)
tests/test_psensor_type_to_unit_str.c (+82/-0)
tests/test_psensor_value_to_str.c (+64/-0)
tests/test_url_encode.c (+79/-0)
tests/test_url_normalize.c (+76/-0)
www/Makefile.in (+34/-2)
www/psensor.js (+27/-22)
www/style.css (+6/-7)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 17. By Jackson Doak
-
* Merge from Debian unstable, remaining Ubuntu changes:
- Build depend on nvidia-settings build-dep on i386 and amd64.
- Build depend on libunity-dev and libappindicator3-dev for Unity support.
* Drop debian/patches/ allow_gtk_ deprecates. patch, it's fixed in debian - 15. By Iain Lane
-
Merge lp:~jfi/ubuntu/quantal/psensor/new-upstream-0-6-2-19
* New upstream release
+ fixed hide window on startup for gnome-shell. (Closes: #676361)
+ fixed size of the icon hicolor/48x48/psensor_ hot.png. (LP: #1029065)
* Removed LP1021900.patch: fixed upstream since 0.6.2.18.
* 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
-
* 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 - 13. By Jean-Philippe Orsini
-
* debian/
patches/ LP1021900. patch
- added degree Celcius symbol. (LP: #1021900) - 11. By Jean-Philippe Orsini
-
* debian/
patches/ LP968912. patch
- fixed displayed sensor type. (LP: #968912) - 10. By Jean-Philippe Orsini
-
* debian/control
+ Modified build-dep to add libunity-dev. (Closes LP: #919962)
+ Applied wrap-and-sort. - 9. By Jean-Philippe Orsini
-
* debian/control
+ Modified build-dep to libappindicator3-dev. (Closes LP: #919959) - 8. By Micah Gersten
-
* 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 amd64* Add a patch to drop the deprecated g_thread_init() call
- add debian/patches/ drop_g_ thread_ init.patch
- add debian/patches/ series
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/saucy/psensor