[Pkg-wmaker-commits] [wmitime] 118/127: 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 wmitime.

commit 6398ecc7cd20a5e266646d176e06347effb8f3c2
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Sat Dec 20 21:12:36 2014 -0600

    debian/patches: Remove directory; patches applied upstream.
---
 debian/patches/10-hungarian-date.patch          | 60 -------------------------
 debian/patches/20-makefile-CC.patch             | 29 ------------
 debian/patches/allow_display_with_no_args.patch | 22 ---------
 debian/patches/make-install.patch               | 23 ----------
 debian/patches/series                           |  4 --
 5 files changed, 138 deletions(-)

diff --git a/debian/patches/10-hungarian-date.patch b/debian/patches/10-hungarian-date.patch
deleted file mode 100755
index 56bc059..0000000
--- a/debian/patches/10-hungarian-date.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Author: Jari Aalto <jari.aalto at cante.net>
-Description: Add hungarian support
-
-Index: wmitime/wmitime/hungarian.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ wmitime/wmitime/hungarian.h	2007-03-26 12:16:58.000000000 +0300
-@@ -0,0 +1,28 @@
-+/* hungarian.h */
-+
-+static char daynames[7][3] =
-+{
-+    {"Va"},
-+    {"He"},
-+    {"Ke"},
-+    {"Sz"},
-+    {"Cs"},
-+    {"Pe"},
-+    {"Sz"}
-+};
-+
-+static char monthnames[12][4] =
-+{
-+    {"Jan"},
-+    {"Feb"},
-+    {"Mar"},
-+    {"Apr"},
-+    {"Maj"},
-+    {"Jun"},
-+    {"Jul"},
-+    {"Aug"},
-+    {"Sze"},
-+    {"Okt"},
-+    {"Nov"},
-+    {"Dec"}
-+};
-Index: wmitime/wmitime/wmitime.c
-===================================================================
---- wmitime.orig/wmitime/wmitime.c	2007-03-26 12:17:28.000000000 +0300
-+++ wmitime/wmitime/wmitime.c	2007-03-26 12:17:56.000000000 +0300
-@@ -35,11 +35,19 @@
- #define fr
- #endif
- 
-+#ifdef hu_HU
-+#define hu
-+#endif
-+
- #ifdef fr
- #include "french.h"
- #else
-+#ifdef hu
-+#include "hungarian.h"
-+#else
- #include "language.h"
- #endif
-+#endif
- 
- #include "wmitime-master.xpm"
- char wmitime_mask_bits[64*64];
diff --git a/debian/patches/20-makefile-CC.patch b/debian/patches/20-makefile-CC.patch
deleted file mode 100644
index ce61fa1..0000000
--- a/debian/patches/20-makefile-CC.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Author: Jari Aalto <jari.aalto at cante.net>
-Description: Use CC variable
- .
- wmitime/Makefile |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/wmitime/Makefile
-+++ b/wmitime/Makefile
-@@ -2,17 +2,17 @@
- LIBDIR = -L/usr/X11R6/lib
- LIBS   = -lXpm -lXext -lX11 -lm
- FLAGS = -O2
-+CC	= gcc
- OBJS =	wmitime.o \
- 		../wmgeneral/wmgeneral.o \
- 		../wmgeneral/misc.o \
- 		../wmgeneral/list.o
- 
--
- .c.o:
--	cc -I/usr/X11R6/share/include $(FLAGS) -D$(LANG) -c -Wall $< -o $*.o
-+	$(CC) -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o
- 
- wmtime: $(OBJS)
--	cc $(FLAGS) -D$(LANG) -o wmitime $^ -lXext $(LIBDIR) $(LIBS)
-+	$(CC) $(FLAGS) -o wmitime $^ -lXext $(LIBDIR) $(LIBS)
- 
- all:: wmtime
- 
diff --git a/debian/patches/allow_display_with_no_args.patch b/debian/patches/allow_display_with_no_args.patch
deleted file mode 100644
index 1369f35..0000000
--- a/debian/patches/allow_display_with_no_args.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Allow -display option with no argument.
- Previously, if a user ran wmitime with the -display option and no argument,
- a segmentation fault would occur.  This patch prints a warning instead.
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=716466
-Last-Update: 2014-08-04
-
---- a/wmgeneral/wmgeneral.c
-+++ b/wmgeneral/wmgeneral.c
-@@ -385,7 +385,11 @@
- 	for (i=1; argv[i]; i++) {
- 		if (!strcmp(argv[i], "-display")) {
- 			display_name = argv[i+1];
--			i++;
-+			if (!display_name)
-+				printf("Please provide an argument for "
-+				       "-display.\n");
-+			else
-+				i++;
- 		}
- 		if (!strcmp(argv[i], "-geometry")) {
- 			geometry = argv[i+1];
diff --git a/debian/patches/make-install.patch b/debian/patches/make-install.patch
deleted file mode 100644
index af41869..0000000
--- a/debian/patches/make-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Patch Makefile to use DESTDIR during make install.
- The upstream Makefile would always install the wmitime binary in
- /usr/local/bin, which causes an error while building the package.
- Also create $(DESTDIR)/usr/bin to avoid needing a debian/dirs file.
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: 2014-08-04
-
---- a/wmitime/Makefile
-+++ b/wmitime/Makefile
-@@ -24,9 +24,10 @@
- 	rm -f *~
- 
- install:: wmitime
--	cp -f wmitime /usr/local/bin/
--	chmod 755 /usr/local/bin/wmitime
--	chown root:root /usr/local/bin/wmitime
-+	mkdir -p $(DESTDIR)/usr/bin
-+	cp -f wmitime $(DESTDIR)/usr/bin
-+	chmod 755 $(DESTDIR)/usr/bin/wmitime
-+	chown root:root $(DESTDIR)/usr/bin/wmitime
- #	cp wminetrc $(HOME)/.wminetrc
- #	chmod 600 $(HOME)/.wminetrc
- #	cp wminetrc /etc/wminetrc
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d3adf19..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-10-hungarian-date.patch
-20-makefile-CC.patch
-make-install.patch
-allow_display_with_no_args.patch

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