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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/trusty/lm-sensors

Martin Pitt: Approve on 2014-01-15

Diff: 5424 lines (+1106/-2370)

40 files modified

.pc/06-sensors-detect-debian.patch/prog/detect/sensors-detect (+128/-111)
.pc/08-sensors-detect-lm85.patch/prog/detect/sensors-detect (+128/-98)
.pc/09-sensors-detect-sch5524.patch/prog/detect/sensors-detect (+128/-98)
.pc/10-pwmconfig.patch/prog/pwm/pwmconfig (+0/-1019)
.pc/100_recommend_using_upstart.patch/prog/detect/sensors-detect (+128/-98)
.pc/11-fancontrol-check.patch/prog/pwm/fancontrol (+25/-9)
.pc/12-sensors-detect-superio-x86.patch/prog/detect/sensors-detect (+128/-98)
.pc/14-2-digits-kernel.patch/prog/detect/sensors-detect (+128/-98)
.pc/applied-patches (+0/-1)
CHANGES (+19/-0)
debian/changelog (+23/-0)
debian/control (+1/-1)
debian/fancontrol.init (+5/-5)
debian/fancontrol.service (+14/-0)
debian/lm-sensors.dirs (+0/-1)
debian/lm-sensors.docs (+0/-1)
debian/lm-sensors.service (+0/-1)
debian/patches/06-sensors-detect-debian.patch (+3/-16)
debian/patches/09-sensors-detect-sch5524.patch (+1/-1)
debian/patches/10-pwmconfig.patch (+0/-148)
debian/patches/11-fancontrol-check.patch (+1/-1)
debian/patches/12-sensors-detect-superio-x86.patch (+1/-1)
debian/patches/14-2-digits-kernel.patch (+1/-1)
debian/patches/series (+0/-1)
debian/rules (+13/-1)
doc/chips/MODPARMS (+0/-139)
doc/chips/SUMMARY (+0/-297)
doc/developers/lm_sensors.lsm (+4/-4)
doc/developers/smbus_company_id (+28/-0)
doc/donations (+4/-5)
doc/libsensors-API.txt (+1/-1)
lib/sensors.conf.5 (+6/-2)
prog/detect/sensors-detect (+128/-98)
prog/init/fancontrol.service (+13/-0)
prog/init/sensord.service (+13/-0)
prog/pwm/fancontrol (+25/-9)
prog/pwm/pwmconfig (+2/-2)
prog/sensors/main.c (+1/-1)
prog/sensors/sensors.1 (+5/-2)
version.h (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

26. By Matt Fischer on 2013-12-04

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

25. By Matt Fischer on 2013-05-09

* Merge from Debian unstable (LP: #1178520). Remaining changes:
  - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
    than init-script.

24. By Logan Rosen on 2012-11-05

* Merge from Debian unstable (LP: #1075010). Remaining changes:
  - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
    than init-script.
* Update 100_recommend_using_upstart.patch to reflect kmod transition.

23. By Colin Watson on 2012-10-05

Rebuild for new armel compiler default of ARMv5t.

22. By Chuck Short on 2012-02-21

* Merge from debian testing, remaining changes are:
  - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
    than init-script.

21. By Phillip Susi on 2011-12-07

* Merge from debian unstable. Remaining changes:
  - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
    than init-script.

20. By Micah Gersten on 2011-07-17

* Merge from debian unstable. (LP: #808769) Remaining changes:
  - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
    than init-script.

19. By Aurelien Jarno on 2009-09-16

* Drop the dependency on makedev, and remove the corresponding code
  from postinst (closes: bug#546871).
* Switch to debhelper 5.
* Bumped Standards-version to 3.8.3 (No changes).

18. By Aurelien Jarno on 2009-01-29

* New upstream version.
* Cleanup of debian/rules

17. By Aurelien Jarno on 2008-07-02

* New upstream version, with support for 2.6.26 kernels.
* Bumped Standards-version to 3.8.0 (No changes).