← Back to branch summary

~ubuntu-branches/ubuntu/precise/net-snmp/precise

« back to all changes in this revision

Viewing changes to debian/patches/103-fix-ubuntu-lmsensors.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-11-26 01:27:00 UTC
  • mfrom: (1.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20091126012700-pox7w0a5j2x305h9
Tags: 5.4.2.1~dfsg-3ubuntu1
https://launchpad.net/bugs/104738
https://launchpad.net/bugs/254261
https://launchpad.net/bugs/250459
https://launchpad.net/bugs/426813
* Merge from debian testing.  Remaining changes:
  - Set Ubuntu maintainer address.
  - net-snmp-config: Use bash. (LP: #104738)
  - Removed multiuser option when calling update-rc.d. (LP: #254261)
  - debian/snmpd.init: LSBify the init script.
  - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcmd.1
    (LP: #250459)
  - debian/patches/99-fix-ubuntu-div0.patch: Fix dvision by zero.
    (LP: #426813).
 * Dropped patches:
   - debian/patches/101-fix-ipalias.patch: Applied upstream.
   - debian/patches/99-fix-net-snmp-syslog.patch: Applied upstream.
   - debian/patches/99-fix-perl-counter-in-subagent.patch: Applied upstream.
   - ebian/patches/103-fix-ubuntu-lmsensors.patch: No longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/103-fix-ubuntu-lmsensors.patch
1
 
diff -Naurp net-snmp-5.4.1.orig/agent/mibgroup/ucd-snmp/lmSensors.c net-snmp-5.4.1/agent/mibgroup/ucd-snmp/lmSensors.c
2
 
--- net-snmp-5.4.1.orig/agent/mibgroup/ucd-snmp/lmSensors.c     2006-10-31 10:16:27.000000000 -0500
3
 
+++ net-snmp-5.4.1/agent/mibgroup/ucd-snmp/lmSensors.c  2009-09-14 12:58:09.000000000 -0400
4
 
@@ -89,7 +89,7 @@
5
 
     #include </usr/platform/sun4u/include/sys/envctrl.h>
6
 
 #else
7
 
     #include <sensors/sensors.h>
8
 
-    #define CONFIG_FILE_NAME "/etc/sensors.conf"
9
 
+    #define CONFIG_FILE_NAME "/etc/sensors3.conf"
10
 
 #endif
11
 
 
12
 
 #include "lmSensors.h"