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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/trusty/psensor

Martin Pitt: Approve on 2014-04-09

Diff: 303 lines (+285/-0)

3 files modified

debian/changelog (+10/-0)
debian/patches/fix_appindicator_icons.patch (+274/-0)
debian/patches/series (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1290072: psensor icon in top bar too big

Undecided

Fix Released

Link a bug report

Related blueprints

21. By Jean-Philippe Orsini on 2014-04-09

* 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.
* icons/ubuntu-mono-*/status/22/*.svg
 - fixed icons size. (LP: #1290072).

20. By Jackson Doak on 2013-05-27

* 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

19. By Jean-Philippe Orsini on 2013-05-27

* added debian/patches/allow_gtk_deprecates.patch: to workaround
  compilation failure with new gtk release. (LP: #1184442)
* debian/control: switched to 3.9.4 Standards Version.
* Remaining changes:
  + Modifed build-dep to add NVidia and Application Indicator support
  + Only add an nvidia-settings build-dep on i386 and amd6

18. By Andrew Starr-Bochicchio on 2013-01-27

* 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.

17. 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

16. By Iain Lane on 2012-10-02

Manually reverse patch. bzr and quilt /o\

15. By Iain Lane on 2012-10-02

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 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.