lp:~psusi/ubuntu/precise/lm-sensors/merge

Branch merges

Merged into lp:ubuntu/precise/lm-sensors

Serge Hallyn: Approve on 2011-12-22

Ubuntu branches: Pending requested 2011-12-08

Diff: 17629 lines (+1335/-13978)

38 files modified

.pc/02-sensors-conf-convert-improvements.patch/etc/sensors-conf-convert (+1/-1)
.pc/06-sensors-detect-debian.patch/prog/detect/sensors-detect (+197/-102)
.pc/07-sensors3.conf-local-changes.patch/etc/sensors.conf.default (+11/-2)
.pc/08-sensors-detect-lm85.patch/prog/detect/sensors-detect (+181/-102)
.pc/09-sensors-detect-sch5524.patch/prog/detect/sensors-detect (+181/-102)
.pc/100_recommend_using_upstart.patch/prog/detect/sensors-detect (+178/-99)
.pc/12-upstream-patches.patch/prog/detect/sensors-detect (+0/-6626)
.pc/13-udev-run.patch/prog/detect/sensors-detect (+0/-6626)
.pc/14-2-digits-kernel.patch/prog/detect/sensors-detect (+178/-99)
.pc/applied-patches (+0/-2)
CHANGES (+18/-0)
debian/changelog (+16/-0)
debian/patches/06-sensors-detect-debian.patch (+19/-3)
debian/patches/08-sensors-detect-lm85.patch (+1/-1)
debian/patches/09-sensors-detect-sch5524.patch (+1/-1)
debian/patches/100_recommend_using_upstart.patch (+4/-4)
debian/patches/12-upstream-patches.patch (+0/-26)
debian/patches/13-udev-run.patch (+0/-11)
debian/patches/14-2-digits-kernel.patch (+5/-2)
debian/patches/series (+0/-2)
debian/source/options (+1/-0)
doc/developers/lm_sensors.lsm (+4/-4)
doc/libsensors-API.txt (+1/-1)
doc/progs (+1/-1)
doc/svn (+3/-3)
etc/sensors-conf-convert (+1/-1)
etc/sensors.conf.default (+11/-2)
prog/detect/sensors-detect (+178/-99)
prog/dump/isadump.8 (+11/-2)
prog/dump/isadump.c (+24/-12)
prog/dump/isaset.8 (+11/-2)
prog/dump/isaset.c (+41/-34)
prog/dump/util.c (+36/-0)
prog/dump/util.h (+2/-0)
prog/hotplug/README.p4b (+3/-4)
prog/hotplug/unhide_ICH_SMBus (+1/-1)
prog/init/lm_sensors.service (+14/-0)
version.h (+1/-1)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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.
* New upstream version:
  - Drop 12-upstream-patches.patch.
  - Drop 13-udev-run.patch.

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

16. By Aurelien Jarno on 2008-04-06

Parse the configuration file in C locales (closes: bug#421286).

15. By Matthias Klose on 2007-12-12

* Merge with Debian; remaining changes:
  - Link using -Bsymbolic-functions.

14. By Matthias Klose on 2007-12-06

* Merge with Debian; remaining changes:
  - Remove stop links from rc0 and rc6.
  - lsb init script
  - Don't ship modprobe directories.
* Link using -Bsymbolic-functions.

13. By Matthias Klose on 2007-08-09

* Merge with Debian; remaining changes:
  - remove stop links from rc0 and rc6
  - lsb init script
  - don't ship modprobe directories

12. By Matthias Klose on 2007-05-24

* Merge with Debian; remaining changes:
  - remove stop links from rc0 and rc6
  - lsb init script
  - don't ship modprobe directories