rev 9308 - in trunk/packages/kdebase/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Tue Feb 5 23:23:01 UTC 2008
Author: fabo
Date: 2008-02-05 23:23:01 +0000 (Tue, 05 Feb 2008)
New Revision: 9308
Added:
trunk/packages/kdebase/debian/patches/71_ksysguard_lm-sensors-3.diff
Modified:
trunk/packages/kdebase/debian/changelog
trunk/packages/kdebase/debian/control
trunk/packages/kdebase/debian/control.in
Log:
* Add Vcs-Browser and Vcs-Svn fields.
* Add patch to support lm-sensors 3.x series. (Closes: #458989)
Build-depends on libsensors4-dev. Thanks to Aurelien Jarno.
Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog 2008-02-05 23:12:10 UTC (rev 9307)
+++ trunk/packages/kdebase/debian/changelog 2008-02-05 23:23:01 UTC (rev 9308)
@@ -2,11 +2,14 @@
+++ Changes by Fathi Boudra:
+ * Add Vcs-Browser and Vcs-Svn fields.
* Update ConsoleKit support patch.
+ * Add patch to support lm-sensors 3.x series. (Closes: #458989)
+ Build-depends on libsensors4-dev. Thanks to Aurelien Jarno.
+++ Changes by Ana Beatriz Guerrero Lopez:
- * Update to debhelper 6.
+ * Bump compat/debhelper to 6.
* Add Homepage to source field.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 08 Jan 2008 11:35:31 +0100
Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control 2008-02-05 23:12:10 UTC (rev 9307)
+++ trunk/packages/kdebase/debian/control 2008-02-05 23:23:01 UTC (rev 9308)
@@ -3,10 +3,13 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Armin Berres <trigger+debian at space-based.de>, Fathi Boudra <fabo at debian.org>, Modestas Vainius <modestas at vainius.eu>, Sune Vuorela <debian at pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8-5), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4)
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8-5), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4)
Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.7.3
+Homepage: http://www.kde.org
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdebase
+Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/kdebase
Package: kdebase
Section: kde
Modified: trunk/packages/kdebase/debian/control.in
===================================================================
--- trunk/packages/kdebase/debian/control.in 2008-02-05 23:12:10 UTC (rev 9307)
+++ trunk/packages/kdebase/debian/control.in 2008-02-05 23:23:01 UTC (rev 9308)
@@ -3,10 +3,13 @@
Priority: optional
Maintainer: @@@MAINTAINER@@@
Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8-5), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4)
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8-5), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4)
Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.7.3
+Homepage: http://www.kde.org
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdebase
+Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/kdebase
Package: kdebase
Section: kde
Added: trunk/packages/kdebase/debian/patches/71_ksysguard_lm-sensors-3.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/71_ksysguard_lm-sensors-3.diff (rev 0)
+++ trunk/packages/kdebase/debian/patches/71_ksysguard_lm-sensors-3.diff 2008-02-05 23:23:01 UTC (rev 9308)
@@ -0,0 +1,125 @@
+--- a/ksysguard/ksysguardd/Linux/lmsensors.c
++++ b/ksysguard/ksysguardd/Linux/lmsensors.c
+@@ -36,7 +36,12 @@
+ {
+ char* fullName;
+ const sensors_chip_name* scn;
++#if SENSORS_API_VERSION & 0x400
++ const sensors_feature *sf;
++ const sensors_subfeature *sfd;
++#else
+ const sensors_feature_data* sfd;
++#endif
+ } LMSENSOR;
+
+ static CONTAINER LmSensors;
+@@ -65,6 +70,82 @@
+ return s;
+ }
+
++#if SENSORS_API_VERSION & 0x400
++void initLmSensors( struct SensorModul* sm )
++{
++ const sensors_chip_name* scn;
++ int nr = 0;
++
++ if ( sensors_init( NULL ) ) {
++ LmSensorsOk = -1;
++ return;
++ }
++
++ LmSensors = new_ctnr();
++ while ( ( scn = sensors_get_detected_chips( NULL, &nr ) ) != NULL ) {
++ int nr1 = 0;
++ const sensors_feature* sf;
++
++ while ( ( sf = sensors_get_features( scn, &nr1 ) ) != 0 ) {
++ const sensors_subfeature *ssubf;
++ LMSENSOR *p;
++ char *s, *label;
++
++ switch( sf->type )
++ {
++ case SENSORS_FEATURE_IN:
++ ssubf = sensors_get_subfeature( scn, sf,
++ SENSORS_SUBFEATURE_IN_INPUT );
++ break;
++
++ case SENSORS_FEATURE_FAN:
++ ssubf = sensors_get_subfeature( scn, sf,
++ SENSORS_SUBFEATURE_FAN_INPUT );
++ break;
++
++ case SENSORS_FEATURE_TEMP:
++ ssubf = sensors_get_subfeature( scn, sf,
++ SENSORS_SUBFEATURE_TEMP_INPUT );
++ break;
++ }
++
++ if ( !ssubf )
++ continue;
++
++ label = sensors_get_label( scn, sf );
++ p = (LMSENSOR*)malloc( sizeof( LMSENSOR ) );
++ p->fullName = (char*)malloc( strlen( "lmsensors/" ) +
++ strlen( scn->prefix ) + 1 +
++ strlen( label ) + 1 );
++ sprintf( p->fullName, "lmsensors/%s/%s", scn->prefix, label );
++
++ /* Make sure that name contains only proper characters. */
++ for ( s = p->fullName; *s; s++ )
++ if ( *s == ' ' )
++ *s = '_';
++
++ p->scn = scn;
++ p->sf = sf;
++ p->sfd = ssubf;
++
++ /* Note a name collision should never happen with the lm_sensors-3x code,
++ but it does in the case of k8temp, when there are 2 identical labeled
++ sensors per CPU. This are really 2 distinct sensors measuring the
++ same thing, but fullName must be unique so we just drop the second
++ sensor */
++ if ( search_ctnr( LmSensors, sensorCmp, p ) < 0 ) {
++ push_ctnr( LmSensors, p );
++ registerMonitor( p->fullName, "float", printLmSensor, printLmSensorInfo, sm );
++ } else {
++ free( p->fullName );
++ free( p );
++ }
++ free( label );
++ }
++ }
++ bsort_ctnr( LmSensors, sensorCmp );
++}
++#else /* SENSORS_API_VERSION & 0x400 */
+ void initLmSensors( struct SensorModul* sm )
+ {
+ const sensors_chip_name* scn;
+@@ -117,11 +198,13 @@
+ free( p->fullName );
+ free( p );
+ }
++ free( label );
+ }
+ }
+ }
+ bsort_ctnr( LmSensors, sensorCmp );
+ }
++#endif /* SENSORS_API_VERSION & 0x400 */
+
+ void exitLmSensors( void )
+ {
+@@ -137,8 +220,11 @@
+ fprintf( CurrentClient, "0\n" );
+ return;
+ }
+-
++#if SENSORS_API_VERSION & 0x400
++ sensors_get_value( s->scn, s->sfd->number, &value );
++#else
+ sensors_get_feature( *(s->scn), s->sfd->number, &value );
++#endif
+ fprintf( CurrentClient, "%f\n", value );
+ }
+
More information about the pkg-kde-commits
mailing list