Merge lp:~jfi/ubuntu/quantal/psensor/new-upstream into lp:ubuntu/quantal/psensor

[Jean-Philippe Orsini]

* Merge from Debian testing. Remaining changes:
    + Modifed build-dep to add NVidia and Application Indicator support
    + Only add an nvidia-settings build-dep on i386 and amd6
    + debian/patches/LP1021900.patch: added degree Celcius symbol
* Remove drop_g_thread_init.patch: fixed upstream since 0.6.2.17
* Remove LP968912.patch: fixed upstream since 0.6.2.17

Merge from debian testing to update to new upstream release which removes 2 patches in the Ubuntu package.
The new debian packaging is changing builddep libcurl4-openssl-dev to libcurl4-gnutls-dev (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=668180).
The new upstream release is modifying:
   - src/lib/amd.c which is not compiled on ubuntu
   - src/main.c to remove the call of g_thread_init (corresponding to the ubuntu patch drop_g_thread_init.patch)
   - src/lib/psensor.c to fix LP #968912 (corresponding to the ubuntu patch LP968912.patch)
   - all sources files to update the end date of the copyright
It should fix the 2 conflicts files reported by 'merge-o-matic' see https://merges.ubuntu.com/p/psensor/REPORT

[James Page (james-page)]

Hi Jean-Philippe

Thanks for taking the time to prepare this merge from Debian unstable.

You need to document what has happened to all of the changes that where made since this package was last merged from Debian in the changelog entry for 0.6.2.17-2ubuntu1; if patches or changes have been dropped this should be documented with reasons why.

Please update

Thanks.

review: Needs Fixing

[Jean-Philippe Orsini (jfi)]

Hello James,

I have update the debian/changelog file.

I have removed the 2 patches from the package because the 2 corresponding bugs are fixed by the psensor version that has been merged.

Thanks for the review.

Unmerged revisions

18. By Jean-Philippe Orsini on 2012-07-18

Updated changelog:
 - added LP1021900.patch as remaining changes
 - added information about the drop of 2 patches with reason

17. By Jean-Philippe Orsini on 2012-07-16

Merged with last revision of lp:ubuntu/psensor

16. By Jean-Philippe Orsini on 2012-07-16

removed useless patches

15. By Jean-Philippe Orsini on 2012-07-13

* Merge from Debian testing. Remaining changes:
  + Modifed build-dep to add NVidia and Application Indicator support
  + Only add an nvidia-settings build-dep on i386 and amd6

14. By Jean-Philippe Orsini on 2012-07-13

drop patches which has been integrated into the 0.6.2.17 release of psensor

13. By Jean-Philippe Orsini on 2012-07-13

* merge with debian sid
* debian/control
   - replaced libcurl4-openssl-dev build dep to
     libcurl4-gnutls-dev. (Closes: #668180)
* New upstream release
    - Fixed sensor type displayed in sensor preferences. (Closes LP: #968912)
* debian/control
    - Switched to Standards-Version 3.9.3.
* debian/copyright
    - Changed end date to 2012.

=== removed directory '.pc/LP1021900.patch'
=== removed directory '.pc/LP1021900.patch/src'
=== removed directory '.pc/LP1021900.patch/src/lib'
=== removed file '.pc/LP1021900.patch/src/lib/psensor.c'
--- .pc/LP1021900.patch/src/lib/psensor.c	2012-07-07 00:47:44 +0000
+++ .pc/LP1021900.patch/src/lib/psensor.c	1970-01-01 00:00:00 +0000
@@ -1,461 +0,0 @@
-/*
- * Copyright (C) 2010-2012 [e-mail]
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-#include <stdlib.h>
-#include <string.h>
-
-#include <locale.h>
-#include <libintl.h>
-#define _(str) gettext(str)
-
-#include "hdd.h"
-#include "psensor.h"
-#include "lmsensor.h"
-
-#ifdef HAVE_GTOP
-#include "cpu.h"
-#endif
-
-
-struct psensor *psensor_create(char *id, char *name,
-			       unsigned int type, int values_max_length)
-{
-	struct psensor *psensor
-	    = (struct psensor *)malloc(sizeof(struct psensor));
-
-	psensor->id = id;
-	psensor->name = name;
-	psensor->enabled = 1;
-	psensor->min = UNKNOWN_DBL_VALUE;
-	psensor->max = UNKNOWN_DBL_VALUE;
-
-	psensor->type = type;
-
-	psensor->values_max_length = values_max_length;
-	psensor->measures = measures_dbl_create(values_max_length);
-
-	psensor->alarm_limit = 0;
-
-	psensor->cb_alarm_raised = NULL;
-	psensor->cb_alarm_raised_data = NULL;
-	psensor->alarm_raised = 0;
-
-	psensor->alarm_enabled = 0;
-
-	psensor->url = NULL;
-
-	psensor->color = NULL;
-
-	return psensor;
-}
-
-void psensor_values_resize(struct psensor *s, int new_size)
-{
-	struct measure *new_ms, *cur_ms;
-	int cur_size;
-
-	cur_size = s->values_max_length;
-	cur_ms = s->measures;
-	new_ms = measures_dbl_create(new_size);
-
-	if (cur_ms) {
-		int i;
-		for (i = 0; i < new_size - 1 && i < cur_size - 1; i++)
-			measure_copy(&cur_ms[cur_size - i - 1],
-				     &new_ms[new_size - i - 1]);
-
-		measures_free(s->measures);
-	}
-
-	s->values_max_length = new_size;
-	s->measures = new_ms;
-}
-
-void psensor_free(struct psensor *sensor)
-{
-	if (sensor) {
-		free(sensor->name);
-		free(sensor->id);
-
-		if (sensor->color)
-			free(sensor->color);
-
-		measures_free(sensor->measures);
-
-		free(sensor->url);
-
-		free(sensor);
-	}
-}
-
-void psensor_list_free(struct psensor **sensors)
-{
-	struct psensor **sensor_cur;
-
-	if (sensors) {
-		sensor_cur = sensors;
-
-		while (*sensor_cur) {
-			psensor_free(*sensor_cur);
-
-			sensor_cur++;
-		}
-
-		free(sensors);
-
-		sensors = NULL;
-	}
-}
-
-int psensor_list_size(struct psensor **sensors)
-{
-	int size;
-	struct psensor **sensor_cur;
-
-	if (!sensors)
-		return 0;
-
-	size = 0;
-	sensor_cur = sensors;
-
-	while (*sensor_cur) {
-		size++;
-		sensor_cur++;
-	}
-	return size;
-}
-
-int psensor_list_contains_type(struct psensor **sensors, unsigned int type)
-{
-	struct psensor **s;
-
-	if (!sensors)
-		return 0;
-
-	s = sensors;
-	while (*s) {
-		if ((*s)->type == type)
-			return 1;
-		s++;
-	}
-
-	return 0;
-}
-
-struct psensor **psensor_list_add(struct psensor **sensors,
-				  struct psensor *sensor)
-{
-	int size = psensor_list_size(sensors);
-
-	struct psensor **result
-	    = malloc((size + 1 + 1) * sizeof(struct psensor *));
-
-	if (sensors)
-		memcpy(result, sensors, size * sizeof(struct psensor *));
-
-	result[size] = sensor;
-	result[size + 1] = NULL;
-
-	return result;
-}
-
-struct psensor *psensor_list_get_by_id(struct psensor **sensors, const char *id)
-{
-	struct psensor **sensors_cur = sensors;
-
-	while (*sensors_cur) {
-		if (!strcmp((*sensors_cur)->id, id))
-			return *sensors_cur;
-
-		sensors_cur++;
-	}
-
-	return NULL;
-}
-
-int is_temp_type(unsigned int type)
-{
-	return type & SENSOR_TYPE_TEMP;
-}
-
-int is_fan_type(unsigned int type)
-{
-	return type & SENSOR_TYPE_FAN;
-}
-
-char *psensor_value_to_string(unsigned int type, double value)
-{
-	/* should not be possible to exceed 20 characters with temp or
-	   rpm values the .x part is never displayed */
-	char *str = malloc(20);
-
-	char *unit;
-
-	if (is_temp_type(type))
-		unit = "C";
-	else if (type & SENSOR_TYPE_CPU_USAGE)
-		unit = "%";
-	else
-		unit = "";
-
-	sprintf(str, "%.0f%s", value, unit);
-
-	return str;
-}
-
-void psensor_set_current_value(struct psensor *sensor, double value)
-{
-	struct timeval tv;
-
-	if (gettimeofday(&tv, NULL) != 0)
-		timerclear(&tv);
-
-	psensor_set_current_measure(sensor, value, tv);
-}
-
-void
-psensor_set_current_measure(struct psensor *s,
-			    double v, struct timeval tv)
-{
-	memmove(s->measures,
-		&s->measures[1],
-		(s->values_max_length - 1) * sizeof(struct measure));
-
-	s->measures[s->values_max_length - 1].value.d_num = v;
-	s->measures[s->values_max_length - 1].time = tv;
-
-	if (s->min == UNKNOWN_DBL_VALUE || v < s->min)
-		s->min = v;
-
-	if (s->max == UNKNOWN_DBL_VALUE || v > s->max)
-		s->max = v;
-
-	if (s->alarm_limit && s->alarm_enabled) {
-		if (v > s->alarm_limit) {
-			if (!s->alarm_raised && s->cb_alarm_raised)
-				s->cb_alarm_raised(s,
-						   s->cb_alarm_raised_data);
-
-			s->alarm_raised = 1;
-		} else {
-			s->alarm_raised = 0;
-		}
-	}
-}
-
-double psensor_get_current_value(struct psensor *sensor)
-{
-	return sensor->measures[sensor->values_max_length - 1].value.d_num;
-}
-
-struct measure *psensor_get_current_measure(struct psensor *sensor)
-{
-	return &sensor->measures[sensor->values_max_length - 1];
-}
-
-/*
-  Returns the minimal value of a given 'type' (SENSOR_TYPE_TEMP or
-  SENSOR_TYPE_FAN)
- */
-double get_min_value(struct psensor **sensors, int type)
-{
-	double m = UNKNOWN_DBL_VALUE;
-	struct psensor **s = sensors;
-
-	while (*s) {
-		struct psensor *sensor = *s;
-
-		if (sensor->enabled && (sensor->type & type)) {
-			int i;
-			double t;
-
-			for (i = 0; i < sensor->values_max_length; i++) {
-				t = sensor->measures[i].value.d_num;
-
-				if (t == UNKNOWN_DBL_VALUE)
-					continue;
-
-				if (m == UNKNOWN_DBL_VALUE || t < m)
-					m = t;
-			}
-		}
-		s++;
-	}
-
-	return m;
-}
-
-/*
-  Returns the maximal value of a given 'type' (SENSOR_TYPE_TEMP or
-  SENSOR_TYPE_FAN)
- */
-double get_max_value(struct psensor **sensors, int type)
-{
-	double m = UNKNOWN_DBL_VALUE;
-	struct psensor **s = sensors;
-
-	while (*s) {
-		struct psensor *sensor = *s;
-
-		if (sensor->enabled && (sensor->type & type)) {
-			int i;
-			double t;
-			for (i = 0; i < sensor->values_max_length; i++) {
-				t = sensor->measures[i].value.d_num;
-
-				if (t == UNKNOWN_DBL_VALUE)
-					continue;
-
-				if (m == UNKNOWN_DBL_VALUE || t > m)
-					m = t;
-			}
-		}
-		s++;
-	}
-
-	return m;
-}
-
-double
-psensor_get_max_current_value(struct psensor **sensors, unsigned int type)
-{
-	double m = UNKNOWN_DBL_VALUE;
-	struct psensor **s_cur = sensors;
-
-	while (*s_cur) {
-		struct psensor *s = *s_cur;
-
-		if (s->enabled && (s->type & type)) {
-			double v = psensor_get_current_value(s);
-
-			if (m == UNKNOWN_DBL_VALUE || v > m)
-				m = v;
-		}
-
-		s_cur++;
-	}
-
-	return m;
-}
-
-double get_min_temp(struct psensor **sensors)
-{
-	return get_min_value(sensors, SENSOR_TYPE_TEMP);
-}
-
-double get_min_rpm(struct psensor **sensors)
-{
-	return get_min_value(sensors, SENSOR_TYPE_FAN);
-}
-
-double get_max_rpm(struct psensor **sensors)
-{
-	return get_max_value(sensors, SENSOR_TYPE_FAN);
-}
-
-double get_max_temp(struct psensor **sensors)
-{
-	return get_max_value(sensors, SENSOR_TYPE_TEMP);
-}
-
-struct psensor **get_all_sensors(int values_max_length)
-{
-	struct psensor **psensors = NULL;
-	struct psensor **tmp_psensors;
-
-	psensors = lmsensor_psensor_list_add(NULL, values_max_length);
-
-	tmp_psensors = hdd_psensor_list_add(psensors, values_max_length);
-	if (tmp_psensors != psensors) {
-		free(psensors);
-		psensors = tmp_psensors;
-	}
-
-	if (!psensors) {	/* there is no detected sensors */
-		psensors = malloc(sizeof(struct psensor *));
-		*psensors = NULL;
-	}
-
-	return psensors;
-}
-
-const char *psensor_type_to_str(unsigned int type)
-{
-	if ((type & SENSOR_TYPE_NVIDIA_TEMP) == SENSOR_TYPE_NVIDIA_TEMP)
-		return "NVidia GPU Temperature";
-
-	if ((type & SENSOR_TYPE_AMD_TEMP) == SENSOR_TYPE_AMD_TEMP)
-		return "AMD GPU Temperature";
-
-	if ((type & SENSOR_TYPE_AMD_FAN) == SENSOR_TYPE_AMD_FAN)
-		return "AMD GPU Fan Speed";
-
-	if ((type & SENSOR_TYPE_HDD_TEMP) == SENSOR_TYPE_HDD_TEMP)
-		return "HDD Temperature";
-
-	if (type & SENSOR_TYPE_CPU_USAGE)
-		return "CPU Usage";
-
-	if (type & SENSOR_TYPE_TEMP)
-		return "Temperature";
-
-	if (type & SENSOR_TYPE_FAN)
-		return "Fan";
-
-	if (type & SENSOR_TYPE_REMOTE)
-		return "Remote";
-
-	return "N/A";		/* should not be possible */
-}
-
-
-const char *psensor_type_to_unit_str(unsigned int type)
-{
-	if (type & SENSOR_TYPE_TEMP)
-		return _("C");
-
-	if (type & SENSOR_TYPE_FAN)
-		return _("RPM");
-
-	if (type & SENSOR_TYPE_CPU_USAGE)
-		return _("%");
-
-	return "N/A";
-}
-
-void psensor_list_update_measures(struct psensor **sensors)
-{
-	lmsensor_psensor_list_update(sensors);
-
-#ifdef HAVE_GTOP
-	cpu_psensor_list_update(sensors);
-#endif
-
-	if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDD_TEMP))
-		hdd_psensor_list_update(sensors);
-}
-
-void psensor_init()
-{
-	lmsensor_init();
-}
-
-void psensor_cleanup()
-{
-	lmsensor_cleanup();
-}

=== removed directory '.pc/LP968912.patch'
=== removed directory '.pc/LP968912.patch/src'
=== removed directory '.pc/LP968912.patch/src/lib'
=== removed file '.pc/LP968912.patch/src/lib/psensor.c'
--- .pc/LP968912.patch/src/lib/psensor.c	2012-03-30 09:07:58 +0000
+++ .pc/LP968912.patch/src/lib/psensor.c	1970-01-01 00:00:00 +0000
@@ -1,461 +0,0 @@
-/*
- * Copyright (C) 2010-2011 [e-mail]
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-#include <stdlib.h>
-#include <string.h>
-
-#include <locale.h>
-#include <libintl.h>
-#define _(str) gettext(str)
-
-#include "hdd.h"
-#include "psensor.h"
-#include "lmsensor.h"
-
-#ifdef HAVE_GTOP
-#include "cpu.h"
-#endif
-
-
-struct psensor *psensor_create(char *id, char *name,
-			       unsigned int type, int values_max_length)
-{
-	struct psensor *psensor
-	    = (struct psensor *)malloc(sizeof(struct psensor));
-
-	psensor->id = id;
-	psensor->name = name;
-	psensor->enabled = 1;
-	psensor->min = UNKNOWN_DBL_VALUE;
-	psensor->max = UNKNOWN_DBL_VALUE;
-
-	psensor->type = type;
-
-	psensor->values_max_length = values_max_length;
-	psensor->measures = measures_dbl_create(values_max_length);
-
-	psensor->alarm_limit = 0;
-
-	psensor->cb_alarm_raised = NULL;
-	psensor->cb_alarm_raised_data = NULL;
-	psensor->alarm_raised = 0;
-
-	psensor->alarm_enabled = 0;
-
-	psensor->url = NULL;
-
-	psensor->color = NULL;
-
-	return psensor;
-}
-
-void psensor_values_resize(struct psensor *s, int new_size)
-{
-	struct measure *new_ms, *cur_ms;
-	int cur_size;
-
-	cur_size = s->values_max_length;
-	cur_ms = s->measures;
-	new_ms = measures_dbl_create(new_size);
-
-	if (cur_ms) {
-		int i;
-		for (i = 0; i < new_size - 1 && i < cur_size - 1; i++)
-			measure_copy(&cur_ms[cur_size - i - 1],
-				     &new_ms[new_size - i - 1]);
-
-		measures_free(s->measures);
-	}
-
-	s->values_max_length = new_size;
-	s->measures = new_ms;
-}
-
-void psensor_free(struct psensor *sensor)
-{
-	if (sensor) {
-		free(sensor->name);
-		free(sensor->id);
-
-		if (sensor->color)
-			free(sensor->color);
-
-		measures_free(sensor->measures);
-
-		free(sensor->url);
-
-		free(sensor);
-	}
-}
-
-void psensor_list_free(struct psensor **sensors)
-{
-	struct psensor **sensor_cur;
-
-	if (sensors) {
-		sensor_cur = sensors;
-
-		while (*sensor_cur) {
-			psensor_free(*sensor_cur);
-
-			sensor_cur++;
-		}
-
-		free(sensors);
-
-		sensors = NULL;
-	}
-}
-
-int psensor_list_size(struct psensor **sensors)
-{
-	int size;
-	struct psensor **sensor_cur;
-
-	if (!sensors)
-		return 0;
-
-	size = 0;
-	sensor_cur = sensors;
-
-	while (*sensor_cur) {
-		size++;
-		sensor_cur++;
-	}
-	return size;
-}
-
-int psensor_list_contains_type(struct psensor **sensors, unsigned int type)
-{
-	struct psensor **s;
-
-	if (!sensors)
-		return 0;
-
-	s = sensors;
-	while (*s) {
-		if ((*s)->type == type)
-			return 1;
-		s++;
-	}
-
-	return 0;
-}
-
-struct psensor **psensor_list_add(struct psensor **sensors,
-				  struct psensor *sensor)
-{
-	int size = psensor_list_size(sensors);
-
-	struct psensor **result
-	    = malloc((size + 1 + 1) * sizeof(struct psensor *));
-
-	if (sensors)
-		memcpy(result, sensors, size * sizeof(struct psensor *));
-
-	result[size] = sensor;
-	result[size + 1] = NULL;
-
-	return result;
-}
-
-struct psensor *psensor_list_get_by_id(struct psensor **sensors, const char *id)
-{
-	struct psensor **sensors_cur = sensors;
-
-	while (*sensors_cur) {
-		if (!strcmp((*sensors_cur)->id, id))
-			return *sensors_cur;
-
-		sensors_cur++;
-	}
-
-	return NULL;
-}
-
-int is_temp_type(unsigned int type)
-{
-	return type & SENSOR_TYPE_TEMP;
-}
-
-int is_fan_type(unsigned int type)
-{
-	return type & SENSOR_TYPE_FAN;
-}
-
-char *psensor_value_to_string(unsigned int type, double value)
-{
-	/* should not be possible to exceed 20 characters with temp or
-	   rpm values the .x part is never displayed */
-	char *str = malloc(20);
-
-	char *unit;
-
-	if (is_temp_type(type))
-		unit = "C";
-	else if (type & SENSOR_TYPE_CPU_USAGE)
-		unit = "%";
-	else
-		unit = "";
-
-	sprintf(str, "%.0f%s", value, unit);
-
-	return str;
-}
-
-void psensor_set_current_value(struct psensor *sensor, double value)
-{
-	struct timeval tv;
-
-	if (gettimeofday(&tv, NULL) != 0)
-		timerclear(&tv);
-
-	psensor_set_current_measure(sensor, value, tv);
-}
-
-void
-psensor_set_current_measure(struct psensor *s,
-			    double v, struct timeval tv)
-{
-	memmove(s->measures,
-		&s->measures[1],
-		(s->values_max_length - 1) * sizeof(struct measure));
-
-	s->measures[s->values_max_length - 1].value.d_num = v;
-	s->measures[s->values_max_length - 1].time = tv;
-
-	if (s->min == UNKNOWN_DBL_VALUE || v < s->min)
-		s->min = v;
-
-	if (s->max == UNKNOWN_DBL_VALUE || v > s->max)
-		s->max = v;
-
-	if (s->alarm_limit && s->alarm_enabled) {
-		if (v > s->alarm_limit) {
-			if (!s->alarm_raised && s->cb_alarm_raised)
-				s->cb_alarm_raised(s,
-						   s->cb_alarm_raised_data);
-
-			s->alarm_raised = 1;
-		} else {
-			s->alarm_raised = 0;
-		}
-	}
-}
-
-double psensor_get_current_value(struct psensor *sensor)
-{
-	return sensor->measures[sensor->values_max_length - 1].value.d_num;
-}
-
-struct measure *psensor_get_current_measure(struct psensor *sensor)
-{
-	return &sensor->measures[sensor->values_max_length - 1];
-}
-
-/*
-  Returns the minimal value of a given 'type' (SENSOR_TYPE_TEMP or
-  SENSOR_TYPE_FAN)
- */
-double get_min_value(struct psensor **sensors, int type)
-{
-	double m = UNKNOWN_DBL_VALUE;
-	struct psensor **s = sensors;
-
-	while (*s) {
-		struct psensor *sensor = *s;
-
-		if (sensor->enabled && (sensor->type & type)) {
-			int i;
-			double t;
-
-			for (i = 0; i < sensor->values_max_length; i++) {
-				t = sensor->measures[i].value.d_num;
-
-				if (t == UNKNOWN_DBL_VALUE)
-					continue;
-
-				if (m == UNKNOWN_DBL_VALUE || t < m)
-					m = t;
-			}
-		}
-		s++;
-	}
-
-	return m;
-}
-
-/*
-  Returns the maximal value of a given 'type' (SENSOR_TYPE_TEMP or
-  SENSOR_TYPE_FAN)
- */
-double get_max_value(struct psensor **sensors, int type)
-{
-	double m = UNKNOWN_DBL_VALUE;
-	struct psensor **s = sensors;
-
-	while (*s) {
-		struct psensor *sensor = *s;
-
-		if (sensor->enabled && (sensor->type & type)) {
-			int i;
-			double t;
-			for (i = 0; i < sensor->values_max_length; i++) {
-				t = sensor->measures[i].value.d_num;
-
-				if (t == UNKNOWN_DBL_VALUE)
-					continue;
-
-				if (m == UNKNOWN_DBL_VALUE || t > m)
-					m = t;
-			}
-		}
-		s++;
-	}
-
-	return m;
-}
-
-double
-psensor_get_max_current_value(struct psensor **sensors, unsigned int type)
-{
-	double m = UNKNOWN_DBL_VALUE;
-	struct psensor **s_cur = sensors;
-
-	while (*s_cur) {
-		struct psensor *s = *s_cur;
-
-		if (s->enabled && (s->type & type)) {
-			double v = psensor_get_current_value(s);
-
-			if (m == UNKNOWN_DBL_VALUE || v > m)
-				m = v;
-		}
-
-		s_cur++;
-	}
-
-	return m;
-}
-
-double get_min_temp(struct psensor **sensors)
-{
-	return get_min_value(sensors, SENSOR_TYPE_TEMP);
-}
-
-double get_min_rpm(struct psensor **sensors)
-{
-	return get_min_value(sensors, SENSOR_TYPE_FAN);
-}
-
-double get_max_rpm(struct psensor **sensors)
-{
-	return get_max_value(sensors, SENSOR_TYPE_FAN);
-}
-
-double get_max_temp(struct psensor **sensors)
-{
-	return get_max_value(sensors, SENSOR_TYPE_TEMP);
-}
-
-struct psensor **get_all_sensors(int values_max_length)
-{
-	struct psensor **psensors = NULL;
-	struct psensor **tmp_psensors;
-
-	psensors = lmsensor_psensor_list_add(NULL, values_max_length);
-
-	tmp_psensors = hdd_psensor_list_add(psensors, values_max_length);
-	if (tmp_psensors != psensors) {
-		free(psensors);
-		psensors = tmp_psensors;
-	}
-
-	if (!psensors) {	/* there is no detected sensors */
-		psensors = malloc(sizeof(struct psensor *));
-		*psensors = NULL;
-	}
-
-	return psensors;
-}
-
-const char *psensor_type_to_str(unsigned int type)
-{
-	if (type & SENSOR_TYPE_REMOTE)
-		return "Remote";
-
-	if (type & SENSOR_TYPE_LMSENSOR_TEMP)
-		return "Temperature";
-
-	if (type & SENSOR_TYPE_LMSENSOR_FAN)
-		return "Fan";
-
-	if (type & SENSOR_TYPE_NVIDIA_TEMP)
-		return "NVidia GPU Temperature";
-
-	if (type & SENSOR_TYPE_AMD_TEMP)
-		return "AMD GPU Temperature";
-
-	if (type & SENSOR_TYPE_AMD_FAN)
-		return "AMD GPU Fan Speed";
-
-	if (type & SENSOR_TYPE_HDD_TEMP)
-		return "HDD Temperature";
-
-	if (type & SENSOR_TYPE_CPU_USAGE)
-		return "CPU Usage";
-
-	return "N/A";		/* should not be possible */
-}
-
-
-const char *psensor_type_to_unit_str(unsigned int type)
-{
-	if (type & SENSOR_TYPE_TEMP)
-		return _("C");
-
-	if (type & SENSOR_TYPE_FAN)
-		return _("RPM");
-
-	if (type & SENSOR_TYPE_CPU_USAGE)
-		return _("%");
-
-	return "N/A";
-}
-
-void psensor_list_update_measures(struct psensor **sensors)
-{
-	lmsensor_psensor_list_update(sensors);
-
-#ifdef HAVE_GTOP
-	cpu_psensor_list_update(sensors);
-#endif
-
-	if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDD_TEMP))
-		hdd_psensor_list_update(sensors);
-}
-
-void psensor_init()
-{
-	lmsensor_init();
-}
-
-void psensor_cleanup()
-{
-	lmsensor_cleanup();
-}

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2012-07-07 00:47:44 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-drop_g_thread_init.patch
-LP968912.patch
-LP1021900.patch

=== removed directory '.pc/drop_g_thread_init.patch'
=== removed directory '.pc/drop_g_thread_init.patch/src'
=== removed file '.pc/drop_g_thread_init.patch/src/main.c'
--- .pc/drop_g_thread_init.patch/src/main.c	2012-01-21 22:41:34 +0000
+++ .pc/drop_g_thread_init.patch/src/main.c	1970-01-01 00:00:00 +0000
@@ -1,539 +0,0 @@
-/*
- * Copyright (C) 2010-2011 [e-mail]
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-#include <locale.h>
-
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <gtk/gtk.h>
-
-#include "config.h"
-
-#include "cfg.h"
-#include "psensor.h"
-#include "graph.h"
-#include "ui.h"
-#include "ui_sensorlist.h"
-#include "ui_color.h"
-#include "lmsensor.h"
-#include "ui_pref.h"
-#include "ui_graph.h"
-#include "ui_status.h"
-
-#ifdef HAVE_UNITY
-#include "ui_unity.h"
-#endif
-
-#ifdef HAVE_NVIDIA
-#include "nvidia.h"
-#endif
-
-#ifdef HAVE_LIBATIADL
-#include "amd.h"
-#endif
-
-#ifdef HAVE_REMOTE_SUPPORT
-#include "rsensor.h"
-#endif
-
-#include "ui_appindicator.h"
-
-#ifdef HAVE_LIBNOTIFY
-#include "ui_notify.h"
-#endif
-
-#ifdef HAVE_GTOP
-#include "cpu.h"
-#endif
-
-#include "compat.h"
-
-static const char *program_name;
-
-static void print_version()
-{
-	printf("psensor %s\n", VERSION);
-	printf(_("Copyright (C) %s [e-mail]\n"
-		 "License GPLv2: GNU GPL version 2 or later "
-		 "<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n"
-		 "This is free software: you are free to change and "
-		 " redistribute it.\n"
-		 "There is NO WARRANTY, to the extent permitted by law.\n"),
-	       "2010-2011");
-}
-
-static void print_help()
-{
-	printf(_("Usage: %s [OPTION]...\n"), program_name);
-
-	puts(_("psensor is a GTK application for monitoring hardware sensors, "
-	       "including temperatures and fan speeds."));
-
-	puts("");
-	puts(_("Options:"));
-	puts(_("  -h, --help          display this help and exit\n"
-	       "  -v, --version       display version information and exit"));
-
-	puts("");
-
-	puts(_("  -u, --url=URL       "
-	       "the URL of the psensor-server, example: http://hostname:3131"));
-
-	puts("");
-
-	puts(_("  -d, --debug=LEVEL   "
-	       "set the debug level, integer between 0 and 3"));
-
-	puts("");
-
-	printf(_("Report bugs to: %s\n"), PACKAGE_BUGREPORT);
-	puts("");
-	printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
-}
-
-/*
-  Updates the size of the sensor values if different than the
-  configuration.
- */
-void
-update_psensor_values_size(struct psensor **sensors, struct config *cfg)
-{
-	struct psensor **cur;
-
-	cur = sensors;
-	while (*cur) {
-		struct psensor *s = *cur;
-
-		if (s->values_max_length != cfg->sensor_values_max_length)
-			psensor_values_resize(s,
-					      cfg->sensor_values_max_length);
-
-		cur++;
-	}
-}
-
-static void log_measures(struct psensor **sensors)
-{
-	if (log_level == LOG_DEBUG)
-		while (*sensors) {
-			log_debug("Measure: %s %.2f",
-				   (*sensors)->name,
-				   psensor_get_current_value(*sensors));
-
-			sensors++;
-		}
-}
-
-void update_psensor_measures(struct ui_psensor *ui)
-{
-	struct psensor **sensors = ui->sensors;
-	struct config *cfg = ui->config;
-
-	while (1) {
-		g_mutex_lock(ui->sensors_mutex);
-
-		if (!sensors)
-			return;
-
-		update_psensor_values_size(sensors, ui->config);
-
-		psensor_list_update_measures(sensors);
-#ifdef HAVE_REMOTE_SUPPORT
-		remote_psensor_list_update(sensors);
-#endif
-#ifdef HAVE_NVIDIA
-		nvidia_psensor_list_update(sensors);
-#endif
-#ifdef HAVE_LIBATIADL
-		amd_psensor_list_update(sensors);
-#endif
-
-		log_measures(sensors);
-
-		g_mutex_unlock(ui->sensors_mutex);
-
-		sleep(cfg->sensor_update_interval);
-	}
-}
-
-static void indicators_update(struct ui_psensor *ui)
-{
-	struct psensor **sensor_cur = ui->sensors;
-	unsigned int attention = 0;
-
-	while (*sensor_cur) {
-		struct psensor *s = *sensor_cur;
-
-		if (s->alarm_enabled && s->alarm_raised) {
-			attention = 1;
-			break;
-		}
-
-		sensor_cur++;
-	}
-
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
-	if (is_appindicator_supported())
-		ui_appindicator_update(ui, attention);
-#endif
-
-	if (is_status_supported())
-		ui_status_update(ui, attention);
-}
-
-gboolean ui_refresh_thread(gpointer data)
-{
-	struct config *cfg;
-	gboolean ret;
-	struct ui_psensor *ui = (struct ui_psensor *)data;
-
-	ret = TRUE;
-	cfg = ui->config;
-
-	g_mutex_lock(ui->sensors_mutex);
-
-	graph_update(ui->sensors, ui->w_graph, ui->config);
-
-	ui_sensorlist_update(ui);
-
-	if (is_appindicator_supported() || is_status_supported())
-		indicators_update(ui);
-
-#ifdef HAVE_UNITY
-	ui_unity_launcher_entry_update(ui->sensors,
-				       !cfg->unity_launcher_count_disabled);
-#endif
-
-	if (ui->graph_update_interval != cfg->graph_update_interval) {
-		ui->graph_update_interval = cfg->graph_update_interval;
-		ret = FALSE;
-	}
-
-	g_mutex_unlock(ui->sensors_mutex);
-
-	if (ret == FALSE)
-		g_timeout_add(1000 * ui->graph_update_interval,
-			      ui_refresh_thread, ui);
-
-	return ret;
-}
-
-void cb_alarm_raised(struct psensor *sensor, void *data)
-{
-#ifdef HAVE_LIBNOTIFY
-	if (sensor->enabled)
-		ui_notify(sensor, (struct ui_psensor *)data);
-#endif
-}
-
-static void associate_colors(struct psensor **sensors)
-{
-	/* number of uniq colors */
-#define COLORS_COUNT 8
-
-	unsigned int colors[COLORS_COUNT][3] = {
-		{0x0000, 0x0000, 0x0000},	/* black */
-		{0xffff, 0x0000, 0x0000},	/* red */
-		{0x0000, 0.0000, 0xffff},	/* blue */
-		{0x0000, 0xffff, 0x0000},	/* green */
-
-		{0x7fff, 0x7fff, 0x7fff},	/* grey */
-		{0x7fff, 0x0000, 0x0000},	/* dark red */
-		{0x0000, 0x0000, 0x7fff},	/* dark blue */
-		{0x0000, 0x7fff, 0x0000}	/* dark green */
-	};
-
-	struct psensor **sensor_cur = sensors;
-	int i = 0;
-	while (*sensor_cur) {
-		struct color default_color;
-		color_set(&default_color,
-			  colors[i % COLORS_COUNT][0],
-			  colors[i % COLORS_COUNT][1],
-			  colors[i % COLORS_COUNT][2]);
-
-		(*sensor_cur)->color
-		    = config_get_sensor_color((*sensor_cur)->id,
-					      &default_color);
-
-		sensor_cur++;
-		i++;
-	}
-}
-
-static void
-associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
-{
-	struct psensor **sensor_cur = sensors;
-	while (*sensor_cur) {
-		struct psensor *s = *sensor_cur;
-
-		s->cb_alarm_raised = cb_alarm_raised;
-		s->cb_alarm_raised_data = ui;
-
-		if (is_temp_type(s->type)) {
-			s->alarm_limit
-			    = config_get_sensor_alarm_limit(s->id, 60);
-			s->alarm_enabled
-			    = config_get_sensor_alarm_enabled(s->id);
-		} else {
-			s->alarm_limit = 0;
-			s->alarm_enabled = 0;
-		}
-
-		sensor_cur++;
-	}
-}
-
-static void associate_preferences(struct psensor **sensors)
-{
-	struct psensor **sensor_cur = sensors;
-	while (*sensor_cur) {
-		char *n;
-		struct psensor *s = *sensor_cur;
-
-		s->enabled = config_is_sensor_enabled(s->id);
-
-		n = config_get_sensor_name(s->id);
-
-		if (n)
-			s->name = n;
-
-		sensor_cur++;
-	}
-}
-
-static void log_init()
-{
-	char *home, *path, *dir;
-
-	home = getenv("HOME");
-
-	if (!home)
-		return ;
-
-	dir = malloc(strlen(home)+1+strlen(".psensor")+1);
-	sprintf(dir, "%s/%s", home, ".psensor");
-	mkdir(dir, 0777);
-
-	path = malloc(strlen(dir)+1+strlen("log")+1);
-	sprintf(path, "%s/%s", dir, "log");
-
-	log_open(path);
-
-	free(dir);
-	free(path);
-}
-
-static struct option long_options[] = {
-	{"version", no_argument, 0, 'v'},
-	{"help", no_argument, 0, 'h'},
-	{"url", required_argument, 0, 'u'},
-	{"debug", required_argument, 0, 'd'},
-	{0, 0, 0, 0}
-};
-
-static gboolean initial_window_show(gpointer data)
-{
-	struct ui_psensor *ui;
-
-	log_debug("initial_window_show()");
-
-	ui = (struct ui_psensor *)data;
-
-	log_debug("is_status_supported: %d", is_status_supported());
-	log_debug("is_appindicator_supported: %d",
-		   is_appindicator_supported());
-	log_debug("hide_on_startup: %d", ui->config->hide_on_startup);
-
-	if (!ui->config->hide_on_startup
-	    || (!is_appindicator_supported() && !is_status_supported()))
-		ui_window_show(ui);
-
-	ui_window_update(ui);
-
-	return FALSE;
-}
-
-int main(int argc, char **argv)
-{
-	struct ui_psensor ui;
-	GError *error;
-	GThread *thread;
-	int optc, cmdok;
-	char *url = NULL;
-
-	program_name = argv[0];
-
-	setlocale(LC_ALL, "");
-
-#if ENABLE_NLS
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	textdomain(PACKAGE);
-#endif
-
-	cmdok = 1;
-	while ((optc = getopt_long(argc, argv, "vhd:u:", long_options,
-				   NULL)) != -1) {
-		switch (optc) {
-		case 'u':
-			if (optarg)
-				url = strdup(optarg);
-			break;
-		case 'h':
-			print_help();
-			exit(EXIT_SUCCESS);
-		case 'v':
-			print_version();
-			exit(EXIT_SUCCESS);
-		case 'd':
-			log_level = atoi(optarg);
-			log_printf(LOG_INFO, _("Enables debug mode."));
-			break;
-		default:
-			cmdok = 0;
-			break;
-		}
-	}
-
-	if (!cmdok || optind != argc) {
-		fprintf(stderr, _("Try `%s --help' for more information.\n"),
-			program_name);
-		exit(EXIT_FAILURE);
-	}
-
-	log_init();
-
-	g_thread_init(NULL);
-	gdk_threads_init();
-	/* gdk_threads_enter(); */
-
-	gtk_init(NULL, NULL);
-
-	ui.sensors_mutex = g_mutex_new();
-
-	config_init();
-
-	ui.config = config_load();
-
-	psensor_init();
-
-	if (url) {
-#ifdef HAVE_REMOTE_SUPPORT
-		rsensor_init();
-		ui.sensors = get_remote_sensors(url, 600);
-#else
-		fprintf(stderr,
-			_("ERROR: Not compiled with remote sensor support.\n"));
-		exit(EXIT_FAILURE);
-#endif
-	} else {
-		ui.sensors = get_all_sensors(600);
-#ifdef HAVE_NVIDIA
-		ui.sensors = nvidia_psensor_list_add(ui.sensors, 600);
-#endif
-#ifdef HAVE_LIBATIADL
-		ui.sensors = amd_psensor_list_add(ui.sensors, 600);
-#endif
-#ifdef HAVE_GTOP
-		ui.sensors = cpu_psensor_list_add(ui.sensors, 600);
-#endif
-	}
-
-	associate_preferences(ui.sensors);
-	associate_colors(ui.sensors);
-	associate_cb_alarm_raised(ui.sensors, &ui);
-
-#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
-	ui_status_init(&ui);
-#endif
-
-	/* main window */
-	ui_window_create(&ui);
-	ui.sensor_box = NULL;
-
-	/* drawing box */
-	ui.w_graph = ui_graph_create(&ui);
-
-	/* sensor list */
-	ui_sensorlist_create(&ui);
-
-	thread = g_thread_create((GThreadFunc) update_psensor_measures,
-				 &ui, TRUE, &error);
-
-	if (!thread)
-		g_error_free(error);
-
-	ui.graph_update_interval = ui.config->graph_update_interval;
-
-	g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui);
-
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
-	ui_appindicator_init(&ui);
-#endif
-
-	/*
-	 * show the window as soon as all gtk events have been processed
-	 * in order to ensure that the status icon is attempted to be
-	 * drawn before. If not, there is no way to detect that it is
-	 * visible.
-	*/
-	g_idle_add((GSourceFunc)initial_window_show, &ui);
-
-	gdk_notify_startup_complete();
-
-	/* main loop */
-	gtk_main();
-
-	g_mutex_lock(ui.sensors_mutex);
-
-	psensor_cleanup();
-
-#ifdef HAVE_NVIDIA
-	nvidia_cleanup();
-#endif
-#ifdef HAVE_LIBATIADL
-	amd_cleanup();
-#endif
-#ifdef HAVE_REMOTE_SUPPORT
-	rsensor_cleanup();
-#endif
-
-	psensor_list_free(ui.sensors);
-	ui.sensors = NULL;
-
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
-	ui_appindicator_cleanup();
-#endif
-
-	ui_status_cleanup();
-
-	g_mutex_unlock(ui.sensors_mutex);
-
-	config_cleanup();
-
-	log_close();
-
-	return 0;
-}

=== modified file 'NEWS'
--- NEWS	2011-12-22 21:11:44 +0000
+++ NEWS	2012-07-18 21:37:18 +0000
@@ -1,3 +1,10 @@
+* v0.6.2.17
+
+** psensor: fixed sensor type displayed in sensor preferences dialog.
+** psensor: fixed compilation error on 64bits with ATI/AMD GPU support.
+** psensor: not calling g_thread_init when compiled with glib >= 2.31.
+** changed copyright dates to 2012.
+
 * v0.6.2.16
 
 ** psensor: removed -pedantic and ignores deprecation warnings

=== modified file 'configure'
--- configure	2011-12-22 21:11:44 +0000
+++ configure	2012-07-18 21:37:18 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for psensor 0.6.2.16.
+# Generated by GNU Autoconf 2.68 for psensor 0.6.2.17.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -560,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='psensor'
 PACKAGE_TARNAME='psensor'
-PACKAGE_VERSION='0.6.2.16'
-PACKAGE_STRING='psensor 0.6.2.16'
+PACKAGE_VERSION='0.6.2.17'
+PACKAGE_STRING='psensor 0.6.2.17'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL='http://wpitchoune.net/psensor'
 
@@ -1355,7 +1355,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures psensor 0.6.2.16 to adapt to many kinds of systems.
+\`configure' configures psensor 0.6.2.17 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1429,7 +1429,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of psensor 0.6.2.16:";;
+     short | recursive ) echo "Configuration of psensor 0.6.2.17:";;
    esac
   cat <<\_ACEOF
 
@@ -1567,7 +1567,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-psensor configure 0.6.2.16
+psensor configure 0.6.2.17
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1990,7 +1990,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by psensor $as_me 0.6.2.16, which was
+It was created by psensor $as_me 0.6.2.17, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2807,7 +2807,7 @@
 
 # Define the identity of the package.
  PACKAGE='psensor'
- VERSION='0.6.2.16'
+ VERSION='0.6.2.17'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9176,7 +9176,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by psensor $as_me 0.6.2.16, which was
+This file was extended by psensor $as_me 0.6.2.17, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9243,7 +9243,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-psensor config.status 0.6.2.16
+psensor config.status 0.6.2.17
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-12-22 21:11:44 +0000
+++ configure.ac	2012-07-18 21:37:18 +0000
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.64])
-AC_INIT([psensor], [0.6.2.16],[[e-mail]],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [0.6.2.17],[[e-mail]],[psensor],[http://wpitchoune.net/psensor])
 
 AM_INIT_AUTOMAKE([-Wall -Werror gnu])
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-07 00:47:44 +0000
+++ debian/changelog	2012-07-18 21:37:18 +0000
@@ -1,3 +1,33 @@
+psensor (0.6.2.17-2ubuntu1) quantal; urgency=low
+
+  * Merge from Debian testing.  Remaining changes:
+    + Modifed build-dep to add NVidia and Application Indicator support
+    + Only add an nvidia-settings build-dep on i386 and amd6
+    + debian/patches/LP1021900.patch: added degree Celcius symbol
+  * Remove drop_g_thread_init.patch: fixed upstream since 0.6.2.17
+  * Remove LP968912.patch: fixed upstream since 0.6.2.17
+
+ -- Jean-Philippe Orsini <[e-mail]>  Fri, 13 Jul 2012 02:22:18 +0200
+
+psensor (0.6.2.17-2) unstable; urgency=low
+
+  * debian/control
+     - replaced libcurl4-openssl-dev build dep to
+       libcurl4-gnutls-dev. (Closes: #668180)
+
+ -- Jean-Philippe Orsini <[e-mail]>  Mon, 09 Apr 2012 12:15:54 -0400
+
+psensor (0.6.2.17-1) unstable; urgency=low
+
+  * New upstream release
+      - Fixed sensor type displayed in sensor preferences. (Closes LP: #968912)
+  * debian/control
+      - Switched to Standards-Version 3.9.3.
+  * debian/copyright
+      - Changed end date to 2012.
+
+ -- Jean-Philippe Orsini <[e-mail]>  Mon, 26 Mar 2012 05:14:19 -0400
+
 psensor (0.6.2.16-1ubuntu6) quantal; urgency=low
 
   * debian/patches/LP1021900.patch

=== modified file 'debian/control'
--- debian/control	2012-01-22 14:13:21 +0000
+++ debian/control	2012-07-18 21:37:18 +0000
@@ -10,7 +10,7 @@
                gettext,
                help2man,
                libappindicator3-dev,
-               libcurl4-openssl-dev,
+               libcurl4-gnutls-dev,
                libgconf2-dev,
                libgtk-3-dev,
                libgtop2-dev,
@@ -21,7 +21,7 @@
                libunity-dev,
                nvidia-settings [i386 amd64],
                perl
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://wpitchoune.net/psensor
 
 Package: psensor

=== modified file 'debian/copyright'
--- debian/copyright	2011-12-22 21:11:44 +0000
+++ debian/copyright	2012-07-18 21:37:18 +0000
@@ -6,7 +6,7 @@
 Upstream Author: Jean-Philippe Orsini <[e-mail]>
 
 Copyright:
-    Copyright (C) 2010-2011 by Jean-Philippe Orsini <[e-mail]>
+    Copyright (C) 2010-2012 by Jean-Philippe Orsini <[e-mail]>
 
 License:
 
@@ -28,7 +28,7 @@
 License can be found in `/usr/share/common-licenses/GPL-2'.
 
 Packaging:
-        Copyright (C) 2010-2011 by Jean-Philippe Orsini <[e-mail]>
+        Copyright (C) 2010-2012 by Jean-Philippe Orsini <[e-mail]>
         released under GNU General Public License version 2.
 
 

=== removed file 'debian/patches/LP968912.patch'
--- debian/patches/LP968912.patch	2012-03-30 09:07:58 +0000
+++ debian/patches/LP968912.patch	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-Description: Fix display type in the UI and the preferences page
-Author: Jean-Philippe Orsini <[e-mail]>
-Origin: Upstream
-Ubuntu-bug: https://bugs.launchpad.net/ubuntu/+source/psensor/+bug/968912
-Index: psensor-0.6.2.16/src/lib/psensor.c
-===================================================================
---- psensor-0.6.2.16.orig/src/lib/psensor.c	2011-12-23 02:53:29.000000000 +0100
-+++ psensor-0.6.2.16/src/lib/psensor.c	2012-03-30 09:07:09.894586637 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2010-2011 [e-mail]
-+ * Copyright (C) 2010-2012 [e-mail]
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License as
-@@ -396,30 +396,30 @@
- 
- const char *psensor_type_to_str(unsigned int type)
- {
--	if (type & SENSOR_TYPE_REMOTE)
--		return "Remote";
--
--	if (type & SENSOR_TYPE_LMSENSOR_TEMP)
--		return "Temperature";
--
--	if (type & SENSOR_TYPE_LMSENSOR_FAN)
--		return "Fan";
--
--	if (type & SENSOR_TYPE_NVIDIA_TEMP)
-+	if ((type & SENSOR_TYPE_NVIDIA_TEMP) == SENSOR_TYPE_NVIDIA_TEMP)
- 		return "NVidia GPU Temperature";
- 
--	if (type & SENSOR_TYPE_AMD_TEMP)
-+	if ((type & SENSOR_TYPE_AMD_TEMP) == SENSOR_TYPE_AMD_TEMP)
- 		return "AMD GPU Temperature";
- 
--	if (type & SENSOR_TYPE_AMD_FAN)
-+	if ((type & SENSOR_TYPE_AMD_FAN) == SENSOR_TYPE_AMD_FAN)
- 		return "AMD GPU Fan Speed";
- 
--	if (type & SENSOR_TYPE_HDD_TEMP)
-+	if ((type & SENSOR_TYPE_HDD_TEMP) == SENSOR_TYPE_HDD_TEMP)
- 		return "HDD Temperature";
- 
- 	if (type & SENSOR_TYPE_CPU_USAGE)
- 		return "CPU Usage";
- 
-+	if (type & SENSOR_TYPE_TEMP)
-+		return "Temperature";
-+
-+	if (type & SENSOR_TYPE_FAN)
-+		return "Fan";
-+
-+	if (type & SENSOR_TYPE_REMOTE)
-+		return "Remote";
-+
- 	return "N/A";		/* should not be possible */
- }
- 

=== removed file 'debian/patches/drop_g_thread_init.patch'
--- debian/patches/drop_g_thread_init.patch	2012-01-21 22:41:34 +0000
+++ debian/patches/drop_g_thread_init.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-Description: Drop deprecated g_thread_init call
- g_thread_init() is no longer needed in glib 2.32
-Author: Micah Gersten <[e-mail]>
-
----
-
---- psensor-0.6.2.16.orig/src/main.c
-+++ psensor-0.6.2.16/src/main.c
-@@ -425,7 +425,6 @@ int main(int argc, char **argv)
- 
- 	log_init();
- 
--	g_thread_init(NULL);
- 	gdk_threads_init();
- 	/* gdk_threads_enter(); */
- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-07-07 00:47:44 +0000
+++ debian/patches/series	2012-07-18 21:37:18 +0000
@@ -1,3 +1,1 @@
-drop_g_thread_init.patch
-LP968912.patch
 LP1021900.patch

=== modified file 'po/fr.gmo'
Binary files po/fr.gmo	2011-12-01 01:57:00 +0000 and po/fr.gmo	2012-07-18 21:37:18 +0000 differ
=== modified file 'po/fr.po'
--- po/fr.po	2011-12-01 01:57:00 +0000
+++ po/fr.po	2012-07-18 21:37:18 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.9\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-12-01 22:06+0100\n"
+"POT-Creation-Date: 2012-03-26 10:30+0200\n"
 "PO-Revision-Date: 2011-02-07 21:18+0100\n"
 "Last-Translator: Jean-Philippe Orsini <[e-mail]>\n"
 "Language-Team: Oriya\n"
@@ -79,17 +79,17 @@
 msgid "%s home page: <%s>\n"
 msgstr "%s page d'acceuil: <%s>\n"
 
-#: src/main.c:412
+#: src/main.c:425
 #, fuzzy
 msgid "Enables debug mode."
 msgstr "Activée"
 
-#: src/main.c:421 src/server/server.c:352
+#: src/main.c:434 src/server/server.c:352
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Essayez `%s --help' pour plus d'informations.\n"
 
-#: src/main.c:448
+#: src/main.c:469
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
@@ -105,7 +105,7 @@
 
 #: src/ui.c:83
 msgid ""
-"Copyright(c) 2010-2011\n"
+"Copyright(c) 2010-2012\n"
 "[e-mail]"
 msgstr ""
 
@@ -310,22 +310,22 @@
 msgid "URL: http://localhost:%d"
 msgstr "URL: http://localhost:%d\n"
 
-#: src/lib/amd.c:159
+#: src/lib/amd.c:151
 #, c-format
 msgid "ERROR: ADL library not found!\n"
 msgstr ""
 
-#: src/lib/amd.c:184
+#: src/lib/amd.c:176
 #, c-format
 msgid "ERROR: ADL's API is missing!\n"
 msgstr ""
 
-#: src/lib/amd.c:193
+#: src/lib/amd.c:185
 #, fuzzy, c-format
 msgid "ERROR: ADL Initialization Error!\n"
 msgstr "ERREUR: échec de l'initialisation nvidia\n"
 
-#: src/lib/amd.c:201
+#: src/lib/amd.c:193
 #, fuzzy, c-format
 msgid "ERROR: Cannot get the number of adapters!\n"
 msgstr ""

=== modified file 'po/psensor.pot'
--- po/psensor.pot	2011-12-01 01:57:00 +0000
+++ po/psensor.pot	2012-07-18 21:37:18 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-12-01 22:06+0100\n"
+"POT-Creation-Date: 2012-03-26 10:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -68,16 +68,16 @@
 msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/main.c:412
+#: src/main.c:425
 msgid "Enables debug mode."
 msgstr ""
 
-#: src/main.c:421 src/server/server.c:352
+#: src/main.c:434 src/server/server.c:352
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/main.c:448
+#: src/main.c:469
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
@@ -88,7 +88,7 @@
 
 #: src/ui.c:83
 msgid ""
-"Copyright(c) 2010-2011\n"
+"Copyright(c) 2010-2012\n"
 "[e-mail]"
 msgstr ""
 
@@ -273,23 +273,23 @@
 msgid "URL: http://localhost:%d"
 msgstr ""
 
-#: src/lib/amd.c:159
+#: src/lib/amd.c:151
 #, c-format
 msgid "ERROR: ADL library not found!\n"
 msgstr ""
 
-#: src/lib/amd.c:184
+#: src/lib/amd.c:176
 #, c-format
 msgid "ERROR: ADL's API is missing!\n"
 msgstr ""
 
+#: src/lib/amd.c:185
+#, c-format
+msgid "ERROR: ADL Initialization Error!\n"
+msgstr ""
+
 #: src/lib/amd.c:193
 #, c-format
-msgid "ERROR: ADL Initialization Error!\n"
-msgstr ""
-
-#: src/lib/amd.c:201
-#, c-format
 msgid "ERROR: Cannot get the number of adapters!\n"
 msgstr ""
 

=== modified file 'po/tr.gmo'
Binary files po/tr.gmo	2011-12-01 01:57:00 +0000 and po/tr.gmo	2012-07-18 21:37:18 +0000 differ
=== modified file 'po/tr.po'
--- po/tr.po	2011-12-01 01:57:00 +0000
+++ po/tr.po	2012-07-18 21:37:18 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-12-01 22:06+0100\n"
+"POT-Creation-Date: 2012-03-26 10:30+0200\n"
 "PO-Revision-Date: 2011-04-10 13:11+0000\n"
 "Last-Translator: zeugma <Unknown>\n"
 "Language-Team: Turkish <[e-mail]>\n"
@@ -69,16 +69,16 @@
 msgid "%s home page: <%s>\n"
 msgstr "%s ana sayfa: <%s>\n"
 
-#: src/main.c:412
+#: src/main.c:425
 msgid "Enables debug mode."
 msgstr ""
 
-#: src/main.c:421 src/server/server.c:352
+#: src/main.c:434 src/server/server.c:352
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
 
-#: src/main.c:448
+#: src/main.c:469
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
@@ -89,7 +89,7 @@
 
 #: src/ui.c:83
 msgid ""
-"Copyright(c) 2010-2011\n"
+"Copyright(c) 2010-2012\n"
 "[e-mail]"
 msgstr ""
 
@@ -278,23 +278,23 @@
 msgid "URL: http://localhost:%d"
 msgstr ""
 
-#: src/lib/amd.c:159
+#: src/lib/amd.c:151
 #, c-format
 msgid "ERROR: ADL library not found!\n"
 msgstr ""
 
-#: src/lib/amd.c:184
+#: src/lib/amd.c:176
 #, c-format
 msgid "ERROR: ADL's API is missing!\n"
 msgstr ""
 
+#: src/lib/amd.c:185
+#, c-format
+msgid "ERROR: ADL Initialization Error!\n"
+msgstr ""
+
 #: src/lib/amd.c:193
 #, c-format
-msgid "ERROR: ADL Initialization Error!\n"
-msgstr ""
-
-#: src/lib/amd.c:201
-#, c-format
 msgid "ERROR: Cannot get the number of adapters!\n"
 msgstr ""
 

=== modified file 'po/zh_CN.gmo'
Binary files po/zh_CN.gmo	2011-12-01 01:57:00 +0000 and po/zh_CN.gmo	2012-07-18 21:37:18 +0000 differ
=== modified file 'po/zh_CN.po'
--- po/zh_CN.po	2011-12-01 01:57:00 +0000
+++ po/zh_CN.po	2012-07-18 21:37:18 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.10\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-12-01 22:06+0100\n"
+"POT-Creation-Date: 2012-03-26 10:30+0200\n"
 "PO-Revision-Date: 2011-06-06 08:57+0000\n"
 "Last-Translator: royclark <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -71,16 +71,16 @@
 msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/main.c:412
+#: src/main.c:425
 msgid "Enables debug mode."
 msgstr ""
 
-#: src/main.c:421 src/server/server.c:352
+#: src/main.c:434 src/server/server.c:352
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/main.c:448
+#: src/main.c:469
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
@@ -92,7 +92,7 @@
 
 #: src/ui.c:83
 msgid ""
-"Copyright(c) 2010-2011\n"
+"Copyright(c) 2010-2012\n"
 "[e-mail]"
 msgstr ""
 
@@ -280,23 +280,23 @@
 msgid "URL: http://localhost:%d"
 msgstr ""
 
-#: src/lib/amd.c:159
+#: src/lib/amd.c:151
 #, c-format
 msgid "ERROR: ADL library not found!\n"
 msgstr ""
 
-#: src/lib/amd.c:184
+#: src/lib/amd.c:176
 #, c-format
 msgid "ERROR: ADL's API is missing!\n"
 msgstr ""
 
+#: src/lib/amd.c:185
+#, c-format
+msgid "ERROR: ADL Initialization Error!\n"
+msgstr ""
+
 #: src/lib/amd.c:193
 #, c-format
-msgid "ERROR: ADL Initialization Error!\n"
-msgstr ""
-
-#: src/lib/amd.c:201
-#, c-format
 msgid "ERROR: Cannot get the number of adapters!\n"
 msgstr ""
 

=== modified file 'src/cfg.c'
--- src/cfg.c	2011-11-25 02:56:22 +0000
+++ src/cfg.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/cfg.h'
--- src/cfg.h	2011-11-25 02:56:22 +0000
+++ src/cfg.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/compat.h'
--- src/compat.h	2011-11-25 02:56:22 +0000
+++ src/compat.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/graph.c'
--- src/graph.c	2011-11-25 02:56:22 +0000
+++ src/graph.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/graph.h'
--- src/graph.h	2011-11-25 02:56:22 +0000
+++ src/graph.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/amd.c'
--- src/lib/amd.c	2011-12-01 01:57:00 +0000
+++ src/lib/amd.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2010-2011 [e-mail], [e-mail]
+ * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -64,15 +65,6 @@
 	return lpbuffer;
 }
 
-/* Optional Memory de-allocation function */
-static void __stdcall adl_main_memory_free(void **lpbuffer)
-{
-	if (*lpbuffer) {
-		free(*lpbuffer);
-		*lpbuffer = NULL;
-	}
-}
-
 static void *getprocaddress(void *plibrary, const char * name)
 {
 	return dlsym(plibrary, name);
@@ -235,7 +227,7 @@
 		active_amd_adapters[inumberadaptersactive-1] = iadapterindex;
 	}
 
-	adl_main_memory_free((void **) &lpadapterinfo);
+	free(lpadapterinfo);
 
 	/* Each Adapter has one GPU temperature sensor and one fan
 	   control sensor */

=== modified file 'src/lib/amd.h'
--- src/lib/amd.h	2011-11-25 02:56:22 +0000
+++ src/lib/amd.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2010-2011 [e-mail], [e-mail]
+ * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/color.c'
--- src/lib/color.c	2011-11-25 02:56:22 +0000
+++ src/lib/color.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/color.h'
--- src/lib/color.h	2011-11-25 02:56:22 +0000
+++ src/lib/color.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/cpu.c'
--- src/lib/cpu.c	2011-11-25 02:56:22 +0000
+++ src/lib/cpu.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/cpu.h'
--- src/lib/cpu.h	2011-11-25 02:56:22 +0000
+++ src/lib/cpu.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/hdd.c'
--- src/lib/hdd.c	2011-11-25 02:56:22 +0000
+++ src/lib/hdd.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/hdd.h'
--- src/lib/hdd.h	2011-11-25 02:56:22 +0000
+++ src/lib/hdd.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/lmsensor.c'
--- src/lib/lmsensor.c	2011-11-25 02:56:22 +0000
+++ src/lib/lmsensor.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/lmsensor.h'
--- src/lib/lmsensor.h	2011-11-25 02:56:22 +0000
+++ src/lib/lmsensor.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/log.c'
--- src/lib/log.c	2011-11-25 02:56:22 +0000
+++ src/lib/log.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/log.h'
--- src/lib/log.h	2011-11-25 02:56:22 +0000
+++ src/lib/log.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/measure.c'
--- src/lib/measure.c	2011-11-25 02:56:22 +0000
+++ src/lib/measure.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/measure.h'
--- src/lib/measure.h	2011-11-25 02:56:22 +0000
+++ src/lib/measure.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/nvidia.c'
--- src/lib/nvidia.c	2011-11-25 02:56:22 +0000
+++ src/lib/nvidia.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/nvidia.h'
--- src/lib/nvidia.h	2011-11-25 02:56:22 +0000
+++ src/lib/nvidia.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/p_io.c'
--- src/lib/p_io.c	2011-11-25 02:56:22 +0000
+++ src/lib/p_io.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/p_io.h'
--- src/lib/p_io.h	2011-11-25 02:56:22 +0000
+++ src/lib/p_io.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/psensor.c'
--- src/lib/psensor.c	2012-07-07 00:47:44 +0000
+++ src/lib/psensor.c	2012-07-18 21:37:18 +0000
@@ -207,7 +207,7 @@
 	char *unit;
 
 	if (is_temp_type(type))
-		unit = "°C";
+		unit = "C";
 	else if (type & SENSOR_TYPE_CPU_USAGE)
 		unit = "%";
 	else
@@ -427,7 +427,7 @@
 const char *psensor_type_to_unit_str(unsigned int type)
 {
 	if (type & SENSOR_TYPE_TEMP)
-		return "\302\260C";
+		return _("C");
 
 	if (type & SENSOR_TYPE_FAN)
 		return _("RPM");

=== modified file 'src/lib/psensor.h'
--- src/lib/psensor.h	2011-11-25 02:56:22 +0000
+++ src/lib/psensor.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/psensor_json.c'
--- src/lib/psensor_json.c	2011-11-25 02:56:22 +0000
+++ src/lib/psensor_json.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/psensor_json.h'
--- src/lib/psensor_json.h	2011-11-25 02:56:22 +0000
+++ src/lib/psensor_json.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/url.c'
--- src/lib/url.c	2011-12-01 01:57:00 +0000
+++ src/lib/url.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/lib/url.h'
--- src/lib/url.h	2011-11-25 02:56:22 +0000
+++ src/lib/url.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/main.c'
--- src/main.c	2012-01-21 22:41:34 +0000
+++ src/main.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -80,7 +80,7 @@
 		 "This is free software: you are free to change and "
 		 " redistribute it.\n"
 		 "There is NO WARRANTY, to the extent permitted by law.\n"),
-	       "2010-2011");
+	       "2010-2012");
 }
 
 static void print_help()
@@ -376,6 +376,19 @@
 	return FALSE;
 }
 
+static void log_glib_info()
+{
+	log_debug("Compiled with GLib %d.%d.%d",
+		  GLIB_MAJOR_VERSION,
+		  GLIB_MINOR_VERSION,
+		  GLIB_MICRO_VERSION);
+
+	log_debug("Running with GLib %d.%d.%d",
+		  glib_major_version,
+		  glib_minor_version,
+		  glib_micro_version);
+}
+
 int main(int argc, char **argv)
 {
 	struct ui_psensor ui;
@@ -425,8 +438,17 @@
 
 	log_init();
 
+	log_glib_info();
+#if !(GLIB_CHECK_VERSION(2, 31, 0))
+	/*
+	 * Since GLib 2.31 g_thread_init call is deprecated and not
+	 * needed.
+	 */
+	log_debug("Calling g_thread_init(NULL)");
+	g_thread_init(NULL);
+#endif
+
 	gdk_threads_init();
-	/* gdk_threads_enter(); */
 
 	gtk_init(NULL, NULL);
 

=== modified file 'src/psensor.1'
--- src/psensor.1	2011-12-22 21:11:44 +0000
+++ src/psensor.1	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH PSENSOR "1" "December 2011" "psensor 0.6.2.16" "User Commands"
+.TH PSENSOR "1" "March 2012" "psensor 0.6.2.17" "User Commands"
 .SH NAME
 psensor \- Temperature monitoring application
 .SH SYNOPSIS
@@ -60,7 +60,7 @@
 .PP
 psensor home page: <http://wpitchoune.net/psensor>
 .SH COPYRIGHT
-Copyright \(co 2010\-2011 [e-mail]
+Copyright \(co 2010\-2012 [e-mail]
 License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old\-licenses/gpl\-2.0.html>
 .br
 This is free software: you are free to change and  redistribute it.

=== modified file 'src/rsensor.c'
--- src/rsensor.c	2011-12-01 01:57:00 +0000
+++ src/rsensor.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/rsensor.h'
--- src/rsensor.h	2011-11-25 02:56:22 +0000
+++ src/rsensor.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/server/psensor-server.1'
--- src/server/psensor-server.1	2011-12-22 21:11:44 +0000
+++ src/server/psensor-server.1	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH PSENSOR-SERVER "1" "December 2011" "psensor-server 0.6.2.16" "User Commands"
+.TH PSENSOR-SERVER "1" "March 2012" "psensor-server 0.6.2.17" "User Commands"
 .SH NAME
 psensor-server \- Temperature and system monitoring Web server
 .SH SYNOPSIS
@@ -86,7 +86,7 @@
 .PP
 psensor home page: <http://wpitchoune.net/psensor>
 .SH COPYRIGHT
-Copyright \(co 2010\-2011 [e-mail]
+Copyright \(co 2010\-2012 [e-mail]
 License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old\-licenses/gpl\-2.0.html>
 .br
 This is free software: you are free to change and redistribute it.

=== modified file 'src/server/server.c'
--- src/server/server.c	2011-12-01 01:57:00 +0000
+++ src/server/server.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -78,7 +78,7 @@
 		 "<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n"
 		 "This is free software: you are free to change and redistribute it.\n"
 		 "There is NO WARRANTY, to the extent permitted by law.\n"),
-	       "2010-2011");
+	       "2010-2012");
 }
 
 void print_help()

=== modified file 'src/server/server.h'
--- src/server/server.h	2011-11-25 02:56:22 +0000
+++ src/server/server.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/server/sysinfo.c'
--- src/server/sysinfo.c	2011-12-01 01:57:00 +0000
+++ src/server/sysinfo.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/server/sysinfo.h'
--- src/server/sysinfo.h	2011-12-01 01:57:00 +0000
+++ src/server/sysinfo.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui.c'
--- src/ui.c	2011-12-01 01:57:00 +0000
+++ src/ui.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -80,7 +80,7 @@
 			      _("Psensor is a GTK+ application for monitoring "
 				"hardware sensors"),
 			      "copyright",
-			      _("Copyright(c) 2010-2011\[e-mail]"),
+			      _("Copyright(c) 2010-2012\[e-mail]"),
 			      "logo-icon-name", "psensor",
 			      "program-name", "Psensor",
 			      "title", _("About Psensor"),

=== modified file 'src/ui.h'
--- src/ui.h	2011-11-25 02:56:22 +0000
+++ src/ui.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_appindicator.c'
--- src/ui_appindicator.c	2011-12-01 01:57:00 +0000
+++ src/ui_appindicator.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_appindicator.h'
--- src/ui_appindicator.h	2011-11-25 02:56:22 +0000
+++ src/ui_appindicator.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_color.c'
--- src/ui_color.c	2011-11-25 02:56:22 +0000
+++ src/ui_color.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_color.h'
--- src/ui_color.h	2011-11-25 02:56:22 +0000
+++ src/ui_color.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_graph.c'
--- src/ui_graph.c	2011-12-01 01:57:00 +0000
+++ src/ui_graph.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_graph.h'
--- src/ui_graph.h	2011-11-25 02:56:22 +0000
+++ src/ui_graph.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_notify.c'
--- src/ui_notify.c	2011-11-25 02:56:22 +0000
+++ src/ui_notify.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_notify.h'
--- src/ui_notify.h	2011-11-25 02:56:22 +0000
+++ src/ui_notify.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_pref.c'
--- src/ui_pref.c	2011-11-25 02:56:22 +0000
+++ src/ui_pref.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_pref.h'
--- src/ui_pref.h	2011-11-25 02:56:22 +0000
+++ src/ui_pref.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_sensorlist.c'
--- src/ui_sensorlist.c	2011-11-25 02:56:22 +0000
+++ src/ui_sensorlist.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_sensorlist.h'
--- src/ui_sensorlist.h	2011-11-25 02:56:22 +0000
+++ src/ui_sensorlist.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_sensorpref.c'
--- src/ui_sensorpref.c	2011-11-25 02:56:22 +0000
+++ src/ui_sensorpref.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_sensorpref.h'
--- src/ui_sensorpref.h	2011-11-25 02:56:22 +0000
+++ src/ui_sensorpref.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_status.c'
--- src/ui_status.c	2011-11-25 02:56:22 +0000
+++ src/ui_status.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_status.h'
--- src/ui_status.h	2011-11-25 02:56:22 +0000
+++ src/ui_status.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_unity.c'
--- src/ui_unity.c	2011-11-25 02:56:22 +0000
+++ src/ui_unity.c	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ui_unity.h'
--- src/ui_unity.h	2011-11-25 02:56:22 +0000
+++ src/ui_unity.h	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'www/psensor.js'
--- www/psensor.js	2011-11-25 02:56:22 +0000
+++ www/psensor.js	2012-07-18 21:37:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 [e-mail]
+ * Copyright (C) 2010-2012 [e-mail]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as