diff -u lm-sensors-3-3.1.0/debian/control lm-sensors-3-3.1.0/debian/control --- lm-sensors-3-3.1.0/debian/control +++ lm-sensors-3-3.1.0/debian/control @@ -2,7 +2,8 @@ Section: utils Priority: extra Build-Depends: debhelper (>= 4.1.16), quilt, bison, flex, librrd2-dev -Maintainer: Aurelien Jarno +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Aurelien Jarno Standards-Version: 3.8.0 Homepage: http://www.lm-sensors.org diff -u lm-sensors-3-3.1.0/debian/changelog lm-sensors-3-3.1.0/debian/changelog --- lm-sensors-3-3.1.0/debian/changelog +++ lm-sensors-3-3.1.0/debian/changelog @@ -1,3 +1,10 @@ +lm-sensors-3 (1:3.1.0-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #389031), remaining changes: + - add debian/patches/08-use-LDFLAGS.patch to take LDFLAGS into account + + -- Muharem Hrnjadovic Thu, 18 Jun 2009 16:36:49 +0200 + lm-sensors-3 (1:3.1.0-2) unstable; urgency=low * lm-sensors.preinst: make sure that the directory exists before @@ -23,6 +30,36 @@ -- Aurelien Jarno Thu, 05 Mar 2009 01:30:18 +0100 +lm-sensors-3 (1:3.0.2-2ubuntu4) jaunty; urgency=low + + * debian/lm-sensors.i2c.modprobe: Remove, the kernel has been fixed to + supply the necessary alias + * debian/rules: Drop call to dh_installmodules + + -- Scott James Remnant Thu, 05 Mar 2009 17:46:26 +0000 + +lm-sensors-3 (1:3.0.2-2ubuntu3) jaunty; urgency=low + + * handle default ubuntu LDFLAGS for linking option (LP: #321632) + - Remove the old hack directly pushed in lib/Module.mk (now + lib/Module.mk if from pristine source) + - add debian/patches/07-use-LDFLAGS.patch to take LDFLAGS into account + + -- Didier Roche Mon, 26 Jan 2009 22:18:22 +0100 + +lm-sensors-3 (1:3.0.2-2ubuntu2) jaunty; urgency=low + + * No-change rebuild for librrd2 -> librrd4 transistion. + + -- Steve Kowalik Wed, 10 Dec 2008 14:25:54 -0800 + +lm-sensors-3 (1:3.0.2-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #299205) + - Link using -Bsymbolic-functions. + + -- Didier Roche Mon, 17 Nov 2008 21:28:27 +0100 + lm-sensors-3 (1:3.0.2-2) unstable; urgency=low * Remove stop links from rc0 and rc6 (closes: bug#495547). @@ -34,6 +71,28 @@ -- Aurelien Jarno Thu, 04 Sep 2008 12:40:12 +0200 +lm-sensors-3 (1:3.0.2-1ubuntu3) jaunty; urgency=low + + * Rebuild to fix dependencies in armel packages. + + -- Matthias Klose Wed, 19 Nov 2008 15:12:29 +0000 + +lm-sensors-3 (1:3.0.2-1ubuntu2) intrepid; urgency=low + + * Replace "multiuser" deprecated init mode in debian/rules with manual + arguments. Adapt the corresponding change in LSB init script header and + runtime dependency in debian/control (LP: #254259) + + -- Didier Roche Fri, 15 Aug 2008 17:22:59 +0200 + +lm-sensors-3 (1:3.0.2-1ubuntu1) intrepid; urgency=low + + * Merge with Debian; remaining changes: + - Remove stop links from rc0 and rc6. + - Link using -Bsymbolic-functions. + + -- Matthias Klose Mon, 23 Jun 2008 22:01:07 +0200 + lm-sensors-3 (1:3.0.2-1) unstable; urgency=low * New upstream version. @@ -89,6 +148,58 @@ -- Aurelien Jarno Thu, 03 Jan 2008 11:11:02 +0100 +lm-sensors-3 (1:3.0.0-4ubuntu1) hardy; urgency=low + + * Merge with Debian; remaining changes: + - Remove stop links from rc0 and rc6. + - lsb init script. + - Don't ship modprobe directories. + - Link using -Bsymbolic-functions. + + -- Matthias Klose Wed, 12 Dec 2007 00:31:15 +0100 + +lm-sensors-3 (1:3.0.1-4) unstable; urgency=low + + * Fix labels/compute/set override (closes: bug#474596). + + -- Aurelien Jarno Sun, 13 Apr 2008 01:15:52 +0200 + +lm-sensors-3 (1:3.0.1-3) unstable; urgency=low + + * Remove /etc/modutils/i2c in preinst script (closes: bug#470611). + * Parse the configuration file in C locale (closes: bug#469333). + + -- Aurelien Jarno Tue, 18 Mar 2008 17:23:40 +0100 + +lm-sensors-3 (1:3.0.1-2) unstable; urgency=medium + + * Don't try to convert the configuration file from version 2, let the user + do this task (closes: bug#468862, bug#467056). + * Suggest i2c-tools instead of i2c (closes: bug#460997). + * Rework debian/copyright. + * Add an iniscript for fancontrol (closes: bug#400770). + * Set minimum load average value to 0 in sensord (closes: bug#446313). + + -- Aurelien Jarno Sun, 02 Mar 2008 22:24:39 +0100 + +lm-sensors-3 (1:3.0.1-1) unstable; urgency=low + + * New upstream version. + * Make /etc/init.d/lm-sensors LSB compliant. + + -- Aurelien Jarno Thu, 31 Jan 2008 18:03:33 +0100 + +lm-sensors-3 (1:3.0.0-5) unstable; urgency=low + + * Move sensors3.conf file to libsensors4. + * Only convert /etc/sensors.conf into /etc/sensors3.conf if the former has + been modified. Otherwise, install the default file. + * Fix voltage value references in compute statements in the default + configuration file and in the configuration file converter + (closes: bug#456774). + + -- Aurelien Jarno Thu, 03 Jan 2008 11:11:02 +0100 + lm-sensors-3 (1:3.0.0-4) unstable; urgency=medium * Apply upstream fix for sensord. @@ -101,6 +212,16 @@ -- Aurelien Jarno Fri, 07 Dec 2007 00:53:24 +0100 +lm-sensors-3 (1:3.0.0-2ubuntu1) hardy; urgency=low + + * Merge with Debian; remaining changes: + - Remove stop links from rc0 and rc6. + - lsb init script. + - Don't ship modprobe directories. + * Link using -Bsymbolic-functions. + + -- Matthias Klose Thu, 06 Dec 2007 17:57:09 +0000 + lm-sensors-3 (1:3.0.0-2) unstable; urgency=low * Only install isaset and isadump on i386 and amd64. @@ -138,6 +259,15 @@ -- Aurelien Jarno Wed, 12 Sep 2007 17:30:06 +0200 +lm-sensors (1:2.10.4-1ubuntu1) gutsy; urgency=low + + * Merge with Debian; remaining changes: + - remove stop links from rc0 and rc6 + - lsb init script + - don't ship modprobe directories + + -- Matthias Klose Thu, 09 Aug 2007 10:34:46 +0200 + lm-sensors (1:2.10.4-1) unstable; urgency=low * New upstream release. @@ -148,6 +278,15 @@ -- Aurelien Jarno Fri, 20 Jul 2007 15:47:11 +0200 +lm-sensors (1:2.10.3-1ubuntu1) gutsy; urgency=low + + * Merge with Debian; remaining changes: + - remove stop links from rc0 and rc6 + - lsb init script + - don't ship modprobe directories + + -- Matthias Klose Thu, 24 May 2007 11:33:18 +0200 + lm-sensors (1:2.10.3-1) unstable; urgency=low * New upstream release. @@ -161,6 +300,22 @@ -- Aurelien Jarno Mon, 5 Mar 2007 01:38:06 +0100 +lm-sensors (1:2.10.1-2ubuntu2) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + * Set Ubuntu maintainer address. + + -- Matthias Klose Mon, 5 Mar 2007 01:22:20 +0000 + +lm-sensors (1:2.10.1-2ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - remove stop links from rc0 and rc6 + - lsb init script + - don't ship modprobe directories + + -- Scott James Remnant Tue, 28 Nov 2006 12:16:33 +0000 + lm-sensors (1:2.10.1-2) unstable; urgency=low * libsensors3: don't source debconf from postinst (closes: bug#390034). @@ -194,6 +349,25 @@ -- Aurelien Jarno Wed, 30 Aug 2006 12:05:15 +0200 +lm-sensors (1:2.10.0-7ubuntu3) edgy; urgency=low + + * Remove stop script symlinks from rc0 and rc6. + + -- Scott James Remnant Fri, 15 Sep 2006 17:24:33 +0100 + +lm-sensors (1:2.10.0-7ubuntu2) edgy; urgency=low + + * Remove unnecessary dependency on sysvinit. + + -- Scott James Remnant Thu, 31 Aug 2006 18:38:53 +0100 + +lm-sensors (1:2.10.0-7ubuntu1) edgy; urgency=low + + * Merge from debian unstable, remaining changes: + - strip all source and module building from package. + + -- Scott James Remnant Tue, 11 Jul 2006 21:17:51 +0100 + lm-sensors (1:2.10.0-7) unstable; urgency=low * Fixed a typo in mkpatch.pl: s/71085/71805/ (Closes: bug#369506). @@ -263,6 +437,25 @@ -- Aurelien Jarno Thu, 24 Nov 2005 20:10:31 +0100 +lm-sensors (1:2.9.2-5ubuntu3) dapper; urgency=low + + * Don't ship directories we don't use. + + -- Scott James Remnant Thu, 20 Apr 2006 12:24:04 +0100 + +lm-sensors (1:2.9.2-5ubuntu2) dapper; urgency=low + + * Nuke all traces of the kernel modules, since they're built by the + kernel proper in Ubuntu. + + -- Tollef Fog Heen Tue, 15 Nov 2005 18:54:35 +0100 + +lm-sensors (1:2.9.2-5ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + + -- Tollef Fog Heen Tue, 15 Nov 2005 13:51:18 +0100 + lm-sensors (1:2.9.2-5) unstable; urgency=low * Also recommends linux-image-2.6 as an alternative to kernel-image-2.6, as @@ -325,6 +518,28 @@ -- Aurelien Jarno Mon, 1 Aug 2005 01:16:47 +0200 +lm-sensors (1:2.9.1-4ubuntu3) breezy; urgency=low + + * Build-depend on librrd2-dev. + + -- Matthias Klose Sun, 18 Sep 2005 15:42:18 +0200 + +lm-sensors (1:2.9.1-4ubuntu2) breezy; urgency=low + + * SECURITY UPDATE: Fix insecure temporary file handling. + * prog/pwm/pwmconfig: + - Do not use hardcoded /tmp/fancontrol, but safe temporary name generated + by tempfile. + - Ubuntu #13887, Debian #324193 + + -- Martin Pitt Tue, 23 Aug 2005 10:38:09 +0200 + +lm-sensors (1:2.9.1-4ubuntu1) breezy; urgency=low + + * Resynchronise with Debian, resolving major merge conflicts. + + -- Adam Conrad Fri, 22 Jul 2005 12:13:16 +1000 + lm-sensors (1:2.9.1-4) unstable; urgency=low * Build the modules with gcc-3.3 @@ -490,6 +705,18 @@ -- Aurelien Jarno Sun, 2 Jan 2005 19:31:29 +0100 +lm-sensors (2.8.8-7ubuntu2) hoary; urgency=low + + * LSBise init script, based on patch from Taco Witte + + -- Thom May Fri, 4 Mar 2005 15:38:19 +0000 + +lm-sensors (2.8.8-7ubuntu1) hoary; urgency=low + + * Remove kernel patches and related packages (not needed for 2.6.x) + + -- Matt Zimmerman Thu, 23 Dec 2004 11:01:53 -0800 + lm-sensors (2.8.8-7) unstable; urgency=high * Fixed kernel version detection (closes: bug#280828, bug#282406). @@ -1530,0 +1758 @@ + diff -u lm-sensors-3-3.1.0/debian/patches/series lm-sensors-3-3.1.0/debian/patches/series --- lm-sensors-3-3.1.0/debian/patches/series +++ lm-sensors-3-3.1.0/debian/patches/series @@ -7,0 +8 @@ +08-use-LDFLAGS.patch only in patch2: unchanged: --- lm-sensors-3-3.1.0.orig/debian/patches/08-use-LDFLAGS.patch +++ lm-sensors-3-3.1.0/debian/patches/08-use-LDFLAGS.patch @@ -0,0 +1,13 @@ +Index: lm-sensors-3-3.0.2/lib/Module.mk +=================================================================== +--- lm-sensors-3-3.0.2.orig/lib/Module.mk 2008-05-18 18:07:48.000000000 +0200 ++++ lm-sensors-3-3.0.2/lib/Module.mk 2009-01-26 22:15:02.000000000 +0100 +@@ -60,7 +60,7 @@ + + # How to create the shared library + $(MODULE_DIR)/$(LIBSHLIBNAME): $(LIBSHOBJECTS) +- $(CC) -shared -Wl,-soname,$(LIBSHSONAME) -o $@ $^ -lc -lm ++ $(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIBSHSONAME) -o $@ $^ -lc -lm + + $(MODULE_DIR)/$(LIBSHSONAME): $(MODULE_DIR)/$(LIBSHLIBNAME) + $(RM) $@