[Pkg-wmaker-commits] [wmgtemp] 03/03: debian/patches: Remove directory; patches applied upstream.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Feb 2 15:15:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmgtemp.
commit aec74f4864a82bae17233db365dbf32995251972
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Thu Feb 2 10:14:50 2017 -0500
debian/patches: Remove directory; patches applied upstream.
---
debian/patches/build_with_gcc5.patch | 16 ------
.../fix_-Waggressive-loop-optimizations.patch | 17 -------
debian/patches/fix_hyphens_in_wmgtemp.1.patch | 15 ------
debian/patches/sensors.conf.patch | 54 --------------------
debian/patches/series | 5 --
debian/patches/update_makefile.patch | 58 ----------------------
6 files changed, 165 deletions(-)
diff --git a/debian/patches/build_with_gcc5.patch b/debian/patches/build_with_gcc5.patch
deleted file mode 100644
index 5ead1a7..0000000
--- a/debian/patches/build_with_gcc5.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Build with gcc5.
-Author: Chris Lamb <lamby at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=797540
-Last-Update: 2015-08-31
-
---- a/src/wmgeneral/list.h
-+++ b/src/wmgeneral/list.h
-@@ -29,7 +29,7 @@
- #ifndef __LIST_H_
- #define __LIST_H_
-
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-+#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && (__GNUC__ < 5)
- # define INLINE inline
- #else
- # define INLINE
diff --git a/debian/patches/fix_-Waggressive-loop-optimizations.patch b/debian/patches/fix_-Waggressive-loop-optimizations.patch
deleted file mode 100644
index 195cfda..0000000
--- a/debian/patches/fix_-Waggressive-loop-optimizations.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix -Waggressive-loop-optimizations compiler warning.
- In particular, the cpu_history array has length 59, so when i = 58,
- cpu_history[i+1] is undefined.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-02-02
-
---- a/src/wmgtemp.c
-+++ b/src/wmgtemp.c
-@@ -428,7 +428,7 @@
- double sys_high = highest_temp(sys_history);
-
- /* Shift the arrays */
-- for(i = 0; i < 59; i++) {
-+ for(i = 0; i < 58; i++) {
- cpu_history[i] = cpu_history[i + 1];
- sys_history[i] = sys_history[i + 1];
- }
diff --git a/debian/patches/fix_hyphens_in_wmgtemp.1.patch b/debian/patches/fix_hyphens_in_wmgtemp.1.patch
deleted file mode 100644
index 316d67d..0000000
--- a/debian/patches/fix_hyphens_in_wmgtemp.1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix hyphen in manpage
-Author: Dario Minnucci <midget at debian.org>
-Last-Update: 2015-02-02
-
---- a/wmgtemp.1
-+++ b/wmgtemp.1
-@@ -119,7 +119,7 @@
- min:25
- max:35
- execat:80
--exec:shutdown -h 10
-+exec:shutdown \-h 10
- swap:n
- quiet:y
- feature1:temp1
diff --git a/debian/patches/sensors.conf.patch b/debian/patches/sensors.conf.patch
deleted file mode 100644
index 0c47eef..0000000
--- a/debian/patches/sensors.conf.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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;
-
-- config_file = fopen(rc_config, "r");
-+ if (rc_config) {
-+ config_file = fopen(rc_config, "r");
-
-- if(config_file == NULL) {
-- fprintf(stderr, "Error opening %s\n", rc_config);
-- return 0;
-+ if(config_file == NULL) {
-+ fprintf(stderr, "Error opening %s\n", rc_config);
-+ return 0;
-+ }
-+ } else {
-+ config_file = NULL; /* Use libsensors default */
- }
-
- res = sensors_init(config_file);
-@@ -677,7 +681,7 @@
- return 0;
- }
-
-- if(fclose(config_file))
-+ if(config_file && fclose(config_file))
- perror("Error closing sensors config");
-
- return 1;
-@@ -688,7 +692,7 @@
- "Usage: wmgtemp [options]\n" \
- "Options:\n" \
- " -S, --sensorconf=PATH Specify sensors config file PATH\n" \
-- " [Default: /etc/sensors.conf]\n" \
-+ " [Default: autodetect]\n" \
- " -s, --scale=SCALE Display temperatures in SCALE\n" \
- " SCALE=kelvin, fahrenheit\n" \
- " [Default: celcius]\n" \
-@@ -950,9 +954,6 @@
- if(rc_chip != NULL) {
- sensor_chip = strdup(rc_chip);
- }
-- if(rc_config == NULL) {
-- rc_config = "/etc/sensors.conf";
-- }
-
- if(rc_graph != NULL) {
- if(!strncmp(rc_graph, "l", 1)) {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3b28ccb..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-fix_hyphens_in_wmgtemp.1.patch
-sensors.conf.patch
-update_makefile.patch
-fix_-Waggressive-loop-optimizations.patch
-build_with_gcc5.patch
diff --git a/debian/patches/update_makefile.patch b/debian/patches/update_makefile.patch
deleted file mode 100644
index 475e811..0000000
--- a/debian/patches/update_makefile.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Update manpage.
- In particular,
- - Split LDFLAGS into LDFLAGS and LIBS.
- - Create binary installation directory.
- - Honor CPPFLAGS and DESTDIR variables.
- - Rename CCFLAGS to standard CFLAGS.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-01-31
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,9 +1,10 @@
- CC = gcc
- INSTALL = /usr/bin/install
- LIB = lib
--LDFLAGS = -L/usr/X11R6/$(LIB) -lXpm -lXext -lX11 -lsensors
-+LDFLAGS = -L/usr/X11R6/$(LIB)
-+LIBS = -lXpm -lXext -lX11 -lsensors
- BINARY = wmgtemp
--CCFLAGS = -Wall -g
-+CFLAGS = -Wall -g
- INSTDIR = /usr/local/bin
-
- OFILES = wmgtemp.o \
-@@ -12,16 +13,17 @@
- ./wmgeneral/list.o
-
- %.o:
-- $(CC) $(CCFLAGS) -c $*.c -o $*.o
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $*.o
-
- $(BINARY): $(OFILES)
-- $(CC) $(OFILES) $(LDFLAGS) -o $(BINARY)
-+ $(CC) $(OFILES) $(LDFLAGS) -o $(BINARY) $(LIBS)
-
- clean:
- @ $(RM) $(OFILES) *~ "#"* $(BINARY)
-
- install::
-- $(INSTALL) -m 755 -c $(BINARY) $(INSTDIR)/$(BINARY)
-+ $(INSTALL) -d $(DESTDIR)$(INSTDIR)
-+ $(INSTALL) -m 755 -c $(BINARY) $(DESTDIR)$(INSTDIR)/$(BINARY)
-
- depend:
- @ $(CC) -MM *.c > .deps
---- a/Makefile
-+++ b/Makefile
-@@ -10,8 +10,8 @@
-
- install:
- ( cd src && $(MAKE) install INSTDIR=$(INSTDIR) )
-- $(INSTALL) -d $(MANINSTDIR)
-- $(INSTALL) -m 755 -c $(MANPAGE) $(MANINSTDIR)/$(MANPAGE)
-+ $(INSTALL) -d $(DESTDIR)$(MANINSTDIR)
-+ $(INSTALL) -m 755 -c $(MANPAGE) $(DESTDIR)$(MANINSTDIR)/$(MANPAGE)
-
- clean:
- ( cd src && $(MAKE) clean)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmgtemp.git
More information about the Pkg-wmaker-commits
mailing list