Hi Release Managers, cpufreqd in unstable contains a fix for http://bugs.debian.org/497083. The bug is not important but after all of the efforts already done to make cpufreqd run on recent (no /proc/acpi) debian kernels not having this fixed is quite sad. Please allow cpufreqd 2.3.3-2 to enter Lenny.
The diff against 2.3.3-1 is trivial: diff --git a/debian/changelog b/debian/changelog index 200c91b..2fddc7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cpufreqd (2.3.3-2) unstable; urgency=low + + * backport a patch from upstream repository to support the + ACPI thermal zone reported as "acpitz" in /sys (Closes: #497083). + + -- Mattia Dongili <[EMAIL PROTECTED]> Mon, 08 Sep 2008 22:57:22 +0900 + cpufreqd (2.3.3-1) unstable; urgency=low * New upstream version diff --git a/debian/control b/debian/control index 31c83ea..43c5c66 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: cpufreqd Section: admin Priority: optional Maintainer: Mattia Dongili <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4.1.16), libsensors-dev (>= 1:2.9.1), libcpufreq-dev, libsysfs-dev (>= 2.0.0) +Build-Depends: debhelper (>= 4.1.16), quilt, libsensors-dev (>= 1:2.9.1), libcpufreq-dev, libsysfs-dev (>= 2.0.0) Standards-Version: 3.7.3 Homepage: http://sourceforge.net/projects/cpufreqd diff --git a/debian/patches/01_acpitz_support.patch b/debian/patches/01_acpitz_support.patch new file mode 100644 index 0000000..3ac31fe --- /dev/null +++ b/debian/patches/01_acpitz_support.patch @@ -0,0 +1,46 @@ +Edited change from this commit: + +Update of /cvsroot/cpufreqd/sources2/src +In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5102/src + +Modified Files: + cpufreqd_acpi.c cpufreqd_acpi_ac.c cpufreqd_acpi_ac.h + cpufreqd_acpi_battery.c cpufreqd_acpi_battery.h + cpufreqd_acpi_event.c cpufreqd_acpi_event.h + cpufreqd_acpi_temperature.c cpufreqd_acpi_temperature.h + cpufreqd_cpu.c cpufreqd_programs.c +Log Message: +- make the acpi thermal comaptible with kernels >2.6.25 when the type has + changed from "ACPI Thermal Zone" to "acpitz" +- squash some converison warnings (gcc 4.3 is very loud about it) + + +Index: cpufreqd-2.3.3/src/cpufreqd_acpi_temperature.c +=================================================================== +--- cpufreqd-2.3.3.orig/src/cpufreqd_acpi_temperature.c 2008-09-08 23:57:02.961182316 +0900 ++++ cpufreqd-2.3.3/src/cpufreqd_acpi_temperature.c 2008-09-09 00:01:56.361181870 +0900 +@@ -26,9 +26,11 @@ + #include "cpufreqd_acpi.h" + #include "cpufreqd_acpi_temperature.h" + +-#define THERMAL "thermal" +-#define THERMAL_TYPE "ACPI thermal zone" +-#define THERMAL_TEMP "temp" ++#define THERMAL "thermal" ++#define THERMAL_TYPE "acpitz" ++/* the below is for kernels <= 2.6.25 */ ++#define THERMAL_TYPE_ALT "ACPI thermal zone" ++#define THERMAL_TEMP "temp" + + struct thermal_zone { + int temperature; +@@ -80,6 +82,9 @@ static int atz_callback(struct sysfs_cla + int acpi_temperature_init(void) + { + find_class_device(THERMAL, THERMAL_TYPE, atz_callback); ++ /* try with the old type name */ ++ if (atz_dir_num <= 0) ++ find_class_device(THERMAL, THERMAL_TYPE_ALT, atz_callback); + if (atz_dir_num <= 0) { + clog(LOG_INFO, "No thermal zones found\n"); + return -1; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ab7b339 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01_acpitz_support.patch diff --git a/debian/rules b/debian/rules index 52bffa5..bce452e 100755 --- a/debian/rules +++ b/debian/rules @@ -22,12 +22,18 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif -config.status: configure +config.status: patch-stamp configure dh_testdir # onfigure the package. ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --localstatedir=/var/run --libdir=/usr/lib/cpufreqd +patch: patch-stamp +patch-stamp: + QUILT_PATCHES=debian/patches quilt push -a + + touch patch-stamp + build: build-stamp build-stamp: config.status @@ -38,7 +44,8 @@ build-stamp: config.status touch build-stamp -clean: +clean: clean-patched unpatch +clean-patched: dh_testdir dh_testroot rm -f build-stamp @@ -55,6 +62,10 @@ endif dh_clean # debconf-updatepo +unpatch: + -QUILT_PATCHES=debian/patches quilt pop -a + rm -rf .pc patch-stamp + install: build dh_testdir dh_testroot -- mattia :wq! -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]