[Pkg-wmaker-commits] [wmsysmon] 03/16: debian/patches: Remove directory; patches applied upstream.

[Doug Torrance]

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

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

commit a258c5362e1003a64878af1ffd605a8604445eb4
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Wed Nov 23 08:25:20 2016 -0500

    debian/patches: Remove directory; patches applied upstream.
---
 debian/patches/break.patch                   | 14 --------------
 debian/patches/makefile-strip.patch          | 15 ---------------
 debian/patches/output.patch                  | 19 -------------------
 debian/patches/series                        |  6 ------
 debian/patches/src_makefile.patch            | 24 ------------------------
 debian/patches/unused-but-set-variable.patch | 18 ------------------
 debian/patches/unused-result.patch           | 16 ----------------
 7 files changed, 112 deletions(-)

diff --git a/debian/patches/break.patch b/debian/patches/break.patch
deleted file mode 100644
index d7bde83..0000000
--- a/debian/patches/break.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Add a break to wmsysmon.c at the end of a switch statement.
-Author: Luca Bedogni <me at lucabedogni.it>
-Last-Update: 2015-07-12
-
---- a/src/wmsysmon.c
-+++ b/src/wmsysmon.c
-@@ -288,6 +288,7 @@
- #ifdef MONDEBUG
- 				printf("got: %i\n", Event.type);
- #endif
-+        break;
- 			}
- 		}
- 
diff --git a/debian/patches/makefile-strip.patch b/debian/patches/makefile-strip.patch
deleted file mode 100644
index 19b0b1f..0000000
--- a/debian/patches/makefile-strip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Delete automatic stripping of binary
-Author: Luca Bedogni <me at lucabedogni.it>
-Last-Update: 2015-07-12
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,7 +1,7 @@
- CC = gcc
- 
- LIBDIR += -L/usr/X11R6/lib
--LDFLAGS += -lXpm -lXext -lX11 -lm -s
-+LDFLAGS += -lXpm -lXext -lX11 -lm
- #CFLAGS = -g #-DMONDEBUG
- CFLAGS += -Wall -O3 -fomit-frame-pointer -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
- 
diff --git a/debian/patches/output.patch b/debian/patches/output.patch
deleted file mode 100644
index 6923a03..0000000
--- a/debian/patches/output.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Corrects a typo in wmsysmon output.
-Author: Luca Bedogni <me at lucabedogni.it>
-Last-Update: 2015-07-12
-
---- a/src/wmsysmon.c
-+++ b/src/wmsysmon.c
-@@ -852,10 +852,10 @@
- #ifdef HI_INTS
- 			"| 01234567   UV   |  <--- 0-N are hardware interrupts 0-23\n"
- 			"| 89ABCDEF   WX   |  <--- U,V are Page IN/OUT, W,X are Swap IN/OUT\n"
--			"| GHIJKLMN   YZ   |\n"
-+			"| GHIJKLMN   YZ   |  <--- Y,Z are Swap IN/OUT\n"
- #else
- 			"| 01234567   WX   |  <--- 0-F are hardware interrupts 0-15\n"
--			"| 89ABCDEF   YZ   |  <--- W,X are Page IN/OUT, W,X are Swap IN/OUT\n"
-+			"| 89ABCDEF   YZ   |  <--- W,X are Page IN/OUT, Y,Z are Swap IN/OUT\n"
- #endif
- 			"-------------------\n");
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 25155e8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-break.patch
-output.patch
-src_makefile.patch
-makefile-strip.patch
-unused-but-set-variable.patch
-unused-result.patch
diff --git a/debian/patches/src_makefile.patch b/debian/patches/src_makefile.patch
deleted file mode 100644
index 7b5b457..0000000
--- a/debian/patches/src_makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Change Makefile to fit debian policy
-Author: Luca Bedogni <me at lucabedogni.it>
-Last-Update: 2015-07-12
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -3,7 +3,7 @@
- LIBDIR += -L/usr/X11R6/lib
- LDFLAGS += -lXpm -lXext -lX11 -lm -s
- #CFLAGS = -g #-DMONDEBUG
--CFLAGS += -Wall -O3 -m486 -fomit-frame-pointer -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
-+CFLAGS += -Wall -O3 -fomit-frame-pointer -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
- 
- BIN = wmsysmon
- OBJS =	wmgeneral.o \
-@@ -17,5 +17,6 @@
- clean:
- 	rm -f $(OBJS) $(BIN)
- 
--install:
--	install -g root -o root $(BIN) /usr/local/bin
-+install: $(BIN)
-+	mkdir -p $(DESTDIR)/usr/bin
-+	install -g root -o root $(BIN) $(DESTDIR)/usr/bin
diff --git a/debian/patches/unused-but-set-variable.patch b/debian/patches/unused-but-set-variable.patch
deleted file mode 100644
index 37caa3d..0000000
--- a/debian/patches/unused-but-set-variable.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix "variable ‘stage’ set but not used" compiler warning.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-07-12
-
---- a/src/wmsysmon.c
-+++ b/src/wmsysmon.c
-@@ -439,10 +439,9 @@
- 	static long	swapins;
- 	static long	swapouts;
- 	static long	intdiff;
--	static long	stage;
- 	static long	*tints;
- 
--	stage = io = iodiff = iopercent = pageins = pageouts = swapins = swapouts = 0;
-+	io = iodiff = iopercent = pageins = pageouts = swapins = swapouts = 0;
- 
- 	statfp = freopen("/proc/stat", "r", statfp);
- 
diff --git a/debian/patches/unused-result.patch b/debian/patches/unused-result.patch
deleted file mode 100644
index c1d5700..0000000
--- a/debian/patches/unused-result.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix "ignoring return value of ‘fscanf’" compiler warning.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-07-12
-
---- a/src/wmsysmon.c
-+++ b/src/wmsysmon.c
-@@ -233,7 +233,8 @@
-     /* init uptime */
- 	fp = fopen("/proc/uptime", "r");
- 	if (fp) {
--		fscanf(fp, "%ld", &start_time);
-+		if (fscanf(fp, "%ld", &start_time) < 1)
-+			fprintf(stderr, "warning: could not read uptime\n");
- 		fclose(fp);
- 		start_uptime = time(NULL);
- 	}

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