[Pkg-wmaker-commits] [wmtime] 45/101: 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 wmtime.

commit eaf07ca3397ae7b32284965bc53c9502e8099da4
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Thu Aug 28 10:40:36 2014 -0500

    debian/patches: Remove directory; patches applied upstream.
---
 debian/patches/remove_unused_variables.patch | 36 ----------------------------
 debian/patches/rm-force-in-make-clean.patch  | 23 ------------------
 debian/patches/series                        |  2 --
 3 files changed, 61 deletions(-)

diff --git a/debian/patches/remove_unused_variables.patch b/debian/patches/remove_unused_variables.patch
deleted file mode 100644
index daa35dd..0000000
--- a/debian/patches/remove_unused_variables.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Remove unused variables.
- This patch removes the unused variables nexttime and old_time_struct to avoid
- a warning when -Wunused-but-set-variable is passed.
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: 2014-08-19
-
---- a/wmtime/wmtime.c
-+++ b/wmtime/wmtime.c
-@@ -231,11 +231,9 @@
- 	int			but_stat = -1;
- 
- 	struct tm	*time_struct;
--	struct tm	old_time_struct;
- 
- 	long		starttime;
- 	long		curtime;
--	long		nexttime;
- 
- 	char		*conffile = NULL;
- 
-@@ -273,7 +271,6 @@
- 	AddMouseRegion(1, 5, 5, 58, 46);
- 
- 	starttime = time(0);
--	nexttime = starttime + 1;
- 
- 	curtime = time(0);
- 	time_struct = localtime(&curtime);
-@@ -283,7 +280,6 @@
- 
- 		waitpid(0, NULL, WNOHANG);
- 		
--		old_time_struct = *time_struct;
- 		time_struct = localtime(&curtime);
- 
- 
diff --git a/debian/patches/rm-force-in-make-clean.patch b/debian/patches/rm-force-in-make-clean.patch
deleted file mode 100644
index 3a05fcb..0000000
--- a/debian/patches/rm-force-in-make-clean.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Use rm -f in make clean
- This patch uses the -f option for rm in make clean so that no error occurs
- when make clean is run while no object or binary files exist.  (It also adds
- a newline at the end of the Makefile thanks to emacs.)
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: <2014-07-21>
-
---- wmtime-1.1.orig/wmtime/Makefile
-+++ wmtime-1.1/wmtime/Makefile
-@@ -17,9 +17,9 @@ wmtime: $(OBJS) $(XPMS)
- 
- clean::
- 	for i in $(OBJS) ; do \
--		rm $$i; \
-+		rm -f $$i; \
- 	done
--	rm wmtime
-+	rm -f wmtime
- 
- install:: wmtime
--	install -m 755 wmtime $(DESTDIR)/usr/bin
-\ No newline at end of file
-+	install -m 755 wmtime $(DESTDIR)/usr/bin
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b6d2633..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-rm-force-in-make-clean.patch
-remove_unused_variables.patch

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