lp:~jfi/ubuntu/quantal/psensor/new-upstream-0-6-2-19

Branch merges

Propose for merging

No branches dependent on this one.

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

Iain Lane: Approve on 2012-10-02

Ubuntu branches: Pending requested 2012-08-31

Diff: 3456 lines (+664/-1032)

36 files modified

.pc/LP1021900.patch/src/lib/psensor.c (+0/-461)
.pc/applied-patches (+0/-1)
Makefile.in (+64/-42)
NEWS (+16/-1)
aclocal.m4 (+44/-24)
configure (+19/-16)
configure.ac (+1/-1)
debian/changelog (+12/-0)
debian/patches/LP1021900.patch (+0/-26)
debian/patches/series (+0/-1)
icons/hicolor/14x14/Makefile.in (+19/-10)
icons/hicolor/16x16/Makefile.in (+19/-10)
icons/hicolor/22x22/Makefile.in (+19/-10)
icons/hicolor/24x24/Makefile.in (+19/-10)
icons/hicolor/32x32/Makefile.in (+19/-10)
icons/hicolor/48x48/Makefile.in (+19/-10)
icons/hicolor/64x64/Makefile.in (+19/-10)
icons/hicolor/scalable/Makefile.in (+19/-10)
icons/ubuntu-mono-dark/apps/22/Makefile.in (+19/-10)
icons/ubuntu-mono-dark/status/22/Makefile.in (+19/-10)
icons/ubuntu-mono-light/status/22/Makefile.in (+19/-10)
po/LINGUAS (+9/-1)
po/fr.po (+78/-143)
po/psensor.pot (+1/-5)
po/tr.po (+5/-24)
po/zh_CN.po (+91/-107)
src/Makefile.in (+20/-11)
src/glade/Makefile.in (+19/-10)
src/lib/Makefile.in (+13/-8)
src/lib/psensor.c (+2/-2)
src/main.c (+8/-8)
src/psensor.1 (+1/-1)
src/server/Makefile.in (+20/-11)
src/server/psensor-server.1 (+1/-1)
tests/Makefile.in (+12/-7)
www/Makefile.in (+19/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1029065: usr/share/icons/hicolor/48x48/apps/psensor_hot.png has wrong size and wrong look

Undecided

Fix Released

Link a bug report

Related blueprints

16. By Jean-Philippe Orsini on 2012-08-31

fixed bullet indentation

15. By Jean-Philippe Orsini on 2012-08-21

* 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 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
  + 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 on 2012-07-07

* debian/patches/LP1021900.patch
  - added degree Celcius symbol. (LP: #1021900)

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)

8. By Micah Gersten on 2012-01-21

* 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

7. By Micah Gersten on 2011-10-26

* 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