summaryrefslogtreecommitdiffstats
path: root/redhat/extras/ksensors
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/extras/ksensors')
-rw-r--r--redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch11
-rw-r--r--redhat/extras/ksensors/ksensors-0.7.3-fix_sound_installation.patch10
-rw-r--r--redhat/extras/ksensors/ksensors-0.7.3-tde_includedir.patch84
-rw-r--r--redhat/extras/ksensors/ksensors_0.7.3-18.diff2868
-rw-r--r--redhat/extras/ksensors/ksensors_0.7.3-18.diff.gzbin16897 -> 0 bytes
-rw-r--r--redhat/extras/ksensors/trinity-ksensors-3.5.13.1.spec268
-rw-r--r--redhat/extras/ksensors/trinity-ksensors-3.5.13.spec (renamed from redhat/extras/ksensors/trinity-ksensors.spec)0
7 files changed, 3241 insertions, 0 deletions
diff --git a/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch b/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch
new file mode 100644
index 000000000..6cb76f8a3
--- /dev/null
+++ b/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch
@@ -0,0 +1,11 @@
+--- ksensors-0.7.3/admin/cvs.sh.ORI 2012-10-07 11:06:41.616636004 +0200
++++ ksensors-0.7.3/admin/cvs.sh 2012-10-07 11:07:55.975129334 +0200
+@@ -64,7 +64,7 @@
+ echo "*** KDE requires automake 1.6.1 or newer"
+ exit 1
+ ;;
+- automake*1.6.* | automake*1.7* ) : ;;
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]* ) : ;;
+ "" )
+ echo "*** AUTOMAKE NOT FOUND!."
+ echo "*** KDE requires automake 1.6.1 or newer"
diff --git a/redhat/extras/ksensors/ksensors-0.7.3-fix_sound_installation.patch b/redhat/extras/ksensors/ksensors-0.7.3-fix_sound_installation.patch
new file mode 100644
index 000000000..265fa1e75
--- /dev/null
+++ b/redhat/extras/ksensors/ksensors-0.7.3-fix_sound_installation.patch
@@ -0,0 +1,10 @@
+--- ksensors-0.7.3/src/sounds/Makefile.am.ORI 2012-10-07 11:24:46.315092603 +0200
++++ ksensors-0.7.3/src/sounds/Makefile.am 2012-10-07 11:25:08.288633760 +0200
+@@ -5,6 +5,7 @@
+ EXTRA_DIST = ksensors_alert.wav
+
+ install-data-local:
++ $(mkinstalldirs) $(kde_sounddir)
+ $(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(kde_sounddir)/ksensors_alert.wav
+ uninstall-local:
+ rm -f $(kde_sounddir)/ksensors_alert.wav
diff --git a/redhat/extras/ksensors/ksensors-0.7.3-tde_includedir.patch b/redhat/extras/ksensors/ksensors-0.7.3-tde_includedir.patch
new file mode 100644
index 000000000..fe3ae5c42
--- /dev/null
+++ b/redhat/extras/ksensors/ksensors-0.7.3-tde_includedir.patch
@@ -0,0 +1,84 @@
+--- ksensors-0.7.3/admin/acinclude.m4.in.tdeinc 2003-09-09 16:44:53.000000000 +0200
++++ ksensors-0.7.3/admin/acinclude.m4.in 2012-10-07 11:10:55.098502427 +0200
+@@ -459,14 +459,14 @@
+ if test "$kde_qtver" = "2"; then
+ kde_moduledir='\${libdir}/kde2'
+ else
+- kde_moduledir='\${libdir}/kde3'
++ kde_moduledir='\${libdir}/trinity'
+ fi
+ fi
+ if test -z "$kde_styledir"; then
+- kde_styledir='\${libdir}/kde3/plugins/styles'
++ kde_styledir='\${libdir}/trinity/plugins/styles'
+ fi
+ if test -z "$kde_widgetdir"; then
+- kde_widgetdir='\${libdir}/kde3/plugins/designer'
++ kde_widgetdir='\${libdir}/trinity/plugins/designer'
+ fi
+ if test -z "$xdg_appsdir"; then
+ xdg_appsdir='\${datadir}/applications'
+@@ -528,7 +528,7 @@
+ )
+ AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
+
+- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
++ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
+ test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
+ if test -n "$KDEDIRS"; then
+ kde_save_IFS=$IFS
+@@ -549,7 +549,7 @@
+ KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
+
+ if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
+- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
++ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
+ test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+ AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
+ if test "$KDE_XSL_STYLESHEET" = "NO"; then
+@@ -1688,8 +1688,8 @@
+
+ if test -z "$1"; then
+
+-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
++kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
++test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/tde $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+ kde_incdirs="$ac_kde_includes $kde_incdirs"
+ AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
+ ac_kde_includes="$kde_incdir"
+@@ -1700,7 +1700,7 @@
+ So, check this please and use another prefix!])
+ fi
+
+-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
++kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+ test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+ kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
+ AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
+@@ -1708,7 +1708,7 @@
+
+ kde_widgetdir=NO
+ dnl this might be somewhere else
+-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
++AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+
+ if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
+ AC_MSG_ERROR([
+@@ -1716,14 +1716,14 @@
+ So, check this please and use another prefix!])
+ fi
+
+-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
++if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
+ AC_MSG_ERROR([
+ I can't find the designer plugins. These are required and should have been installed
+ by kdelibs])
+ fi
+
+ if test -n "$kde_widgetdir"; then
+- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
++ kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
+ fi
+
+
diff --git a/redhat/extras/ksensors/ksensors_0.7.3-18.diff b/redhat/extras/ksensors/ksensors_0.7.3-18.diff
new file mode 100644
index 000000000..5bfd493a4
--- /dev/null
+++ b/redhat/extras/ksensors/ksensors_0.7.3-18.diff
@@ -0,0 +1,2868 @@
+--- ksensors-0.7.3.orig/config.h.in
++++ ksensors-0.7.3/config.h.in
+@@ -1,5 +1,8 @@
+ /* config.h.in. Generated from configure.in by autoheader. */
+
++/* Define if building universal (internal helper macro) */
++#undef AC_APPLE_UNIVERSAL_BUILD
++
+ /* Define if you have the CoreAudio API */
+ #undef HAVE_COREAUDIO
+
+@@ -85,6 +88,10 @@
+ /* Define a safe value for MAXPATHLEN */
+ #undef KDEMAXPATHLEN
+
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++ */
++#undef LT_OBJDIR
++
+ /* Name of package */
+ #undef PACKAGE
+
+@@ -100,22 +107,25 @@
+ /* Define to the one symbol short name of this package. */
+ #undef PACKAGE_TARNAME
+
++/* Define to the home page for this package. */
++#undef PACKAGE_URL
++
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+
+-/* The size of a `char *', as computed by sizeof. */
++/* The size of `char *', as computed by sizeof. */
+ #undef SIZEOF_CHAR_P
+
+-/* The size of a `int', as computed by sizeof. */
++/* The size of `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+
+-/* The size of a `long', as computed by sizeof. */
++/* The size of `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+
+-/* The size of a `size_t', as computed by sizeof. */
++/* The size of `size_t', as computed by sizeof. */
+ #undef SIZEOF_SIZE_T
+
+-/* The size of a `unsigned long', as computed by sizeof. */
++/* The size of `unsigned long', as computed by sizeof. */
+ #undef SIZEOF_UNSIGNED_LONG
+
+ /* Define to 1 if you have the ANSI C header files. */
+@@ -124,9 +134,17 @@
+ /* Version number of package */
+ #undef VERSION
+
+-/* Define to 1 if your processor stores words with the most significant byte
+- first (like Motorola and SPARC, unlike Intel and VAX). */
+-#undef WORDS_BIGENDIAN
++/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
++ significant byte first (like Motorola and SPARC, unlike Intel). */
++#if defined AC_APPLE_UNIVERSAL_BUILD
++# if defined __BIG_ENDIAN__
++# define WORDS_BIGENDIAN 1
++# endif
++#else
++# ifndef WORDS_BIGENDIAN
++# undef WORDS_BIGENDIAN
++# endif
++#endif
+
+ /*
+ * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
+--- ksensors-0.7.3.orig/src/sensorslist.h
++++ ksensors-0.7.3/src/sensorslist.h
+@@ -19,7 +19,7 @@
+ #define SENSORSLIST_H
+
+ #include <qobject.h>
+-#include <qobjcoll.h>
++#include <qobjectlist.h>
+ #include <kconfig.h>
+ #include <qstringlist.h>
+
+--- ksensors-0.7.3.orig/src/cpupanel.cpp
++++ ksensors-0.7.3/src/cpupanel.cpp
+@@ -60,11 +60,11 @@
+
+ CpuPanel::CpuPanel(QWidget *parent, const char *name) : Panel(parent,name)
+ {
+- sCpu= "Unknow";
++ sCpu= "Unknown";
+ getCpuInfoValue("model name",sCpu);
+ adjustString(sCpu,16);
+
+- sVendor= "Unknow";
++ sVendor= "Unknown";
+ getCpuInfoValue("vendor_id",sVendor);
+ adjustString(sVendor,16);
+
+--- ksensors-0.7.3.orig/src/Makefile.am
++++ ksensors-0.7.3/src/Makefile.am
+@@ -43,7 +43,7 @@
+ systemcfg.cpp systemcfgdesign.ui uptimepanel.cpp
+
+ ksensors_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+-ksensors_LDADD = $(LIB_KDEUI) $(LIB_KDECORE) -lsensors -lm
++ksensors_LDADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lsensors -lm
+
+ # this is where the desktop file will go
+ shelldesktopdir = $(kde_appsdir)/Utilities
+--- ksensors-0.7.3.orig/src/lmsensorscfg.cpp
++++ ksensors-0.7.3/src/lmsensorscfg.cpp
+@@ -29,7 +29,7 @@
+ #include <qgroupbox.h>
+ #include <qradiobutton.h>
+ #include <qpushbutton.h>
+-#include <qobjcoll.h>
++#include <qobjectlist.h>
+ #include <qtabwidget.h>
+ #include <qcombobox.h>
+ #include <qspinbox.h>
+--- ksensors-0.7.3.orig/src/hdsensorslist.h
++++ ksensors-0.7.3/src/hdsensorslist.h
+@@ -47,7 +47,7 @@
+
+ static bool isHddTempInstalled();
+ static bool getDisks(QStringList &disks);
+- static bool getDiskInfo(const char *buf, QString disk, QString &name, double &value);
++ static bool getDiskInfo(const QString buf, QString &name, double &value);
+ };
+
+ #endif
+--- ksensors-0.7.3.orig/src/lmsensors.cpp
++++ ksensors-0.7.3/src/lmsensors.cpp
+@@ -45,17 +45,23 @@
+
+ bool LMSensors::initSensors()
+ {
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+ FILE *fp=fopen("/etc/sensors.conf","r");
+ if(!fp) {
+ qWarning("KSensors error: /etc/sensors.conf not found !");
+ return false;
+ }
++#else
++ FILE *fp=NULL;
++#endif
+ int err= sensors_init(fp);
+ if(err) {
+ qWarning("KSensors error: sensors_init fail, error code %d",err);
+ return false;
+ }
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+ fclose(fp);
++#endif
+ return true;
+ }
+
+@@ -63,12 +69,19 @@
+ {
+ const sensors_chip_name *chip_name;
+ int err= 0;
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+ while( (chip_name= sensors_get_detected_chips(&err)) )
++ {
+ if( existSensor(chip_name,"temp") ||
+ existSensor(chip_name,"fan") )
+ {
+ (void)new LMSensorsChip(chip_name,this);
+ }
++ }
++#else
++ while( (chip_name= sensors_get_detected_chips(NULL, &err)) )
++ (void)new LMSensorsChip(chip_name,this);
++#endif
+ }
+
+ void LMSensors::createHDSensors()
+@@ -84,6 +97,7 @@
+ }
+
+
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+ int LMSensors::existSensor(const sensors_chip_name *chip_name,const char *sensor_name)
+ {
+ int nr1,nr2;
+@@ -91,10 +105,13 @@
+
+ nr1=nr2= 0;
+ while( (sensor_data= sensors_get_all_features(*chip_name, &nr1, &nr2)) )
++ {
+ if( strstr(sensor_data->name,sensor_name) )
+ return sensor_data->number;
++ }
+ return 0;
+ }
++#endif
+
+ void LMSensors::setMonitorized(bool enable)
+ {
+--- ksensors-0.7.3.orig/src/processexec.h
++++ ksensors-0.7.3/src/processexec.h
+@@ -33,11 +33,11 @@
+
+ bool run();
+ bool runAndWait();
+- bool outputErrors() { return fErrors; };
++ bool outputErrors() { return fErrors; };
+
+- inline char *getStdoutData() { return buffer; };
+- inline int getStdoutDataLen() { return bufLen; }
+- inline void clearData() { bufLen= 0; buffer[0]= 0; fErrors= false; };
++ inline QString getStdoutData() { return buffer; };
++ inline unsigned int getStdoutDataLen() { return buffer.length(); }
++ inline void clearData() { buffer.truncate(0); fErrors= false; };
+
+ protected slots:
+
+@@ -47,8 +47,7 @@
+ private:
+
+ static const int bufMax= 1023;
+- char buffer[bufMax+1];
+- int bufLen;
++ QString buffer;
+ bool fErrors;
+ };
+
+--- ksensors-0.7.3.orig/src/lmsensor.cpp
++++ ksensors-0.7.3/src/lmsensor.cpp
+@@ -30,25 +30,70 @@
+ LMSensor::~LMSensor(){
+ }
+
+-
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+ bool LMSensor::init(const sensors_feature_data **data, int *nr1,int *nr2)
++#else
++bool LMSensor::init(const sensors_feature **data, int *nr1, int *nr2)
++#endif
+ {
+-double min,max;
+-
++ double min,max;
+ const sensors_chip_name *chip_name= getChipName();
++ const char* main_name = (*data)->name;
++ feature= (*data)->number;
++ char *label = NULL;
++ QString uniqueSensorName;
++
++ uniqueSensorName.sprintf("%s_%d_%d.%s", chip_name->prefix, chip_name->bus.nr, chip_name->addr, main_name);
++ setName(uniqueSensorName.latin1());
++
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
++ bool min_found=false;
++ bool max_found=false;
++ while( (*data= sensors_get_all_features(*chip_name, nr1, nr2)) && (*data)->mapping!=SENSORS_NO_MAPPING) {
++ int len = strlen((*data)->name);
++ const char *postfix = (*data)->name + len - 4;
++
++ if (len < 5)
++ continue;
++
++ if((!strcmp(postfix, "_min") || !strcmp(postfix, "_low")) &&
++ !sensors_get_feature(*chip_name, (*data)->number, &valMin))
++ min_found=true;
++
++ if(!strcmp(postfix, "_max") &&
++ !sensors_get_feature(*chip_name, (*data)->number, &valMax)) {
++ max_found=true;
++ continue;
++ }
++
++ postfix--;
++
++ if((!strcmp(postfix, "_over") || !strcmp(postfix, "_high")) &&
++ !sensors_get_feature(*chip_name, (*data)->number, &valMax))
++ max_found=true;
++ }
++
++ double newVal;
++ if ((sensors_get_ignored(*chip_name, feature) != 1) || (sensors_get_feature(*chip_name, feature, &newVal) != 0)) {
++ return false;
++ }
+
+- if (strstr((*data)->name, "temp"))
++ if (strstr(main_name, "temp"))
+ {
+ setType(lmTemp);
+ max= 65;
+ min= 0;
+ }
+- else if (strstr((*data)->name, "fan"))
++ else if (strstr(main_name, "fan"))
+ {
+ setType(lmFan);
+ max= 10000;
+ min= 3000;
+ }
++ else if (strstr(main_name, "alarm") || strstr(main_name, "sensor") || strstr(main_name, "vrm"))
++ {
++ return false;
++ }
+ else
+ {
+ setType(lmVoltage);
+@@ -56,47 +101,129 @@
+ min= -16;
+ }
+
+- feature= (*data)->number;
++ sensors_get_label(*chip_name,feature,&label);
++ if (label)
++ {
++ setDescription(QString(label));
++ delete label;
++ label = NULL;
++ }
++ else
++ {
++ setDescription(uniqueSensorName.latin1());
++ }
++
++ if(min_found)
++ min = valMin;
++
++ if(max_found)
++ max = valMax;
++
++#else /* libsensors4 code */
++
++ const sensors_subfeature *sub_feature;
++ const sensors_feature *feature_data = *data;
++
++ /* Move to next feature for the loop in LMSensorsChip::createSensors() */
++ *data = sensors_get_features(chip_name, nr1);
++
++ switch(feature_data->type)
++ {
++ case SENSORS_FEATURE_IN:
++ sub_feature = sensors_get_subfeature(chip_name, feature_data,
++ SENSORS_SUBFEATURE_IN_INPUT);
++
++ if (!sub_feature)
++ return false;
++
++ feature = sub_feature->number;
++
++ if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++ SENSORS_SUBFEATURE_IN_MIN)) ||
++ sensors_get_value(chip_name, sub_feature->number, &min))
++ min = -16;
++
++ if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++ SENSORS_SUBFEATURE_IN_MAX)) ||
++ sensors_get_value(chip_name, sub_feature->number, &max))
++ max = 16;
++
++ setType(lmVoltage);
++ break;
++
++ case SENSORS_FEATURE_FAN:
++ sub_feature = sensors_get_subfeature(chip_name, feature_data,
++ SENSORS_SUBFEATURE_FAN_INPUT);
++
++ if (!sub_feature)
++ return false;
++
++ feature = sub_feature->number;
++
++ if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++ SENSORS_SUBFEATURE_FAN_MIN)) ||
++ sensors_get_value(chip_name, sub_feature->number, &min))
++ min = 3000;
++
++ max = 10000;
++
++ setType(lmFan);
++ break;
++
++ case SENSORS_FEATURE_TEMP:
++ sub_feature = sensors_get_subfeature(chip_name, feature_data,
++ SENSORS_SUBFEATURE_TEMP_INPUT);
++
++ if (!sub_feature)
++ return false;
++
++ feature = sub_feature->number;
++
++ if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++ SENSORS_SUBFEATURE_TEMP_MIN)) ||
++ sensors_get_value(chip_name, sub_feature->number, &min))
++ min = 0;
++
++ if ((!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++ SENSORS_SUBFEATURE_TEMP_MAX)) &&
++ !(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++ SENSORS_SUBFEATURE_TEMP_CRIT))) ||
++ sensors_get_value(chip_name, sub_feature->number, &max))
++ max = 65;
++
++ setType(lmTemp);
++ break;
++
++ default:
++ return false;
++ }
+
+- QString str;
+- str.sprintf("%s.%s", chip_name->prefix, (*data)->name );
+- setName( str.latin1() );
++ label = sensors_get_label(chip_name, feature_data);
++ if (label)
++ {
++ setDescription(QString(label));
++ delete label;
++ label = NULL;
++ }
++ else
++ setDescription( uniqueSensorName.latin1() );
+
+- char *label;
+- sensors_get_label(*chip_name,feature,&label);
+- setDescription(QString(label));
++#endif /* libsensors3 / libsensors4 code */
+
+- bool valid= false;
+- while( (*data= sensors_get_all_features(*chip_name, nr1, nr2)) && (*data)->mapping!=SENSORS_NO_MAPPING) {
+- str= (*data)->name;
+- if(str.find("_min")>=0 || str.find("_low")>=0) {
+- sensors_get_feature(*chip_name, (*data)->number, &valMin);
+- valid= true;
+- } else
+- if(str.find("_max")>=0 || str.find("_over")>=0 || str.find("_high")>=0) {
+- sensors_get_feature(*chip_name, (*data)->number, &valMax);
+- valid= true;
+- }
+- }
+-
+- if(valid) {
+- double newVal;
+- valid= (sensors_get_feature(*chip_name, feature, &newVal)==0);
+- if(valid) {
+- if(min>max) {
+- double pivot= valMin;
+- min= max;
+- max= pivot;
+- }
+- setValueMax(max,dgCelsius);
+- setValueMin(min,dgCelsius);
+- setValue((max+min)/2,dgCelsius);
+- readConfig();
+- updateValue();
+- setValueIdeal(getValue());
+- }
++ if(min>max) {
++ double pivot= min;
++ min= max;
++ max= pivot;
+ }
+- return valid;
++
++ setValueMax(max,dgCelsius);
++ setValueMin(min,dgCelsius);
++
++ readConfig();
++ updateValue();
++ setValueIdeal(getValue());
++
++ return true;
+ }
+
+ void LMSensor::updateValue()
+@@ -108,7 +235,11 @@
+ {
+ double newVal;
+ const sensors_chip_name *chip_name= getChipName();
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+ sensors_get_feature(*chip_name, feature, &newVal);
++#else
++ sensors_get_value(chip_name, feature, &newVal);
++#endif
+ return newVal;
+ }
+
+--- ksensors-0.7.3.orig/src/lmsensors.h
++++ ksensors-0.7.3/src/lmsensors.h
+@@ -19,7 +19,7 @@
+ #define LMSENSORS_H
+
+ #include <qobject.h>
+-#include <qobjcoll.h>
++#include <qobjectlist.h>
+ #include <kconfig.h>
+ #include <qstringlist.h>
+
+@@ -65,7 +65,9 @@
+ void createI8KSensors();
+ void childEvent ( QChildEvent *e );
+
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+ static int existSensor(const sensors_chip_name *chip_name,const char *sensor_name);
++#endif
+ };
+
+ #endif
+--- ksensors-0.7.3.orig/src/lmsensor.h
++++ ksensors-0.7.3/src/lmsensor.h
+@@ -51,7 +51,11 @@
+
+ double calculateIdealValue();
+
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+ bool init(const sensors_feature_data **data, int *nr1,int *nr2);
++#else
++ bool init(const sensors_feature **data, int *nr1,int *nr2);
++#endif
+ const sensors_chip_name *getChipName();
+
+ private:
+--- ksensors-0.7.3.orig/src/lmsensorscfgdesign.ui
++++ ksensors-0.7.3/src/lmsensorscfgdesign.ui
+@@ -748,29 +748,13 @@
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+- <widget class="QLabel">
++ <widget class="QButtonGroup">
+ <property name="name">
+- <cstring>TextLabel1_3_2_2_2_2</cstring>
++ <cstring>ButtonGroup9</cstring>
+ </property>
+- <property name="text">
++ <property name="title">
+ <string>On reach alarm value:</string>
+ </property>
+- </widget>
+- <widget class="QFrame">
+- <property name="name">
+- <cstring>Frame11_2_2_2</cstring>
+- </property>
+- <property name="frameShape">
+- <enum>HLine</enum>
+- </property>
+- <property name="frameShadow">
+- <enum>Sunken</enum>
+- </property>
+- </widget>
+- <widget class="QLayoutWidget">
+- <property name="name">
+- <cstring>layout9</cstring>
+- </property>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+--- ksensors-0.7.3.orig/src/palettecfg.cpp
++++ ksensors-0.7.3/src/palettecfg.cpp
+@@ -82,13 +82,7 @@
+ {
+ labelTitle->unsetPalette();
+ framePanel->setPalette(pal);
+-#if ( KDE_VERSION_MAJOR >= 3 )
+ labelTitle->setPaletteForegroundColor(pal.active().text());
+-#else
+- QPalette p= labelTitle->palette();
+- p.setColor(QColorGroup::Foreground,pal.active().text());
+- labelTitle->setPalette(p);
+-#endif
+ if(updateColorButton) slotComboSelected(comboSelect->currentItem());
+ }
+
+--- ksensors-0.7.3.orig/src/lmsensorschip.cpp
++++ ksensors-0.7.3/src/lmsensorschip.cpp
+@@ -50,10 +50,15 @@
+ void LMSensorsChip::createSensors()
+ {
+ if(!chip_name) return;
+- const sensors_feature_data *data;
+ int nr1= 0;
+ int nr2= 0;
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
++ const sensors_feature_data *data;
+ data= sensors_get_all_features(*chip_name, &nr1, &nr2);
++#else
++ const sensors_feature *data;
++ data= sensors_get_features(chip_name, &nr1);
++#endif
+ while(data) {
+ LMSensor *sensor= new LMSensor(this);
+ if( !sensor->init(&data,&nr1,&nr2) )
+--- ksensors-0.7.3.orig/src/hdsensorslist.cpp
++++ ksensors-0.7.3/src/hdsensorslist.cpp
+@@ -23,7 +23,7 @@
+ #include <stdlib.h>
+ #include <qstringlist.h>
+ #include <klocale.h>
+-#include <regex.h>
++#include <qregexp.h>
+
+ #include "sensor.h"
+ #include "hdsensorslist.h"
+@@ -44,28 +44,25 @@
+ QStringList disks;
+ if(!getDisks(disks)) return;
+
+- ProcessExec proc;
+- proc << "hddtemp" << "-q";
+ for(QStringList::Iterator it = disks.begin(); it != disks.end(); ++it ) {
++ ProcessExec proc;
++ proc << "hddtemp" << "-q";
+ proc << *it;
+- }
+-
+- if(proc.runAndWait()) {
+- double value;
+- QString str;
+- for(QStringList::Iterator it = disks.begin(); it != disks.end(); ++it ) {
+- if(getDiskInfo(proc.getStdoutData(),*it,str,value)) {
+- Sensor *sensor= new Sensor(this);
+- sensor->setType(Sensor::lmTemp);
+- sensor->setName(*it);
+- sensor->setDescription(str);
+- sensor->setValueMax (40 , Sensor::dgCelsius);
+- sensor->setValueMin ( 0 , Sensor::dgCelsius);
+- sensor->setValueIdeal(value, Sensor::dgCelsius);
+- sensor->setValue (value, Sensor::dgCelsius);
+- sensor->readConfig();
+- }
+- }
++ if(proc.runAndWait()) {
++ double value;
++ QString str;
++ if(getDiskInfo(proc.getStdoutData(),str,value)) {
++ Sensor *sensor= new Sensor(this);
++ sensor->setType(Sensor::lmTemp);
++ sensor->setName(*it);
++ sensor->setDescription(str);
++ sensor->setValueMax (40 , Sensor::dgCelsius);
++ sensor->setValueMin ( 0 , Sensor::dgCelsius);
++ sensor->setValueIdeal(value, Sensor::dgCelsius);
++ sensor->setValue (value, Sensor::dgCelsius);
++ sensor->readConfig();
++ }
++ }
+ }
+ }
+
+@@ -90,50 +87,29 @@
+
+ if(params.count()>0) {
+ process= new ProcessExec;
+-#if ( KDE_VERSION_MAJOR >= 3 )
+ *process << "hddtemp" << "-q" << params;
+-#else
+- *process << "hddtemp" << "-q";
+- for (QStringList::Iterator it= params.begin(); it!=params.end(); ++it)
+- *process << *it;
+-#endif
+ connect( process, SIGNAL(processExited(KProcess *)), this, SLOT(slotProcessExited(KProcess *)) );
+ process->run();
+ }
+ }
+
+-
+ void HDSensorsList::slotProcessExited(KProcess *)
+ {
+ QObjectList *list= (QObjectList *)children();
+
+- if(!list) return;
+-
+- char *buf= process->getStdoutData();
++ if (!list) return;
+
+- if( process->outputErrors() ) {
+- qWarning("HddTemp Error:\n%s", buf);
+- }
++ if (process->outputErrors())
++ qWarning("HddTemp Error:\n%s", process->getStdoutData().ascii());
+
+- char *ptr;
+- regex_t *preg;
+- regmatch_t pmatch[1];
+- preg = (regex_t*) malloc(sizeof(regex_t));
+- regcomp(preg, ": [0-9]\\+.*C$", REG_NEWLINE);
+-
+- for(Sensor *obj= (Sensor *)list->first(); obj!=0; obj= (Sensor *)list->next()) {
+- buf= strstr(buf,obj->name());
+- if(!buf) break;
+- if (regexec(preg, buf, 1, pmatch, 0) == 0)
+- {
+- ptr = buf + pmatch[0].rm_so + 2;
+- buf += pmatch[0].rm_eo;
+- obj->setValue(atof(ptr), Sensor::dgCelsius);
++ QStringList buf = QStringList::split(QChar('\n'), process->getStdoutData());
++ for(QStringList::Iterator it = buf.begin(); it != buf.end(); ++it ) {
++ for(Sensor *obj= (Sensor *)list->first(); obj!=0; obj= (Sensor *)list->next()) {
++ QRegExp rx(QString(obj->name()) + QString(":\\s+.+:\\s+(\\d+).*C"));
++ if (rx.search((*it)) > -1)
++ obj->setValue(rx.cap(1).toDouble(), Sensor::dgCelsius);
+ }
+ }
+- regfree(preg);
+- free(preg);
+-
+ delete process;
+ process= 0;
+ }
+@@ -141,78 +117,49 @@
+ // *************** Static methods
+
+
+-bool HDSensorsList::getDiskInfo(const char *buf, QString disk, QString &name, double &value)
++bool HDSensorsList::getDiskInfo(const QString buf, QString &name, double &value)
+ {
+- regex_t *preg;
+- regmatch_t pmatch[1];
+- preg = (regex_t*) malloc(sizeof(regex_t));
+-
+- // Take disk model
+- char reg_string[30];
+- snprintf(reg_string, sizeof(reg_string), "%s: .*: [0-9]", disk.latin1());
+- regcomp(preg, reg_string, REG_NEWLINE);
+- if (regexec(preg, buf, 1, pmatch, 0) == 0)
+- {
+- name="";
+- pmatch[0].rm_eo -= 3;
+- pmatch[0].rm_so += 10;
+- buf += pmatch[0].rm_so;
+- while (pmatch[0].rm_so < pmatch[0].rm_eo)
+- {
+- name += *buf;
+- buf++;
+- pmatch[0].rm_so++;
+- }
+- regfree(preg);
+- name= name.stripWhiteSpace();
+- if( name.length()>40 ) name= disk;
+- }
+- else
+- {
+- regfree(preg);
+- free(preg);
+- return false;
++ QRegExp rx(":\\s+(.+):\\s+(\\d+).*C");
++
++ if (rx.search(buf) > -1) {
++ bool ok;
++ name = rx.cap(1);
++ value = rx.cap(2).toDouble(&ok);
++ if (ok)
++ return true;
++ else
++ return false;
+ }
+-
+- // Take disk temperature
+- regcomp(preg, ": [0-9]\\+.*C$", REG_NEWLINE);
+- if (regexec(preg, buf, 1, pmatch, 0) == 0)
+- {
+- value= atof(buf + pmatch[0].rm_so + 2);
+- regfree(preg);
+- free(preg);
+- }
+- else
+- {
+- regfree(preg);
+- free(preg);
++ else
+ return false;
+- }
+- return true;
+ }
+
+
+ bool HDSensorsList::isHddTempInstalled()
+ {
+-ProcessExec proc;
++ ProcessExec proc;
+
+- proc << "hddtemp" ;
++ proc << "hddtemp" << "-v" ;
+ if(proc.runAndWait()) {
+- if(strstr(proc.getStdoutData(),"ERROR")==0) return true;
+- qWarning("HddTemp Error:\n%s", proc.getStdoutData());
++ if(proc.getStdoutData().contains("ERROR")==0) return true;
++ qWarning("HddTemp Error:\n%s", proc.getStdoutData().ascii());
+ }
+ return false;
+ }
+
+ bool HDSensorsList::getDisks(QStringList &disks )
+ {
+- DIR *dir= opendir("/proc/ide");
+- if(!dir) return false;
++ DIR *dir;
++
++ /* Get a listing of the hard drives looking under sysfs first then falling back to /proc/ide */
++ if((dir = opendir ("/sys/block")) == NULL)
++ if ((dir = opendir ("/proc/ide")) == NULL)
++ return false;
+ QString str;
+ struct dirent *ptr;
+ while((ptr= readdir(dir))) {
+- if(ptr->d_name[0]=='h' && ptr->d_name[1]=='d') {
+- str.sprintf("/dev/hd%c",ptr->d_name[2]);
++ if((ptr->d_name[0]=='h' || ptr->d_name[0]=='s') && ptr->d_name[1]=='d') {
++ str.sprintf("/dev/%s",ptr->d_name);
+ disks << str;
+ }
+ }
+--- ksensors-0.7.3.orig/src/ksensors.desktop
++++ ksensors-0.7.3/src/ksensors.desktop
+@@ -1,24 +1,16 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Name=ksensors
+-Name[xx]=xxksensorsxx
++Name=KSensors
+ Exec=ksensors
+ Icon=ksensors
+ Type=Application
+-Comment=A simple KDE Application
+-Comment[ca]=Una simple aplicació KDE
+-Comment[da]=Et simpelt KDE program
+-Comment[de]=Eine einfache KDE-Anwendung
+-Comment[el]=Μια απλή εφαρμογή του KDE
+-Comment[es]=Una aplicación de KDE sencilla
+-Comment[et]=Lihtne KDE rakendus
+-Comment[fr]=Une application simple pour KDE.
+-Comment[hu]=Egyszerű KDE-alkalmazás
+-Comment[it]=Una semplice applicazione KDE
+-Comment[pt]=Uma aplicação KDE simples
+-Comment[pt_BR]=Um simples Aplicativo do KDE
+-Comment[ru]=Простое приложение KDE
+-Comment[sl]=Preprost program za KDE
+-Comment[sr]=Проста KDE-ова апликација
+-Comment[sv]=Ett enkelt KDE-program
+-Comment[xx]=xxA simple KDE Applicationxx
++Comment=A nice lmsensors frontend for KDE
++Comment[cs]=Pěkné rozhraní pro lmsemsors v KDE
++Comment[de]=Ein benutzerfreundliches lmsensors Frontend für KDE
++Comment[es]=Un agradable lmsensors frontend para KDE
++Comment[fr]=Un frontend sympatique pour lm-sensors et KDE
++Comment[he]=היישום KSensors -תוכנית קידמה יפה של KDE עבור lmsensors
++Comment[nb]=Ett behagelig lmsensors-grensesnitt for KDE
++Comment[nl]=Een gebruiksvriendelijke interface voor KDE
++Comment[pl]=Ładny frondend lmsensors dla KDE
++Comment[sv]=Ett trevligt gränssnitt mot lmsensors för KDE
+--- ksensors-0.7.3.orig/src/processexec.cpp
++++ ksensors-0.7.3/src/processexec.cpp
+@@ -37,17 +37,12 @@
+ bool ProcessExec::runAndWait()
+ {
+ clearData();
+- return start(Block,Communication(Stdout|Stderr));
++ return start(Block,Communication(Stdout | Stderr));
+ }
+
+ void ProcessExec::slotReceivedStdout(KProcess *proc, char *buf, int len)
+ {
+- if(bufLen+len>=bufMax) len= bufMax-bufLen;
+- if(len) {
+- memcpy(buffer+bufLen,buf,len);
+- bufLen+= len;
+- buffer[bufLen]=0;
+- }
++ buffer = QString(buf);
+ }
+
+ void ProcessExec::slotReceivedStderr(KProcess *proc, char *buf, int len)
+--- ksensors-0.7.3.orig/src/sounds/Makefile.am
++++ ksensors-0.7.3/src/sounds/Makefile.am
+@@ -5,9 +5,8 @@
+ EXTRA_DIST = ksensors_alert.wav
+
+ install-data-local:
+- $(mkinstalldirs) $(kde_datadir)/sounds
+- $(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(kde_datadir)/sounds/ksensors_alert.wav
++ $(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(kde_sounddir)/ksensors_alert.wav
+ uninstall-local:
+- -rm -f $(kde_datadir)/sounds/ksensors_alert.wav
++ rm -f $(kde_sounddir)/ksensors_alert.wav
+
+ ####### kdevelop will overwrite this part!!! (end)############
+--- ksensors-0.7.3.orig/po/sv.po
++++ ksensors-0.7.3/po/sv.po
+@@ -0,0 +1,423 @@
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: ksensors 0.7.3-7\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2004-08-18 23:19+0200\n"
++"PO-Revision-Date: 2005-11-02 22:34+0100\n"
++"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
++"Language-Team: Swedish <sv@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=iso-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Poedit-Language: swe\n"
++"X-Poedit-Country: swe\n"
++
++#: hdsensorslist.cpp:36
++msgid "Hard Disks"
++msgstr "Hrddiskar"
++
++#: i8ksensorslist.cpp:29
++msgid "MainBoard"
++msgstr "Moderkort"
++
++#: ksensorscfg.cpp:51
++msgid "KSensors Configuration"
++msgstr "Konfiguration av KSensors"
++
++#: ksensorscfg.cpp:56
++msgid "Global settings"
++msgstr "Globala instllningar"
++
++#: ksensorscfg.cpp:68
++msgid " sensors"
++msgstr " sensorer"
++
++#: ksensorscfg.cpp:85
++msgid "System Information"
++msgstr "Systeminformation"
++
++#: lmsensorscfg.cpp:101
++msgid "Temperature"
++msgstr "Temperatur"
++
++#: lmsensorscfg.cpp:107
++msgid "Fan"
++msgstr "Flkt"
++
++#: lmsensorscfg.cpp:110
++msgid "Voltage"
++msgstr "Volttal"
++
++#: lmsensorsdock.cpp:62
++msgid "&About KSensors"
++msgstr "&Om KSensors"
++
++#: lmsensorsdock.cpp:64
++#: lmsensorsdock.cpp:124
++msgid "&Minimize"
++msgstr "&Minimera"
++
++#: lmsensorsdock.cpp:64
++#: lmsensorsdock.cpp:124
++msgid "&Restore"
++msgstr "&terstll"
++
++#: lmsensorsdock.cpp:65
++msgid "&Exit"
++msgstr "&Avsluta"
++
++#: main.cpp:27
++msgid "KSensors - A nice lmsensors frontend for KDE"
++msgstr "KSensors - Ett trevligt grnssnitt mot lmsensors fr KDE"
++
++#: main.cpp:33
++msgid "Don't dock in KDE system tray."
++msgstr "Docka inte till KDE's systemraden."
++
++#: main.cpp:34
++msgid "Show splash screen."
++msgstr "Visa startbild."
++
++#: main.cpp:43
++#: rc.cpp:5
++msgid "KSensors"
++msgstr "KSensors"
++
++#: rc.cpp:1
++msgid "C&ustom"
++msgstr "Egendefinerad"
++
++#: rc.cpp:2
++msgid "AboutCfgDesign"
++msgstr "AboutCfgDesign"
++
++#: rc.cpp:3
++msgid "KSensors configuration"
++msgstr "KSensors konfiguration"
++
++#: rc.cpp:4
++msgid "Monitoring your motherboard"
++msgstr "vervaka ditt moderkort"
++
++#: rc.cpp:6
++msgid "Welcome to the KSensors configuration window. Click on the left to select a configuration option."
++msgstr "Vlkommen till KSenors konfigurationsfnster. Klicka p vnster sida fr att vlja en instllning."
++
++#: rc.cpp:7
++msgid "GeneralCfg"
++msgstr "GeneralCfg"
++
++#: rc.cpp:8
++msgid "Panels size"
++msgstr "Panelstorlek"
++
++#: rc.cpp:9
++msgid "64 x 64"
++msgstr "64 x 64"
++
++#: rc.cpp:10
++msgid "56 x 56"
++msgstr "56 x 56"
++
++#: rc.cpp:11
++msgid "48 x 48"
++msgstr "48 x 48"
++
++#: rc.cpp:12
++#: rc.cpp:55
++#: rc.cpp:59
++#: rc.cpp:91
++msgid "Colors"
++msgstr "Frger"
++
++#: rc.cpp:13
++msgid "Startup"
++msgstr "Starta upp"
++
++#: rc.cpp:14
++msgid "Autostart KSensors on KDE startup"
++msgstr "Autostarta KSensors vid uppstart av KDE"
++
++#: rc.cpp:15
++msgid "LMSensorsCfgDesign"
++msgstr "LMSensorsCfgDesign"
++
++#: rc.cpp:16
++msgid "Sensors"
++msgstr "Sensorer"
++
++#: rc.cpp:17
++msgid "General"
++msgstr "Allmnt"
++
++#: rc.cpp:19
++msgid "Description"
++msgstr "Beskrivning"
++
++#: rc.cpp:21
++msgid "Values"
++msgstr "Vrden"
++
++#: rc.cpp:23
++msgid "Current"
++msgstr "Nuvarande"
++
++#: rc.cpp:24
++msgid "Maximum"
++msgstr "Maximum"
++
++#: rc.cpp:25
++msgid "+1%"
++msgstr "+1%"
++
++#: rc.cpp:26
++msgid "+2%"
++msgstr "+2%"
++
++#: rc.cpp:27
++msgid "+3%"
++msgstr "+3%"
++
++#: rc.cpp:28
++msgid "+4%"
++msgstr "+4%"
++
++#: rc.cpp:29
++msgid "+5%"
++msgstr "+5%"
++
++#: rc.cpp:30
++msgid "+10%"
++msgstr "+10%"
++
++#: rc.cpp:31
++msgid "+15%"
++msgstr "+15%"
++
++#: rc.cpp:32
++msgid "+20%"
++msgstr "+20%"
++
++#: rc.cpp:33
++msgid "+30%"
++msgstr "+30%"
++
++#: rc.cpp:34
++msgid "+40%"
++msgstr "+40%"
++
++#: rc.cpp:35
++msgid "+50%"
++msgstr "+50%"
++
++#: rc.cpp:36
++msgid "Multiplier"
++msgstr "Multiplikator"
++
++#: rc.cpp:37
++msgid "Ideal"
++msgstr "Ideal"
++
++#: rc.cpp:38
++msgid "Minimum"
++msgstr "Minimum"
++
++#: rc.cpp:39
++msgid "Addition"
++msgstr "Tillgg"
++
++#: rc.cpp:41
++msgid "-1%"
++msgstr "-1%"
++
++#: rc.cpp:42
++msgid "-2%"
++msgstr "-2%"
++
++#: rc.cpp:43
++msgid "-3%"
++msgstr "-3%"
++
++#: rc.cpp:44
++msgid "-4%"
++msgstr "-4%"
++
++#: rc.cpp:45
++msgid "-5%"
++msgstr "-5%"
++
++#: rc.cpp:46
++msgid "-10%"
++msgstr "-10%"
++
++#: rc.cpp:47
++msgid "-15%"
++msgstr "-15%"
++
++#: rc.cpp:48
++msgid "-20%"
++msgstr "-20%"
++
++#: rc.cpp:49
++msgid "-30%"
++msgstr "-30%"
++
++#: rc.cpp:50
++msgid "-40%"
++msgstr "-40%"
++
++#: rc.cpp:51
++msgid "-50%"
++msgstr "-50%"
++
++#: rc.cpp:52
++msgid "Panel"
++msgstr "Panel"
++
++#: rc.cpp:54
++#: rc.cpp:58
++#: rc.cpp:90
++msgid "Visible"
++msgstr "Synlig"
++
++#: rc.cpp:56
++msgid "Dock"
++msgstr "Dockning"
++
++#: rc.cpp:60
++msgid "Alarm"
++msgstr "Alarm"
++
++#: rc.cpp:63
++msgid "Normal"
++msgstr "Normal"
++
++#: rc.cpp:64
++msgid "Alarms"
++msgstr "Larm"
++
++#: rc.cpp:65
++msgid "On reach alarm value:"
++msgstr "Nr larmvrdet uppns:"
++
++#: rc.cpp:66
++msgid "Apply to all sensors"
++msgstr "Tillmpa p alla sensorer"
++
++#: rc.cpp:67
++msgid "Do nothing"
++msgstr "Gr inget"
++
++#: rc.cpp:68
++msgid "Test"
++msgstr "Test"
++
++#: rc.cpp:69
++msgid "Play alarm sound"
++msgstr "Spela upp larmljud"
++
++#: rc.cpp:70
++msgid "Run command"
++msgstr "Kr kommando"
++
++#: rc.cpp:71
++#: rc.cpp:92
++msgid "Preferences"
++msgstr "Egenskaper"
++
++#: rc.cpp:72
++msgid "Temperatures scale"
++msgstr "Temperaturskala"
++
++#: rc.cpp:73
++msgid "Fahrenheit"
++msgstr "Fahrenheit"
++
++#: rc.cpp:74
++msgid "Celsius"
++msgstr "Celsius"
++
++#: rc.cpp:75
++msgid "Kelvin"
++msgstr "Kelvin"
++
++#: rc.cpp:76
++#: rc.cpp:93
++msgid "Update interval"
++msgstr "Uppdateringsintervall"
++
++#: rc.cpp:77
++#: rc.cpp:94
++msgid "s"
++msgstr "s"
++
++#: rc.cpp:78
++msgid "PaletteCfg"
++msgstr "PaletteCfg"
++
++#: rc.cpp:79
++#: rc.cpp:84
++msgid "Title"
++msgstr "Titel"
++
++#: rc.cpp:80
++msgid "+3.5V"
++msgstr "+3.5V"
++
++#: rc.cpp:81
++msgid "Default colors"
++msgstr "Standardfrger"
++
++#: rc.cpp:82
++msgid "Background"
++msgstr "Bakgrund"
++
++#: rc.cpp:85
++msgid "Value"
++msgstr "Vrde"
++
++#: rc.cpp:87
++msgid "SystemCfgDesign"
++msgstr "SystemCfgDesign"
++
++#: rc.cpp:88
++msgid "System Panels"
++msgstr "Systempaneler"
++
++#: systemcfg.cpp:47
++msgid "CPU Speed"
++msgstr "CPU-hastighet"
++
++#: systemcfg.cpp:48
++msgid "CPU State"
++msgstr "CPU Status"
++
++#: systemcfg.cpp:49
++msgid "RAM Used"
++msgstr "RAM anvnt"
++
++#: systemcfg.cpp:50
++msgid "SWAP Used"
++msgstr "SWAP anvnt"
++
++#: systemcfg.cpp:51
++msgid "Up Time"
++msgstr "Uppetid"
++
++#: _translatorinfo.cpp:1
++msgid ""
++"_: NAME OF TRANSLATORS\n"
++"Your names"
++msgstr "Daniel Nylander"
++
++#: _translatorinfo.cpp:3
++msgid ""
++"_: EMAIL OF TRANSLATORS\n"
++"Your emails"
++msgstr "po@danielnylander.se"
++
+--- ksensors-0.7.3.orig/po/pl.po
++++ ksensors-0.7.3/po/pl.po
+@@ -0,0 +1,413 @@
++# translation of pl.po to
++# translation of pl.po to
++# translation of ksensors.po to
++# This file is distributed under the same license as the PACKAGE package.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2005.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: pl\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2004-08-18 23:19+0200\n"
++"PO-Revision-Date: 2005-03-18 15:42+0100\n"
++"Last-Translator: \n"
++"Language-Team: <pl@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.9.1\n"
++
++#: hdsensorslist.cpp:36
++msgid "Hard Disks"
++msgstr "Twarde dyski"
++
++#: i8ksensorslist.cpp:29
++msgid "MainBoard"
++msgstr "Płyta główna"
++
++#: ksensorscfg.cpp:51
++msgid "KSensors Configuration"
++msgstr "Konfiguracja KSensors"
++
++#: ksensorscfg.cpp:56
++msgid "Global settings"
++msgstr "Globalne ustawienia"
++
++#: ksensorscfg.cpp:68
++msgid " sensors"
++msgstr " czujniki"
++
++#: ksensorscfg.cpp:85
++msgid "System Information"
++msgstr "Informacja o systemie"
++
++#: lmsensorscfg.cpp:101
++msgid "Temperature"
++msgstr "Temperatura"
++
++#: lmsensorscfg.cpp:107
++msgid "Fan"
++msgstr "Wiatrak"
++
++#: lmsensorscfg.cpp:110
++msgid "Voltage"
++msgstr "Napięcie"
++
++#: lmsensorsdock.cpp:62
++msgid "&About KSensors"
++msgstr "&O KSensors"
++
++#: lmsensorsdock.cpp:64 lmsensorsdock.cpp:124
++msgid "&Minimize"
++msgstr "&Minimalizuj"
++
++#: lmsensorsdock.cpp:64 lmsensorsdock.cpp:124
++msgid "&Restore"
++msgstr "&Przywróć"
++
++#: lmsensorsdock.cpp:65
++msgid "&Exit"
++msgstr "&Wyjście"
++
++#: main.cpp:27
++msgid "KSensors - A nice lmsensors frontend for KDE"
++msgstr "KSensors - Ładny frondend lmsensors dla KDE"
++
++#: main.cpp:33
++msgid "Don't dock in KDE system tray."
++msgstr "Nie dokuj w trayu systemowym KDE."
++
++#: main.cpp:34
++msgid "Show splash screen."
++msgstr "Pokaż ekran powitalny."
++
++#: main.cpp:43 rc.cpp:5
++msgid "KSensors"
++msgstr "KSensors"
++
++#: rc.cpp:1
++msgid "C&ustom"
++msgstr "&Własne"
++
++#: rc.cpp:2
++msgid "AboutCfgDesign"
++msgstr ""
++
++#: rc.cpp:3
++msgid "KSensors configuration"
++msgstr "Konfiguracja KSensors"
++
++#: rc.cpp:4
++msgid "Monitoring your motherboard"
++msgstr "Monitorowanie Twojej płyty głównej"
++
++#: rc.cpp:6
++msgid ""
++"Welcome to the KSensors configuration window. Click on the left to select a "
++"configuration option."
++msgstr "Witamy w oknie konfiguracji programu KSensors. Kliknij po lewej aby wybrać opcję do konfiguracji."
++
++#: rc.cpp:7
++msgid "GeneralCfg"
++msgstr ""
++
++#: rc.cpp:8
++msgid "Panels size"
++msgstr "Rozmiar panelu"
++
++#: rc.cpp:9
++msgid "64 x 64"
++msgstr ""
++
++#: rc.cpp:10
++msgid "56 x 56"
++msgstr ""
++
++#: rc.cpp:11
++msgid "48 x 48"
++msgstr ""
++
++#: rc.cpp:12 rc.cpp:55 rc.cpp:59 rc.cpp:91
++msgid "Colors"
++msgstr "Kolory"
++
++#: rc.cpp:13
++msgid "Startup"
++msgstr ""
++
++#: rc.cpp:14
++msgid "Autostart KSensors on KDE startup"
++msgstr "Uruchom KSensors przy starcie KDE"
++
++#: rc.cpp:15
++msgid "LMSensorsCfgDesign"
++msgstr ""
++
++#: rc.cpp:16
++msgid "Sensors"
++msgstr "Czujniki"
++
++#: rc.cpp:17
++msgid "General"
++msgstr "Ogólne"
++
++#: rc.cpp:19
++msgid "Description"
++msgstr "Opis"
++
++#: rc.cpp:21
++msgid "Values"
++msgstr "Wartość"
++
++#: rc.cpp:23
++msgid "Current"
++msgstr "Bieżaca"
++
++#: rc.cpp:24
++msgid "Maximum"
++msgstr "Maksymalna"
++
++#: rc.cpp:25
++msgid "+1%"
++msgstr ""
++
++#: rc.cpp:26
++msgid "+2%"
++msgstr ""
++
++#: rc.cpp:27
++msgid "+3%"
++msgstr ""
++
++#: rc.cpp:28
++msgid "+4%"
++msgstr ""
++
++#: rc.cpp:29
++msgid "+5%"
++msgstr ""
++
++#: rc.cpp:30
++msgid "+10%"
++msgstr ""
++
++#: rc.cpp:31
++msgid "+15%"
++msgstr ""
++
++#: rc.cpp:32
++msgid "+20%"
++msgstr ""
++
++#: rc.cpp:33
++msgid "+30%"
++msgstr ""
++
++#: rc.cpp:34
++msgid "+40%"
++msgstr ""
++
++#: rc.cpp:35
++msgid "+50%"
++msgstr ""
++
++#: rc.cpp:36
++msgid "Multiplier"
++msgstr "Mnożnik"
++
++#: rc.cpp:37
++msgid "Ideal"
++msgstr "Idealna"
++
++#: rc.cpp:38
++msgid "Minimum"
++msgstr "Minimalna"
++
++#: rc.cpp:39
++msgid "Addition"
++msgstr "Dodanie"
++
++#: rc.cpp:41
++msgid "-1%"
++msgstr ""
++
++#: rc.cpp:42
++msgid "-2%"
++msgstr ""
++
++#: rc.cpp:43
++msgid "-3%"
++msgstr ""
++
++#: rc.cpp:44
++msgid "-4%"
++msgstr ""
++
++#: rc.cpp:45
++msgid "-5%"
++msgstr ""
++
++#: rc.cpp:46
++msgid "-10%"
++msgstr ""
++
++#: rc.cpp:47
++msgid "-15%"
++msgstr ""
++
++#: rc.cpp:48
++msgid "-20%"
++msgstr ""
++
++#: rc.cpp:49
++msgid "-30%"
++msgstr ""
++
++#: rc.cpp:50
++msgid "-40%"
++msgstr ""
++
++#: rc.cpp:51
++msgid "-50%"
++msgstr ""
++
++#: rc.cpp:52
++msgid "Panel"
++msgstr ""
++
++#: rc.cpp:54 rc.cpp:58 rc.cpp:90
++msgid "Visible"
++msgstr "Widoczne"
++
++#: rc.cpp:56
++msgid "Dock"
++msgstr "Dokowanie"
++
++#: rc.cpp:60
++msgid "Alarm"
++msgstr ""
++
++#: rc.cpp:63
++msgid "Normal"
++msgstr "Normalne"
++
++#: rc.cpp:64
++msgid "Alarms"
++msgstr "Alarmy"
++
++#: rc.cpp:65
++msgid "On reach alarm value:"
++msgstr "Przy osiągnięciu wartości alarmowej:"
++
++#: rc.cpp:66
++msgid "Apply to all sensors"
++msgstr "Zatwierdź do wszystkich czujników"
++
++#: rc.cpp:67
++msgid "Do nothing"
++msgstr "Nie rób nic"
++
++#: rc.cpp:68
++msgid "Test"
++msgstr ""
++
++#: rc.cpp:69
++msgid "Play alarm sound"
++msgstr "Odtwarzaj dźwięk"
++
++#: rc.cpp:70
++msgid "Run command"
++msgstr "Wykonaj polecenie"
++
++#: rc.cpp:71 rc.cpp:92
++msgid "Preferences"
++msgstr "Właściwości"
++
++#: rc.cpp:72
++msgid "Temperatures scale"
++msgstr "Skala temperatur"
++
++#: rc.cpp:73
++msgid "Fahrenheit"
++msgstr ""
++
++#: rc.cpp:74
++msgid "Celsius"
++msgstr "Celciusz"
++
++#: rc.cpp:75
++msgid "Kelvin"
++msgstr "Kelwin"
++
++#: rc.cpp:76 rc.cpp:93
++msgid "Update interval"
++msgstr "Interwał aktualizacji"
++
++#: rc.cpp:77 rc.cpp:94
++msgid "s"
++msgstr ""
++
++#: rc.cpp:78
++msgid "PaletteCfg"
++msgstr ""
++
++#: rc.cpp:79 rc.cpp:84
++msgid "Title"
++msgstr "Tytuł"
++
++#: rc.cpp:80
++msgid "+3.5V"
++msgstr ""
++
++#: rc.cpp:81
++msgid "Default colors"
++msgstr "Domyślne kolory"
++
++#: rc.cpp:82
++msgid "Background"
++msgstr "Tło"
++
++#: rc.cpp:85
++msgid "Value"
++msgstr "Wartość"
++
++#: rc.cpp:87
++msgid "SystemCfgDesign"
++msgstr ""
++
++#: rc.cpp:88
++msgid "System Panels"
++msgstr "Panele systemowe"
++
++#: systemcfg.cpp:47
++msgid "CPU Speed"
++msgstr "Zegar CPU"
++
++#: systemcfg.cpp:48
++msgid "CPU State"
++msgstr "Status CPU"
++
++#: systemcfg.cpp:49
++msgid "RAM Used"
++msgstr "Użycie RAM"
++
++#: systemcfg.cpp:50
++msgid "SWAP Used"
++msgstr "Użycie SWAP"
++
++#: systemcfg.cpp:51
++msgid "Up Time"
++msgstr ""
++
++#: _translatorinfo.cpp:1
++msgid ""
++"_: NAME OF TRANSLATORS\n"
++"Your names"
++msgstr "Tomasz Waleńczak"
++
++#: _translatorinfo.cpp:3
++msgid ""
++"_: EMAIL OF TRANSLATORS\n"
++"Your emails"
++msgstr "tom@w.pl"
++
+--- ksensors-0.7.3.orig/po/nb.po
++++ ksensors-0.7.3/po/nb.po
+@@ -0,0 +1,422 @@
++# translation of nb.po to Norwegian Bokmål
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++#
++# Per Øyvind Karlsen <pkarlsen@mandriva.com>, 2006.
++msgid ""
++msgstr ""
++"Project-Id-Version: nb\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2004-08-18 23:19+0200\n"
++"PO-Revision-Date: 2006-09-27 20:52+0200\n"
++"Last-Translator: Per Øyvind Karlsen <pkarlsen@mandriva.com>\n"
++"Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.com>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.11.4\n"
++
++#: hdsensorslist.cpp:36
++msgid "Hard Disks"
++msgstr "Harddisker"
++
++#: i8ksensorslist.cpp:29
++msgid "MainBoard"
++msgstr "Hovedkort"
++
++#: ksensorscfg.cpp:51
++msgid "KSensors Configuration"
++msgstr "KSensors-oppsett"
++
++#: ksensorscfg.cpp:56
++msgid "Global settings"
++msgstr "Globale innstillinger"
++
++#: ksensorscfg.cpp:68
++msgid " sensors"
++msgstr " sensorer"
++
++#: ksensorscfg.cpp:85
++msgid "System Information"
++msgstr "Systeminformasjon"
++
++#: lmsensorscfg.cpp:101
++msgid "Temperature"
++msgstr "Temperatur"
++
++#: lmsensorscfg.cpp:107
++msgid "Fan"
++msgstr "Vifte"
++
++#: lmsensorscfg.cpp:110
++msgid "Voltage"
++msgstr "Spenning"
++
++#: lmsensorsdock.cpp:62
++msgid "&About KSensors"
++msgstr "&Om KSensors"
++
++#: lmsensorsdock.cpp:64
++#: lmsensorsdock.cpp:124
++msgid "&Minimize"
++msgstr "&Minimiser"
++
++#: lmsensorsdock.cpp:64
++#: lmsensorsdock.cpp:124
++msgid "&Restore"
++msgstr "&Gjenopprett"
++
++#: lmsensorsdock.cpp:65
++msgid "&Exit"
++msgstr "&Avslutt"
++
++#: main.cpp:27
++msgid "KSensors - A nice lmsensors frontend for KDE"
++msgstr "KSensors - Ett behagelig lmsensors-grensesnitt for KDE"
++
++#: main.cpp:33
++msgid "Don't dock in KDE system tray."
++msgstr "Ikke fest i KDE systemkurv."
++
++#: main.cpp:34
++msgid "Show splash screen."
++msgstr "Vis velkomstbilde."
++
++#: main.cpp:43
++#: rc.cpp:5
++msgid "KSensors"
++msgstr "KSensors"
++
++#: rc.cpp:1
++msgid "C&ustom"
++msgstr "&Egendefinert"
++
++#: rc.cpp:2
++msgid "AboutCfgDesign"
++msgstr "AboutCfgDesign"
++
++#: rc.cpp:3
++msgid "KSensors configuration"
++msgstr "KSensors-oppsett"
++
++#: rc.cpp:4
++msgid "Monitoring your motherboard"
++msgstr "Overvåk hovedkortet ditt"
++
++#: rc.cpp:6
++msgid "Welcome to the KSensors configuration window. Click on the left to select a configuration option."
++msgstr "Velkommen til KSensors opppsettsvindu. Klikk til venstre for å velge ett oppsettsvalg."
++
++#: rc.cpp:7
++msgid "GeneralCfg"
++msgstr "GeneralCfg"
++
++#: rc.cpp:8
++msgid "Panels size"
++msgstr "Panelstørrelse"
++
++#: rc.cpp:9
++msgid "64 x 64"
++msgstr "64 x 64"
++
++#: rc.cpp:10
++msgid "56 x 56"
++msgstr "56 x 56"
++
++#: rc.cpp:11
++msgid "48 x 48"
++msgstr "48 x 48"
++
++#: rc.cpp:12
++#: rc.cpp:55
++#: rc.cpp:59
++#: rc.cpp:91
++msgid "Colors"
++msgstr "Farger"
++
++#: rc.cpp:13
++msgid "Startup"
++msgstr "Oppstart"
++
++#: rc.cpp:14
++msgid "Autostart KSensors on KDE startup"
++msgstr "Start opp automatisk ved oppstart av KDE"
++
++#: rc.cpp:15
++msgid "LMSensorsCfgDesign"
++msgstr "LMSensorsCfgDesign"
++
++#: rc.cpp:16
++msgid "Sensors"
++msgstr "Sensorer"
++
++#: rc.cpp:17
++msgid "General"
++msgstr "Generelt"
++
++#: rc.cpp:19
++msgid "Description"
++msgstr "Beskrivelse"
++
++#: rc.cpp:21
++msgid "Values"
++msgstr "Verdier"
++
++#: rc.cpp:23
++msgid "Current"
++msgstr "Gjeldende"
++
++#: rc.cpp:24
++msgid "Maximum"
++msgstr "Maksimum"
++
++#: rc.cpp:25
++msgid "+1%"
++msgstr "+1%"
++
++#: rc.cpp:26
++msgid "+2%"
++msgstr "+2%"
++
++#: rc.cpp:27
++msgid "+3%"
++msgstr "+3%"
++
++#: rc.cpp:28
++msgid "+4%"
++msgstr "+4%"
++
++#: rc.cpp:29
++msgid "+5%"
++msgstr "+5%"
++
++#: rc.cpp:30
++msgid "+10%"
++msgstr "+10%"
++
++#: rc.cpp:31
++msgid "+15%"
++msgstr "+15%"
++
++#: rc.cpp:32
++msgid "+20%"
++msgstr "+20%"
++
++#: rc.cpp:33
++msgid "+30%"
++msgstr "+30%"
++
++#: rc.cpp:34
++msgid "+40%"
++msgstr "+40%"
++
++#: rc.cpp:35
++msgid "+50%"
++msgstr "+50%"
++
++#: rc.cpp:36
++msgid "Multiplier"
++msgstr "Multiplikator"
++
++#: rc.cpp:37
++msgid "Ideal"
++msgstr "Ideell"
++
++#: rc.cpp:38
++msgid "Minimum"
++msgstr "Minimum"
++
++#: rc.cpp:39
++msgid "Addition"
++msgstr "Tillegg"
++
++#: rc.cpp:41
++msgid "-1%"
++msgstr "-1%"
++
++#: rc.cpp:42
++msgid "-2%"
++msgstr "-2%"
++
++#: rc.cpp:43
++msgid "-3%"
++msgstr "-3%"
++
++#: rc.cpp:44
++msgid "-4%"
++msgstr "-4%"
++
++#: rc.cpp:45
++msgid "-5%"
++msgstr "-5%"
++
++#: rc.cpp:46
++msgid "-10%"
++msgstr "-10%"
++
++#: rc.cpp:47
++msgid "-15%"
++msgstr "-15%"
++
++#: rc.cpp:48
++msgid "-20%"
++msgstr "-20%"
++
++#: rc.cpp:49
++msgid "-30%"
++msgstr "-30%"
++
++#: rc.cpp:50
++msgid "-40%"
++msgstr "-40%"
++
++#: rc.cpp:51
++msgid "-50%"
++msgstr "-50%"
++
++#: rc.cpp:52
++msgid "Panel"
++msgstr "Panel"
++
++#: rc.cpp:54
++#: rc.cpp:58
++#: rc.cpp:90
++msgid "Visible"
++msgstr "Synlig"
++
++#: rc.cpp:56
++msgid "Dock"
++msgstr "Systemkurvfesting"
++
++#: rc.cpp:60
++msgid "Alarm"
++msgstr "Alarm"
++
++#: rc.cpp:63
++msgid "Normal"
++msgstr "Normal"
++
++#: rc.cpp:64
++msgid "Alarms"
++msgstr "Alarmer"
++
++#: rc.cpp:65
++msgid "On reach alarm value:"
++msgstr "Ved oppnådd alarmverdi:"
++
++#: rc.cpp:66
++msgid "Apply to all sensors"
++msgstr "Bruk for sensorer"
++
++#: rc.cpp:67
++msgid "Do nothing"
++msgstr "Gjør ingenting"
++
++#: rc.cpp:68
++msgid "Test"
++msgstr "Test"
++
++#: rc.cpp:69
++msgid "Play alarm sound"
++msgstr "Spill alarmlyd"
++
++#: rc.cpp:70
++msgid "Run command"
++msgstr "Kjør kommando"
++
++#: rc.cpp:71
++#: rc.cpp:92
++msgid "Preferences"
++msgstr "Egenskaper"
++
++#: rc.cpp:72
++msgid "Temperatures scale"
++msgstr "Temperaturskala"
++
++#: rc.cpp:73
++msgid "Fahrenheit"
++msgstr "Fahrenheit"
++
++#: rc.cpp:74
++msgid "Celsius"
++msgstr "Celsius"
++
++#: rc.cpp:75
++msgid "Kelvin"
++msgstr "Kelvin"
++
++#: rc.cpp:76
++#: rc.cpp:93
++msgid "Update interval"
++msgstr "Oppdateringsintervall"
++
++#: rc.cpp:77
++#: rc.cpp:94
++msgid "s"
++msgstr "s"
++
++#: rc.cpp:78
++msgid "PaletteCfg"
++msgstr "PaletteCfg"
++
++#: rc.cpp:79
++#: rc.cpp:84
++msgid "Title"
++msgstr "Tittel"
++
++#: rc.cpp:80
++msgid "+3.5V"
++msgstr "+3.5V"
++
++#: rc.cpp:81
++msgid "Default colors"
++msgstr "Standardfarger"
++
++#: rc.cpp:82
++msgid "Background"
++msgstr "Bakgrunn"
++
++#: rc.cpp:85
++msgid "Value"
++msgstr "Verdi"
++
++#: rc.cpp:87
++msgid "SystemCfgDesign"
++msgstr "SystemCfgDesign"
++
++#: rc.cpp:88
++msgid "System Panels"
++msgstr "Systempaneler"
++
++#: systemcfg.cpp:47
++msgid "CPU Speed"
++msgstr "CPU-hastighet"
++
++#: systemcfg.cpp:48
++msgid "CPU State"
++msgstr "CPU-status"
++
++#: systemcfg.cpp:49
++msgid "RAM Used"
++msgstr "RAM brukt"
++
++#: systemcfg.cpp:50
++msgid "SWAP Used"
++msgstr "SWAP brukt"
++
++#: systemcfg.cpp:51
++msgid "Up Time"
++msgstr "Oppetid"
++
++#: _translatorinfo.cpp:1
++msgid ""
++"_: NAME OF TRANSLATORS\n"
++"Your names"
++msgstr "Per Øyvind Karlsen"
++
++#: _translatorinfo.cpp:3
++msgid ""
++"_: EMAIL OF TRANSLATORS\n"
++"Your emails"
++msgstr "pkarlsen@mandriva.com"
++
+--- ksensors-0.7.3.orig/admin/cvs.sh
++++ ksensors-0.7.3/admin/cvs.sh
+@@ -29,7 +29,7 @@
+ {
+ AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+ case $AUTOCONF_VERSION in
+- Autoconf*2.5* | autoconf*2.5* ) : ;;
++ Autoconf*2.[56]* | autoconf*2.[56]* ) : ;;
+ "" )
+ echo "*** AUTOCONF NOT FOUND!."
+ echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
+@@ -44,7 +44,7 @@
+
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+ case $AUTOHEADER_VERSION in
+- Autoconf*2.5* | autoheader*2.5* ) : ;;
++ Autoconf*2.[56]* | autoheader*2.[56]* ) : ;;
+ "" )
+ echo "*** AUTOHEADER NOT FOUND!."
+ echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)"
+--- ksensors-0.7.3.orig/debian/control
++++ ksensors-0.7.3/debian/control
+@@ -0,0 +1,19 @@
++Source: ksensors
++Section: kde
++Priority: optional
++Maintainer: Aurelien Jarno <aurel32@debian.org>
++Build-Depends: debhelper (>> 5), autotools-dev, automake1.7, autoconf, libtool, perl, libsensors4-dev, libqt3-mt-dev (>= 3:3.3.4-7), kdelibs4-dev (>= 4:3.4.2), imagemagick
++Build-Conflicts: autoconf2.13
++Standards-Version: 3.8.3
++Homepage: http://ksensors.sourceforge.net
++
++Package: ksensors
++Architecture: any
++Depends: ${shlibs:Depends}, ${misc:Depends}, lm-sensors
++Recommends: hddtemp (>= 0.3beta2-1)
++Description: lm-sensors frontend for KDE
++ This is a lm-sensors frontend for KDE for monitoring a motherboard.
++ It allows you to access information from temperature and fan speed
++ sensors.
++ .
++ You will need lm-sensors kernel modules to use this package.
+--- ksensors-0.7.3.orig/debian/overrides
++++ ksensors-0.7.3/debian/overrides
+@@ -0,0 +1 @@
++ksensors: menu-item-contains-unknown-tag kderemove /usr/lib/menu/ksensors:8
+--- ksensors-0.7.3.orig/debian/docs
++++ ksensors-0.7.3/debian/docs
+@@ -0,0 +1,5 @@
++LEEME
++LIESMICH
++LISEZMOI
++README
++TODO
+--- ksensors-0.7.3.orig/debian/menu
++++ ksensors-0.7.3/debian/menu
+@@ -0,0 +1,7 @@
++?package(ksensors): \
++ needs="X11" \
++ section="Applications/System/Hardware" \
++ hints="KDE" \
++ title="KSensors" \
++ command="/usr/bin/ksensors" \
++ icon="/usr/share/pixmaps/ksensors.xpm"
+--- ksensors-0.7.3.orig/debian/dirs
++++ ksensors-0.7.3/debian/dirs
+@@ -0,0 +1,3 @@
++usr/share/lintian/overrides
++usr/share/pixmaps
++usr/share/sounds
+--- ksensors-0.7.3.orig/debian/ksensors.1
++++ ksensors-0.7.3/debian/ksensors.1
+@@ -0,0 +1,62 @@
++.\" Hey, EMACS: -*- nroff -*-
++.\" First parameter, NAME, should be all caps
++.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
++.\" other parameters are allowed: see man(7), man(1)
++.TH KSENSORS 1 "May 02, 2002"
++.\" Please adjust this date whenever revising the manpage.
++.\"
++.\" Some roff macros, for reference:
++.\" .nh disable hyphenation
++.\" .hy enable hyphenation
++.\" .ad l left justify
++.\" .ad b justify to both left and right margins
++.\" .nf disable filling
++.\" .fi enable filling
++.\" .br insert line break
++.\" .sp <n> insert n+1 empty lines
++.\" for manpage-specific macros, see man(7)
++.SH NAME
++ksensors \- lm-sensors frontend for KDE
++.SH SYNOPSIS
++.B ksensors
++.RI "[ options ]"
++.SH DESCRIPTION
++.B KSensors
++is a lm-sensors frontend for KDE for monitoring a motherboard.
++It allows you to access information from temperature and fan
++speed sensors.
++.SH OPTIONS
++A summary of options are included below.
++.TP
++.B \-\-nodock
++Don't dock in KDE system tray.
++.TP
++.B \-\-splash
++Show splash screen.
++.TP
++.B \-\-help
++Show summary of options.
++.TP
++.B \-\-help\-qt
++Show Qt specific options
++.TP
++.B \-\-help\-kde
++Show KDE specific options
++.TP
++.B \-\-help\-all
++Show all options
++.TP
++.B \-\-author
++Show author information
++.TP
++.B \-v, \-\-version
++Show version of program.
++.TP
++.B \-\-license
++Show license information
++.SH AUTHOR
++.B KSensors
++was written by Miguel Novas <michaell@teleline.es>.
++.br
++This manual page was written by Aurelien Jarno <aurel32@debian.org>,
++for the Debian GNU/Linux system (but may be used by others).
+--- ksensors-0.7.3.orig/debian/changelog
++++ ksensors-0.7.3/debian/changelog
+@@ -0,0 +1,436 @@
++ksensors (0.7.3-18) unstable; urgency=low
++
++ * Link the ksensors binary with libqt-mt (closes: bug#555063).
++ * Apply patch from Michael Schuele to fix multi-core sensors (closes:
++ bug#494090).
++ * Bumped standard version to 3.8.3 (no changes).
++
++ -- Aurelien Jarno <aurel32@debian.org> Sat, 14 Nov 2009 13:50:57 +0000
++
++ksensors (0.7.3-17) unstable; urgency=low
++
++ * Switch to debhelper 5.
++ * Bumped standard version to 3.8.2 (no changes).
++ * Don't assume config.guess and config.sub are updated by libtoolize
++ (Closes: bug#533987).
++
++ -- Aurelien Jarno <aurel32@debian.org> Tue, 30 Jun 2009 14:45:13 +0200
++
++ksensors (0.7.3-16) unstable; urgency=medium
++
++ * Bumped standard version to 3.8.0 (no changes).
++ * Get rid of libqt3-compat-headers, patch by Barry de Freese (closes:
++ bug#464657).
++ * Use to libsensors4 API.
++
++ -- Aurelien Jarno <aurel32@debian.org> Mon, 30 Jun 2008 16:12:07 +0200
++
++ksensors (0.7.3-15) unstable; urgency=low
++
++ * Update menu to match the new Debian menu subpolicy.
++
++ -- Aurelien Jarno <aurel32@debian.org> Mon, 30 Jul 2007 19:36:50 +0200
++
++ksensors (0.7.3-14) unstable; urgency=low
++
++ * Remove debconf templates as version 0.6.0 is now very old (not even
++ in sarge).
++ * Fix the installation path of the sound files (closes: bug#406706).
++
++ -- Aurelien Jarno <aurel32@debian.org> Thu, 21 Jun 2007 21:01:59 +0200
++
++ksensors (0.7.3-13) unstable; urgency=medium
++
++ * Fix the parsing of hddtemp output (closes: bug#394057).
++
++ -- Aurelien Jarno <aurel32@debian.org> Thu, 19 Oct 2006 17:46:29 +0200
++
++ksensors (0.7.3-12) unstable; urgency=medium
++
++ * Backports Norvegian translation from CVS.
++ * Add support for sensors without min/max settings (closes: bug#391922).
++
++ -- Aurelien Jarno <aurel32@debian.org> Tue, 10 Oct 2006 22:41:09 +0200
++
++ksensors (0.7.3-11) unstable; urgency=low
++
++ * Fixed a silly test of the autoconf version in the KDE scripts.
++ * Bumped standard version to 3.7.2 (no changes).
++
++ -- Aurelien Jarno <aurel32@debian.org> Fri, 21 Jul 2006 19:20:41 +0200
++
++ksensors (0.7.3-10) unstable; urgency=low
++
++ * Put all QRadioButtons of the alarm tab into a QButtonGroup widget
++ instead of a QLayout widget (closes: bug#353553).
++
++ -- Aurelien Jarno <aurel32@debian.org> Sun, 19 Feb 2006 22:32:06 +0100
++
++ksensors (0.7.3-9) unstable; urgency=low
++
++ * Relibtoolize the package to get rid of a lot of unneeded
++ dependencies,
++
++ -- Aurelien Jarno <aurel32@debian.org> Thu, 24 Nov 2005 20:35:47 +0100
++
++ksensors (0.7.3-8) unstable; urgency=low
++
++ * Added Swedish translation of ksensors. Thanks to Daniel Nylander (closes:
++ bug#337117).
++
++ -- Aurelien Jarno <aurel32@debian.org> Thu, 3 Nov 2005 01:59:54 +0100
++
++ksensors (0.7.3-7) unstable; urgency=low
++
++ * Patches pulled from CVS:
++ - Polish translation.
++ - Support for reading temperature from SCSI disks. Thanks to James
++ Stark (closes: bug#334614).
++
++ -- Aurelien Jarno <aurel32@debian.org> Wed, 19 Oct 2005 22:19:56 +0200
++
++ksensors (0.7.3-6) unstable; urgency=low
++
++ * Added Swedish debconf translation. Thanks to Daniel Nylander (closes:
++ bug#330609).
++
++ -- Aurelien Jarno <aurel32@debian.org> Mon, 3 Oct 2005 00:27:51 +0200
++
++ksensors (0.7.3-5) unstable; urgency=low
++
++ * C++ transition: build-depends on libqt3-mt-dev (>= 3:3.3.4-7) and
++ kdelibs4-dev (>= 4:3.4.2-1).
++ * Bumped Standards-Version to 3.6.2 (no changes).
++
++ -- Aurelien Jarno <aurel32@debian.org> Thu, 18 Aug 2005 11:05:13 +0200
++
++ksensors (0.7.3-4) unstable; urgency=low
++
++ * Added Vietnamese debconf translation. Thanks to Clytie Siddall (closes
++ bug#312175).
++ * Fixed a typo in the debconf template. Thanks to Clytie Siddall (closes:
++ bug#312176).
++
++ -- Aurelien Jarno <aurel32@debian.org> Tue, 7 Jun 2005 01:15:46 +0200
++
++ksensors (0.7.3-3) unstable; urgency=low
++
++ * Added Czech debconf translation. Thanks to Miroslav Kure (closes:
++ bug#293619).
++
++ -- Aurelien Jarno <aurel32@debian.org> Fri, 4 Feb 2005 21:41:06 +0100
++
++ksensors (0.7.3-2) unstable; urgency=low
++
++ * Added Italian debconf translation. Thanks to Luca Monducci. (closes:
++ bug#272147).
++
++ -- Aurelien Jarno <aurel32@debian.org> Sun, 26 Sep 2004 00:57:43 +0200
++
++ksensors (0.7.3-1) unstable; urgency=low
++
++ * New upstream version:
++ - Added support for reading ACPI temperatures (closes: bug#255079).
++
++ -- Aurelien Jarno <aurel32@debian.org> Thu, 19 Aug 2004 00:06:13 +0200
++
++ksensors (0.7.2-17) unstable; urgency=low
++
++ * Fixed display of values in the panel (closes: bug#265807).
++ * Fixed segfault when removing an info panel (closes: bug#225712,
++ #265806).
++ * Added an alarm sound (closes: bug#231280).
++
++ -- Aurelien Jarno <aurel32@debian.org> Tue, 17 Aug 2004 01:45:27 +0200
++
++ksensors (0.7.2-16) unstable; urgency=low
++
++ * Dont build-depends on make, it is a build-essential package.
++ * Applied a patch from Geoff Oakham to fix a freeze when used with hddtemp.
++ Thanks! (closes: bug#249093).
++
++ -- Aurelien Jarno <aurel32@debian.org> Sat, 15 May 2004 21:50:48 +0200
++
++ksensors (0.7.2-15) unstable; urgency=low
++
++ * Build-Depends on libsensors-dev (>= 2.8.4-1) so KSensors will be
++ built against libsensors3.
++
++ -- Aurelien Jarno <aurel32@debian.org> Sun, 29 Feb 2004 18:58:22 +0100
++
++ksensors (0.7.2-14) unstable; urgency=low
++
++ * Moved ja.po in the right directory (closes: bug#227820).
++
++ -- Aurelien Jarno <aurel32@debian.org> Sun, 15 Feb 2004 23:20:17 +0100
++
++ksensors (0.7.2-13) unstable; urgency=low
++
++ * Added Japanese debconf translation. Thanks to Hideki Yamane. (closes:
++ bug#227820).
++
++ -- Aurelien Jarno <aurel32@debian.org> Tue, 10 Feb 2004 23:58:39 +0100
++
++ksensors (0.7.2-12) unstable; urgency=low
++
++ * Added de debconf translation. Thanks to the german Skolelinux team
++ (closes: bug#2223114).
++
++ -- Aurelien Jarno <aurel32@debian.org> Sat, 6 Dec 2003 23:45:54 +0100
++
++ksensors (0.7.2-11) unstable; urgency=low
++
++ * Added dependency on lm-sensors (closes: Bug#215794).
++
++ -- Aurelien Jarno <aurel32@debian.org> Tue, 14 Oct 2003 21:48:13 +0200
++
++ksensors (0.7.2-10) unstable; urgency=low
++
++ * Build-Depends on libsensors-dev (>= 2.8.0-2) so KSensors will be
++ built against libsensors2 (closes: Bug#203953, Bug#212938).
++ * Added ru debconf translation. Thanks to Ilgiz Kalmetev (closes:
++ Bug#214366).
++
++ -- Aurelien Jarno <aurel32@debian.org> Mon, 6 Oct 2003 11:01:36 +0200
++
++ksensors (0.7.2-9) unstable; urgency=low
++
++ * The nl debconf translation is from Bart Cornelis and not Wessel
++ Dankers. Updated the changelog. Sorry Bart.
++
++ -- Aurelien Jarno <aurel32@debian.org> Wed, 20 Aug 2003 12:37:05 +0200
++
++ksensors (0.7.2-8) unstable; urgency=low
++
++ * Added nl debconf translation. Thanks to Bart Cornelis (closes:
++ Bug#204919).
++ * Bumped Standards-Version to 3.6.1.
++
++ -- Aurelien Jarno <aurel32@debian.org> Wed, 20 Aug 2003 11:24:53 +0200
++
++ksensors (0.7.2-7) unstable; urgency=low
++
++ * Added es debconf translation. Thanks to Carlos Alberto Martín Edo
++ (closes: Bug#201571).
++ * Bumped Standards-Version to 3.6.0.
++
++ -- Aurelien Jarno <aurel32@debian.org> Wed, 16 Jul 2003 17:36:03 +0200
++
++ksensors (0.7.2-6) unstable; urgency=low
++
++ * Added pt_BR debconf translations. Thanks to Andre Luis Lopes
++ (closes: Bug#198362).
++
++ -- Aurelien Jarno <aurel32@debian.org> Sun, 22 Jun 2003 02:59:03 +0200
++
++ksensors (0.7.2-5) unstable; urgency=low
++
++ * Rebuilt against latests libsensors-1debian1.
++ * Build-Depends on libsensors-dev (>= 2.7.0-4).
++ * Bumped Standards-Version to 3.5.10.
++ * Changed icon to full colors.
++
++ -- Aurelien Jarno <aurel32@debian.org> Sun, 1 Jun 2003 23:52:09 +0200
++
++ksensors (0.7.2-4) unstable; urgency=low
++
++ * Rebuilt against latest libsensors1 (closes: Bug#191562).
++ * Depends on libsensors1 (>> 2.7.0) as this libraries has some lack
++ of dependencies.
++
++ -- Aurelien Jarno <aurel32@debian.org> Thu, 1 May 2003 21:50:57 +0200
++
++ksensors (0.7.2-3) unstable; urgency=low
++
++ * Bumped Standards-Version to 3.5.9.
++ * Changed section from x11 to kde.
++
++ -- Aurelien Jarno <aurel32@debian.org> Sat, 19 Apr 2003 15:31:26 +0200
++
++ksensors (0.7.2-2) unstable; urgency=low
++
++ * Debconf templates are now managed with po-debconf.
++ * Depends on ${misc:Depends}.
++ * Don't depends on both xlibs (>> 4.1.0) and xlibs (>> 4.2.0).
++
++ -- Aurelien Jarno <aurel32@debian.org> Tue, 4 Mar 2003 23:19:44 +0100
++
++ksensors (0.7.2-1) unstable; urgency=low
++
++ * New upstream release.
++
++ -- Aurelien Jarno <aurel32@debian.org> Mon, 24 Feb 2003 09:42:58 +0100
++
++ksensors (0.7-11) unstable; urgency=low
++
++ * Build-depends on libqt3-compat-headers.
++ * Fixed a bug introduced by KDE 3 (closes: Bug#180982).
++
++ -- Aurelien Jarno <aurel32@debian.org> Sun, 16 Feb 2003 17:48:52 +0100
++
++ksensors (0.7-10) unstable; urgency=low
++
++ * Rebuilt for KDE 3.1.
++
++ -- Aurelien Jarno <aurel32@debian.org> Wed, 5 Feb 2003 22:51:50 +0100
++
++ksensors (0.7-9) unstable; urgency=low
++
++ * Force build with gcc-2.95 on most archs, gcc-2.96 on ia64 and gcc-3.0 on
++ hppa.
++
++ -- Aurelien Jarno <aurel32@debian.org> Wed, 8 Jan 2003 14:53:22 +0100
++
++ksensors (0.7-8) unstable; urgency=low
++
++ * Updated the code for hddtemp-0.3.
++
++ -- Aurelien Jarno <aurel32@debian.org> Sat, 4 Jan 2003 10:11:30 +0100
++
++ksensors (0.7-7) unstable; urgency=low
++
++ * Standards-Version bumped to 3.5.8.
++ * Changed icon to 24 colors to follow the menu policy.
++ * Updated copyright file.
++
++ -- Aurelien Jarno <aurel32@debian.org> Fri, 20 Dec 2002 19:08:58 +0100
++
++ksensors (0.7-6) unstable; urgency=low
++
++ * Added a patch to handle temperature sensors whose name doesn't begin with
++ "temp" or "temp1" correctly (closes: Bug#165353).
++
++ -- Aurelien Jarno <aurel32@debian.org> Sat, 19 Oct 2002 20:56:32 +0200
++
++ksensors (0.7-5) unstable; urgency=low
++
++ * Added a patch to save the config on KDE exit (closes: Bug#158164).
++
++ -- Aurelien Jarno <aurel32@debian.org> Tue, 8 Oct 2002 01:13:24 +0200
++
++ksensors (0.7-4) unstable; urgency=low
++
++ * Updated the code to correctly handle the degree sign in the output of
++ hddtemp.
++
++ -- Aurelien Jarno <aurel32@debian.org> Thu, 26 Sep 2002 02:24:47 +0200
++
++ksensors (0.7-3) unstable; urgency=low
++
++ * Added an autostart option in configuration dialog (closes: Bug#155532).
++
++ -- Aurelien Jarno <aurel32@debian.org> Sat, 7 Sep 2002 11:59:19 +0200
++
++ksensors (0.7-2) unstable; urgency=low
++
++ * Added a patch to open the panel on same desktop as on exit
++ (closes: Bug#158164).
++ * Updated Policy standard compliance to 3.5.7
++
++ -- Aurelien Jarno <aurel32@debian.org> Wed, 4 Sep 2002 15:04:42 +0200
++
++ksensors (0.7-1) unstable; urgency=low
++
++ * New upstream release
++ Changelog:
++ - Allow docking fan and voltage sensors
++ - Configuration dialog redesign (more modular).
++ - Several panel sizes
++ For more information, please see the full Changelog in
++ /usr/share/doc/ksensors.
++
++ -- Aurelien Jarno <aurel32@debian.org> Thu, 13 Jun 2002 17:49:49 +0200
++
++ksensors (0.6.1-2) unstable; urgency=low
++
++ * Now depends on debconf.
++ * Now recommends hddtemp.
++
++ -- Aurelien Jarno <aurel32@debian.org> Wed, 8 May 2002 22:45:50 +0200
++
++ksensors (0.6.1-1) unstable; urgency=low
++
++ * New upstream release.
++ Changelog:
++ - New Hardisks Temperatures sensor panels
++ - Changed cpu state, swap and ram panels appearance.
++ - Added splash screen.
++ - Added --nodock option.
++ - Configurable Panels colors.
++ - Support for multiple lm-sensors chips.
++ For more information, please see the full Changelog in
++ /usr/share/doc/ksensors.
++
++ -- Aurelien Jarno <aurel32@debian.org> Thu, 2 May 2002 01:09:17 +0200
++
++ksensors (0.5-8) unstable; urgency=low
++
++ * This time with a correct "Maintainer" field.
++
++ -- Aurelien Jarno <aurel32@debian.org> Wed, 10 Apr 2002 23:05:17 +0200
++
++ksensors (0.5-7) unstable; urgency=low
++
++ * Rebuild ksensors under pbuilder so it will depends on libsensors1
++ (closes: Bug#142218).
++
++ -- Aurelien Jarno <aurel32@debian.org> Wed, 10 Apr 2002 21:29:53 +0200
++
++ksensors (0.5-6) unstable; urgency=low
++
++ * Added Build-Depends.
++
++ -- Aurelien Jarno <aurel32@debian.org> Sun, 31 Mar 2002 13:26:10 +0200
++
++ksensors (0.5-5) unstable; urgency=low
++
++ * Changed my maintainer e-mail address to <aurel32@debian.org>. :)
++
++ -- Aurelien Jarno <aurel32@debian.org> Mon, 18 Mar 2002 21:24:46 +0100
++
++ksensors (0.5-4) unstable; urgency=low
++
++ * Created an autostart file (closes: Bug#136562).
++
++ -- Aurelien Jarno <aurelien@aurel32.net> Sun, 3 Mar 2002 19:51:32 +0100
++
++ksensors (0.5-3) unstable; urgency=low
++
++ * Initial Debian upload (closes: Bug#129913).
++
++ -- Aurelien Jarno <aurelien@aurel32.net> Fri, 8 Feb 2002 14:23:09 +0100
++
++ksensors (0.5-2) unstable; urgency=low
++
++ * Add Build-Depends.
++
++ -- Aurelien Jarno <aurelien@aurel32.net> Thu, 24 Jan 2002 15:49:03 +0100
++
++ksensors (0.5-1) unstable; urgency=low
++
++ * New upstream release.
++ Changelog:
++ * Added Voltage Sensors panels
++ * Added Cpu state and Uptime panels
++ * Temperatures in celsius,farenheit or kelvin scales
++ * Configurable update intervals for sensors and system info panels
++ * English, spanish, french, german and dutch translations
++ * Configuration dialog redesign
++
++ -- Aurelien Jarno <aurelien@aurel32.net> Sun, 12 Jan 2002 23:41:57 +0100
++
++sensors (0.4-1) unstable; urgency=low
++
++ * New upstream release.
++
++ -- Aurelien Jarno <aurelien@aurel32.net> Mon, 07 Jan 2002 09:43:17 +0100
++
++ksensors (0.3-1) unstable; urgency=low
++
++ * Initial Release.
++
++ -- Aurelien Jarno <aurelien@aurel32.net> Wed, 12 Dec 2001 16:49:52 +0100
++
++Local variables:
++mode: debian-changelog
++End:
+--- ksensors-0.7.3.orig/debian/rules
++++ ksensors-0.7.3/debian/rules
+@@ -0,0 +1,111 @@
++#!/usr/bin/make -f
++# Sample debian/rules that uses debhelper.
++# GNU copyright 1997 to 1999 by Joey Hess.
++
++# Uncomment this to turn on verbose mode.
++#export DH_VERBOSE=1
++
++# These are used for cross-compiling and for saving the configure script
++# from having to guess our platform (since we know it already)
++DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
++DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
++
++ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
++ CFLAGS += -g
++endif
++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
++ INSTALL_PROGRAM += -s
++endif
++
++build: build-stamp
++
++-include debian/debiandirs
++
++debian/debiandirs: admin/debianrules
++ perl -w admin/debianrules echodirs > debian/debiandirs
++
++build-stamp:
++ dh_testdir
++
++ /usr/bin/libtoolize -f
++ cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
++ cp -f /usr/share/misc/config.guess admin/config.guess
++ cp -f /usr/share/misc/config.sub admin/config.sub
++
++ $(MAKE) -f admin/Makefile.common
++
++ QTDIR=/usr/share/qt3 ./configure $(configkde) --disable-final
++ $(MAKE)
++ touch build-stamp
++
++clean:
++ dh_testdir
++ dh_testroot
++ [ ! -f Makefile ] || $(MAKE) clean distclean
++ -rm -f po/*.gmo
++ -rm -f debian/debiandirs
++ -rm -f admin/config.sub admin/config.guess admin/ltmain.sh configure
++ -rm -f admin/libtool.m4.in aclocal.m4 acinclude.m4
++ -rm -f config.log
++ -find $(CURDIR) -name Makefile.in -exec rm -f {} \;
++ -rm -f build-stamp install-stamp
++ dh_clean
++
++install: build
++ dh_testdir
++ dh_testroot
++ dh_clean -k
++ dh_installdirs
++
++ # Install overrides.
++ install -p -o root -g root -m 644 $(CURDIR)/debian/overrides $(CURDIR)/debian/ksensors/usr/share/lintian/overrides/ksensors
++
++ # Main install.
++ $(MAKE) install DESTDIR=$(CURDIR)/debian/ksensors
++
++ # Make common links for docs.
++ for p in `dh_listpackages`; do \
++ for i in `find $(CURDIR)/debian/ksensors/usr/share/doc/kde/HTML -type d -name $$p -name $$p -not -regex .*/en/$$p`; do \
++ ln -f -n -s ../common $$i/common; done; done
++
++ # Installing icons
++ /usr/bin/convert $(CURDIR)/src/pics/hi16-app-ksensors.png $(CURDIR)/debian/ksensors/usr/share/pixmaps/ksensors.xpm
++
++ perl -w admin/debianrules cleanup
++
++
++# Build architecture-independent files here.
++binary-indep: build install
++# We have nothing to do by default.
++
++# Build architecture-dependent files here.
++binary-arch: build install
++ dh_testdir
++ dh_testroot
++ dh_installdebconf
++ dh_installdocs
++# dh_installexamples
++ dh_installmenu
++# dh_installlogrotate
++# dh_installemacsen
++# dh_installpam
++# dh_installmime
++# dh_installinit
++# dh_installcron
++ dh_installman
++# dh_installinfo
++ dh_installchangelogs ChangeLog
++ dh_link
++ dh_strip
++ dh_compress --exclude=.docbook
++ dh_fixperms
++# dh_makeshlibs
++ dh_installdeb
++# dh_perl
++ dh_shlibdeps
++ dh_gencontrol
++ dh_md5sums
++ dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary install configure
+--- ksensors-0.7.3.orig/debian/compat
++++ ksensors-0.7.3/debian/compat
+@@ -0,0 +1 @@
++5
+--- ksensors-0.7.3.orig/debian/copyright
++++ ksensors-0.7.3/debian/copyright
+@@ -0,0 +1,16 @@
++This package was debianized by Aurelien Jarno <aurelien@aurel32.net> on
++Wed, 12 Dec 2001 16:49:52 +0100
++
++It was downloaded from http://ksensors.sourceforge.net
++
++Upstream Authors:
++ Miguel Novas <michaell@teleline.es>
++
++Copyright:
++ (C) 2001-2002 by Miguel Novas <michaell@teleline.es>
++
++
++
++You are free to distribute this software under the terms of the GNU General
++Public License. On Debian systems, the complete text of the GNU General Public
++License can be found in /usr/share/common-licenses/GPL file.
+--- ksensors-0.7.3.orig/debian/manpages
++++ ksensors-0.7.3/debian/manpages
+@@ -0,0 +1 @@
++debian/ksensors.1
diff --git a/redhat/extras/ksensors/ksensors_0.7.3-18.diff.gz b/redhat/extras/ksensors/ksensors_0.7.3-18.diff.gz
deleted file mode 100644
index 1ea0e2152..000000000
--- a/redhat/extras/ksensors/ksensors_0.7.3-18.diff.gz
+++ /dev/null
Binary files differ
diff --git a/redhat/extras/ksensors/trinity-ksensors-3.5.13.1.spec b/redhat/extras/ksensors/trinity-ksensors-3.5.13.1.spec
new file mode 100644
index 000000000..f00bcc569
--- /dev/null
+++ b/redhat/extras/ksensors/trinity-ksensors-3.5.13.1.spec
@@ -0,0 +1,268 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# TDE 3.5.13 specific building variables
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+Name: trinity-ksensors
+Version: 0.7.3
+Release: 19p3%{?dist}%{?_variant}
+
+Summary: KDE frontend to lm_sensors
+Group: Applications/System
+License: GPLv2+
+URL: http://ksensors.sourceforge.net/
+
+Source0: http://downloads.sourceforge.net/ksensors/ksensors-%{version}.tar.gz
+
+# Debian (upstream) patch
+Patch2: ksensors_0.7.3-18.diff
+# Fix 'lmsensor.cpp' for older lm_sensors API (< 3.x)
+Patch7: ksensors-0.7.3-18-lmsensors_2x_fix.patch
+# [ksensors] Fix autotools detection
+Patch9: ksensors-0.7.3-fix_autotools_detection.patch
+# Fix TDE directories detection
+Patch10: ksensors-0.7.3-tde_includedir.patch
+# Fix sound installation
+Patch11: ksensors-0.7.3-fix_sound_installation.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
+
+%if 0%{?suse_version}
+BuildRequires: libsensors4-devel
+%else
+BuildRequires: lm_sensors-devel
+%endif
+
+# Keep archs in sync with lm_sensors
+ExcludeArch: s390 s390x
+
+%description
+KSensors is a nice lm-sensors frontend for the K Desktop Environment.
+Install the hddtemp package if you wish to monitor hard disk
+temperatures with KSensors.
+
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n ksensors-%{version}
+%patch2 -p1 -b .debian
+%patch7 -p1 -b .lm2x
+%patch9 -p1 -b .autotools
+%patch10 -p1 -b .tdeinc
+%patch11 -p1 -b .sound
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i admin/acinclude.m4.in \
+ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+%__sed -i -e 's|$(kde_datadir)/sounds|$(kde_sounddir)|' src/sounds/Makefile.*
+for f in ChangeLog LIESMICH LISEZMOI ; do
+ iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+done
+
+%build
+unset QTDIR; . /etc/profile.d/qt3.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+
+export KDEDIR=%{tde_prefix}
+
+%configure \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --disable-dependency-tracking \
+ --disable-rpath \
+ --with-extra-includes=%{tde_includedir}/tqt \
+ --with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir}
+
+%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT
+
+# Creates autostart shortcut
+%__install -dm 755 $RPM_BUILD_ROOT%{tde_datadir}/autostart
+%__ln_s ../applnk/Utilities/ksensors.desktop \
+ $RPM_BUILD_ROOT%{tde_datadir}/autostart
+
+#__rm -rf $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML
+
+%find_lang ksensors
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%post
+for f in locolor hicolor ; do
+ touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || :
+ gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || :
+done
+
+%postun
+for f in locolor hicolor ; do
+ touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || :
+ gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || :
+done
+
+
+%files -f ksensors.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING FAQ README TODO
+%lang(es) %doc LEEME
+%lang(de) %doc LIESMICH
+%lang(fr) %doc LISEZMOI
+%{tde_bindir}/ksensors
+%{tde_datadir}/applnk/Utilities/ksensors.desktop
+%{tde_datadir}/apps/ksensors/
+%{tde_datadir}/autostart/ksensors.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ksensors.png
+%{tde_datadir}/icons/locolor/
+%{tde_datadir}/sounds/ksensors_alert.wav
+%{tde_tdedocdir}/HTML/en/ksensors/
+
+%changelog
+* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p3
+- Initial build for TDE 3.5.13.1
+
+* Thu Dec 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p2
+- Update Debian patch to -18 release
+
+* Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p1
+- Rebuilt for RHEL 6, RHEL 5, Fedora 15 with TDE 3.5.13
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb 15 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-16
+- Update Debian patch to -15 release
+
+* Thu Jan 3 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-15
+- Change BuildRequires: kdelibs-devel into kdelibs3-devel
+
+* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-14
+- Patch for and Rebuild against lm_sensors-3.0.0
+
+* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-13
+- Fix reading of min and max tresholds from libsensors
+
+* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-12
+- Update License tag for new Licensing Guidelines compliance
+
+* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-11
+- Remove OnlyShowIn=KDE; from .desktop file (I like using ksensors under GNOME,
+ works fine grumbel)
+
+* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-10
+- Add icon-cache update scriptlets
+- Add Requires: hicolor-icon-theme for dir ownership
+
+* Fri Jul 20 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-9
+- Sync Exclu(de|sive)Arch with new lm_sensors (#249060).
+
+* Tue Jun 26 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-8
+- Update Debian patchset to -14 for additional fixes and translations;
+ drop our hddtemp detection patch in favour of the one included in it.
+- Drop Application and X-Fedora categories from .desktop file, add GenericName.
+- Make autostart checkbox effective again (#242570).
+- Convert docs to UTF-8.
+
+* Sat Sep 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-7
+- Apply Debian -11 patchset for upstream radio button state fix,
+ support for hddtemp with SCSI disks and more translations.
+
+* Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-6
+- Rebuild.
+
+* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-5
+- Rebuild.
+
+* Thu Nov 3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-4
+- Clean up build dependencies.
+
+* Thu May 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-3
+- Sync arch availability with FC4 lm_sensors (%%{ix86}, x86_64, alpha).
+- Reduce directory ownership bloat.
+
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7.3-2
+- rebuilt
+
+* Sat Aug 21 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.3-0.fdr.1
+- Update to 0.7.3, most patches applied upstream.
+- Disable dependency tracking to speed up the build.
+
+* Tue Jul 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.4
+- Force use of multithreaded Qt with --enable-mt to fix build on FC2.
+- Sync Debian patch to 0.7.2-16 to get a fix for freeze with hddtemp.
+- Apply upstream patches #913569 and #915725.
+- Disable RPATH.
+- Don't ship the "handbook", it's just a template.
+- Other minor improvements here and there.
+
+* Sat Aug 2 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.3
+- Own dirs under %%{_datadir}/icons and %%{_docdir}/HTML (bug 21).
+- Don't tweak path to hddtemp.
+- Patch to fix hddtemp detection.
+- s/--enable-xinerama/--with-xinerama/
+- Borrow man page from Debian.
+
+* Sat May 31 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.2
+- Spec cleanups.
+
+* Fri Apr 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.1
+- Update to current Fedora guidelines.
+- Move desktop entry to %%{_datadir}/applications using desktop-file-install.
+
+* Sun Feb 23 2003 Warren Togami <warren@togami.com> - 0.7.2-1.fedora.2
+- BuildRequires libart_lgpl-devel needed for Red Hat 8.1
+
+* Sun Feb 23 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-1.fedora.1
+- Update to 0.7.2.
+- Don't apply startup crash patch, but keep it around for now.
+
+* Sat Feb 15 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.2
+- Include startup crash patch from upstream SRPM.
+
+* Sun Feb 9 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.1
+- First Fedora release.
diff --git a/redhat/extras/ksensors/trinity-ksensors.spec b/redhat/extras/ksensors/trinity-ksensors-3.5.13.spec
index 529d2623e..529d2623e 100644
--- a/redhat/extras/ksensors/trinity-ksensors.spec
+++ b/redhat/extras/ksensors/trinity-ksensors-3.5.13.spec
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-02 12:06:35 +0000