From f3bcb228ae6763abdf0b60f3e83ae742d9b1ff56 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 9 Jan 2012 08:35:57 +0000 Subject: [PATCH] next release will be 0.7 --- NEWS | 4 ++++ configure | 20 ++++++++++---------- debian/changelog | 6 ++++++ po/Makefile.in | 2 +- src/Makefile.am | 5 +++++ src/Makefile.in | 26 ++++++++++++++------------ src/server/Makefile.am | 5 +++++ src/server/Makefile.in | 7 +++++-- 8 files changed, 50 insertions(+), 25 deletions(-) diff --git a/NEWS b/NEWS index 94e89f0..b883645 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ ** psensor: fixed sensor type displayed in sensor preferences dialog. +* v0.6.2.17 + +** psensor: fixed sensor type displayed in sensor preferences dialog. + * v0.6.2.16 ** psensor: removed -pedantic and ignores deprecation warnings diff --git a/configure b/configure index 36ae99c..cf3bcc4 100755 --- a/configure +++ b/configure @@ -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.7.0.0. # # Report bugs to . # @@ -560,8 +560,8 @@ MAKEFLAGS= # 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.7.0.0' +PACKAGE_STRING='psensor 0.7.0.0' PACKAGE_BUGREPORT='jeanfi@gmail.com' PACKAGE_URL='http://wpitchoune.net/psensor' @@ -1361,7 +1361,7 @@ if test "$ac_init_help" = "long"; then # 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.7.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1435,7 +1435,7 @@ fi 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.7.0.0:";; esac cat <<\_ACEOF @@ -1577,7 +1577,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -psensor configure 0.6.2.16 +psensor configure 0.7.0.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2000,7 +2000,7 @@ cat >config.log <<_ACEOF 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.7.0.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2817,7 +2817,7 @@ fi # Define the identity of the package. PACKAGE='psensor' - VERSION='0.6.2.16' + VERSION='0.7.0.0' cat >>confdefs.h <<_ACEOF @@ -9278,7 +9278,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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.7.0.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9345,7 +9345,7 @@ _ACEOF 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.7.0.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/debian/changelog b/debian/changelog index e24fac3..a153b6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +psensor (0.7.0.0-1ubuntu1) oneiric; urgency=low + + * New upstream release + + -- Jean-Philippe Orsini Wed, 28 Dec 2011 19:55:51 +0100 + psensor (0.6.2.16-1ubuntu2) oneiric; urgency=low * New upstream release diff --git a/po/Makefile.in b/po/Makefile.in index a8c596a..35752cc 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -11,7 +11,7 @@ # Origin: gettext-0.16 PACKAGE = psensor -VERSION = 0.6.2.16 +VERSION = 0.7.0.0 PACKAGE_BUGREPORT = jeanfi@gmail.com SHELL = /bin/sh diff --git a/src/Makefile.am b/src/Makefile.am index 1cc4d74..e21d7fc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,6 +66,11 @@ AM_CPPFLAGS += $(LIBATIADL_CFLAGS) LIBS += $(LIBATIADL_LIBS) endif +if ATASMART +AM_CPPFLAGS += $(ATASMART_CFLAGS) +LIBS += $(ATASMART_LIBS) +endif + if UNITY psensor_SOURCES += ui_unity.h ui_unity.c AM_CPPFLAGS += $(UNITY_CFLAGS) diff --git a/src/Makefile.in b/src/Makefile.in index c1264b5..df28a98 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -48,12 +48,14 @@ bin_PROGRAMS = psensor$(EXEEXT) @NVIDIA_TRUE@am__append_11 = $(NVIDIA_LIBS) @LIBATIADL_TRUE@am__append_12 = $(LIBATIADL_CFLAGS) @LIBATIADL_TRUE@am__append_13 = $(LIBATIADL_LIBS) -@UNITY_TRUE@am__append_14 = ui_unity.h ui_unity.c -@UNITY_TRUE@am__append_15 = $(UNITY_CFLAGS) -@UNITY_TRUE@am__append_16 = $(UNITY_LIBS) -@CURL_TRUE@@JSON_TRUE@am__append_17 = rsensor.h rsensor.c -@CURL_TRUE@@JSON_TRUE@am__append_18 = $(CURL_LIBS) $(JSON_LIBS) -@CURL_TRUE@@JSON_TRUE@am__append_19 = $(CURL_CFLAGS) $(JSON_CFLAGS) +@ATASMART_TRUE@am__append_14 = $(ATASMART_CFLAGS) +@ATASMART_TRUE@am__append_15 = $(ATASMART_LIBS) +@UNITY_TRUE@am__append_16 = ui_unity.h ui_unity.c +@UNITY_TRUE@am__append_17 = $(UNITY_CFLAGS) +@UNITY_TRUE@am__append_18 = $(UNITY_LIBS) +@CURL_TRUE@@JSON_TRUE@am__append_19 = rsensor.h rsensor.c +@CURL_TRUE@@JSON_TRUE@am__append_20 = $(CURL_LIBS) $(JSON_LIBS) +@CURL_TRUE@@JSON_TRUE@am__append_21 = $(CURL_CFLAGS) $(JSON_CFLAGS) subdir = src DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -216,8 +218,8 @@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = lib/libpsensor.a $(GTK_LIBS) $(GCONF_LIBS) $(SENSORS_LIBS) \ $(am__append_3) $(am__append_5) $(am__append_8) \ - $(am__append_11) $(am__append_13) $(am__append_16) \ - $(am__append_18) + $(am__append_11) $(am__append_13) $(am__append_15) \ + $(am__append_18) $(am__append_20) LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -317,14 +319,14 @@ AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \ -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/unity \ $(GTK_CFLAGS) $(GCONF_CFLAGS) $(SENSORS_CFLAGS) \ $(am__append_2) $(am__append_6) $(am__append_9) \ - $(am__append_10) $(am__append_12) $(am__append_15) \ - $(am__append_19) + $(am__append_10) $(am__append_12) $(am__append_14) \ + $(am__append_17) $(am__append_21) psensor_SOURCES = compat.h cfg.h cfg.c graph.h graph.c main.c ui.h \ ui.c ui_appindicator.h ui_color.h ui_color.c ui_graph.h \ ui_graph.c ui_pref.h ui_pref.c ui_sensorlist.h ui_sensorlist.c \ ui_sensorpref.h ui_sensorpref.c ui_status.h ui_status.c \ - $(am__append_4) $(am__append_7) $(am__append_14) \ - $(am__append_17) + $(am__append_4) $(am__append_7) $(am__append_16) \ + $(am__append_19) dist_man_MANS = psensor.1 EXTRA_DIST = description.txt all: all-recursive diff --git a/src/server/Makefile.am b/src/server/Makefile.am index d9817d7..d5873f8 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -23,6 +23,11 @@ AM_LDFLAGS = -Wl,--as-needed psensor_server_SOURCES += sysinfo.h sysinfo.c endif +if ATASMART +AM_CPPFLAGS += $(ATASMART_CFLAGS) +LIBS += $(ATASMART_LIBS) +endif + dist_man_MANS = psensor-server.1 EXTRA_DIST = description.txt psensor-server.1: server.c $(top_srcdir)/configure.ac diff --git a/src/server/Makefile.in b/src/server/Makefile.in index 16c6f1d..aa9092d 100644 --- a/src/server/Makefile.in +++ b/src/server/Makefile.in @@ -38,6 +38,8 @@ bin_PROGRAMS = psensor-server$(EXEEXT) @GTOP_TRUE@am__append_1 = $(GTOP_CFLAGS) @GTOP_TRUE@am__append_2 = $(GTOP_LIBS) @GTOP_TRUE@am__append_3 = sysinfo.h sysinfo.c +@ATASMART_TRUE@am__append_4 = $(ATASMART_CFLAGS) +@ATASMART_TRUE@am__append_5 = $(ATASMART_LIBS) subdir = src/server DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -150,7 +152,7 @@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = ../lib/libpsensor.a $(SENSORS_LIBS) $(JSON_LIBS) \ - $(LIBMICROHTTPD_LIBS) $(am__append_2) + $(LIBMICROHTTPD_LIBS) $(am__append_2) $(am__append_5) LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -244,7 +246,8 @@ top_srcdir = @top_srcdir@ psensor_server_SOURCES = server.c server.h $(am__append_3) AM_CPPFLAGS = -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \ -I$(top_srcdir)/src -I$(top_srcdir)/src/lib $(SENSORS_CFLAGS) \ - $(JSON_CFLAGS) $(LIBMICROHTTPD_CFLAGS) $(am__append_1) + $(JSON_CFLAGS) $(LIBMICROHTTPD_CFLAGS) $(am__append_1) \ + $(am__append_4) @GTOP_TRUE@AM_LDFLAGS = -Wl,--as-needed dist_man_MANS = psensor-server.1 EXTRA_DIST = description.txt -- 2.7.4