[Pkg-wmaker-commits] [wmgtemp] 32/45: debian/patches/001_sensors.conf.diff: Rename to sensors.conf.patch, update header to DEP3, and refresh.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmgtemp.

commit e7b0637c5bf5ff120a9b23d8293ab47b5d9f2a22
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Tue Feb 3 22:48:22 2015 -0600

    debian/patches/001_sensors.conf.diff: Rename to sensors.conf.patch, update
    header to DEP3, and refresh.
---
 .../{001_sensors.conf.diff => sensors.conf.patch}   | 21 ++++++++++-----------
 debian/patches/series                               |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/debian/patches/001_sensors.conf.diff b/debian/patches/sensors.conf.patch
similarity index 75%
rename from debian/patches/001_sensors.conf.diff
rename to debian/patches/sensors.conf.patch
index f10a3b3..0c47eef 100644
--- a/debian/patches/001_sensors.conf.diff
+++ b/debian/patches/sensors.conf.patch
@@ -1,11 +1,10 @@
-#
-# Description: use sensors.conf autodetection instead of providing a
-#              default value
-# Author: Aurelien Jarno <aurel32 at debian.org>
-#
---- wmgtemp-1.1.orig/src/wmgtemp.c
-+++ wmgtemp-1.1/src/wmgtemp.c
-@@ -663,11 +663,15 @@ int init_sensors() {
+Description: Autodetect sensors.conf instead of providing default value.
+Author: Aurelien Jarno <aurel32 at debian.org>
+Last-Update: 2015-02-03
+
+--- a/src/wmgtemp.c
++++ b/src/wmgtemp.c
+@@ -663,11 +663,15 @@
    FILE *config_file;
    int res;
  
@@ -25,7 +24,7 @@
    }
  
    res = sensors_init(config_file);
-@@ -677,7 +681,7 @@ int init_sensors() {
+@@ -677,7 +681,7 @@
      return 0;
    }
  
@@ -34,7 +33,7 @@
      perror("Error closing sensors config");
  
    return 1;
-@@ -688,7 +692,7 @@ void display_usage() {
+@@ -688,7 +692,7 @@
  	 "Usage: wmgtemp [options]\n" \
  	 "Options:\n" \
  	 "   -S, --sensorconf=PATH  Specify sensors config file PATH\n" \
@@ -43,7 +42,7 @@
  	 "   -s, --scale=SCALE      Display temperatures in SCALE\n" \
  	 "                          SCALE=kelvin, fahrenheit\n" \
  	 "                          [Default: celcius]\n" \
-@@ -950,9 +954,6 @@ int process_config(int argc, char **argv
+@@ -950,9 +954,6 @@
    if(rc_chip != NULL) {
      sensor_chip = strdup(rc_chip);
    }
diff --git a/debian/patches/series b/debian/patches/series
index 8ef9b64..2aff6b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 fix_hyphens_in_wmgtemp.1.patch
-001_sensors.conf.diff
+sensors.conf.patch
 update_makefile.patch
 fix_-Waggressive-loop-optimizations.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmgtemp.git