~mfisch/ubuntu/trusty/lm-sensors/merge-to-3.3.4

Viewing all changes in revision 26.

  • Committer: Matthew Fischer
  • Date: 2013-12-04 02:20:46 UTC
  • mfrom: (2.1.12 sid)
  • Revision ID: matthew.fischer@canonical.com-20131204022046-eeorueauw00r3m84
* Merge from Debian unstable (LP: #1256671). Remaining changes:
  - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
    than init-script.
* debian/fancontrol.init: pass the config file location as argument of
  the fancontrol daemon (closes: #720213).
* New upstream version.
* Use dh-systemd to get proper systemd related maintainer scripts,
  based on a patch from Michael Stapelberg (closes: #714190).

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: