tags 469595 + patch
thanks
I looked into this when I first noticed the regression and had basically
the same patch as posted by tuXXer, but got a compilation failure which I
did not manage to solve back then.
The attached patch also solves the compilation failure. Basically: the
first half of the patch solves the regression, the second half makes it
compile correctly by ensuring ksysguardd gets linked against libsensors.
The second half may be unnecessary if automake is run again, but I'm not
familiar enough with KDE packaging to know what the correct way to fix
that is.
I also made the following changes in debian/control.
Work around current problem with xutils (#485184):
- gettext, sharutils, texinfo, xutils, kdelibs4-dev (= 4:3.5.8-5),
+ gettext, sharutils, texinfo, xutils-dev, kdelibs4-dev (= 4:3.5.8-5),
Stray comma at end of Build-Depends (very minor):
- libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
A build using pbuilder succeeded and sensors display works again after
installing updated ksysguard and ksysguardd debs.
Cheers,
FJP
--- kdebase-3.5.9.dfsg.1.orig/debian/patches/72_lmsensors.diff
+++ kdebase-3.5.9.dfsg.1/debian/patches/72_lmsensors.diff
@@ -0,0 +1,31 @@
+--- a/ksysguard/ksysguardd/Linux/lmsensors.c (Revision 779545)
b/ksysguard/ksysguardd/Linux/lmsensors.c (Revision 779546)
+@@ -29,7 +29,7 @@
+
+ #include lmsensors.h
+
+-#ifdef HAVE_LMSENSORS
++#ifdef HAVE_SENSORS_SENSORS_H
+ #include sensors/sensors.h
+
+ #ifndef SENSORS_API_VERSION
+@@ -293,7 +293,7 @@
+ #endif
+ }
+
+-#else /* HAVE_LMSENSORS */
++#else /* HAVE_SENSORS_SENSORS_H */
+
+ /* dummy version for systems that have no lmsensors support */
+
+--- a/ksysguard/ksysguardd/Makefile.in 2008-06-10 14:23:42.0 +0200
b/ksysguard/ksysguardd/Makefile.in 2008-06-10 14:08:08.0 +0200
+@@ -64,7 +64,7 @@
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ ksysguardd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(ksysguardd_LDFLAGS) $(LDFLAGS) -o $@
++ $(ksysguardd_LDFLAGS) $(LDFLAGS) $(LIBSENSORS) -o $@
+ DEFAULT_INCLUDES = [EMAIL PROTECTED]@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
signature.asc
Description: This is a digitally signed message part.
