[Pkg-wmaker-commits] [wmifinfo] 37/49: 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 wmifinfo.

commit 5453151b5a81d9f1c1d90a04d2e708c874da9d81
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Tue Dec 9 13:01:46 2014 -0600

    debian/patches: Remove directory; patches applied upstream.
---
 debian/patches/makefile_patch.patch       | 71 -------------------------------
 debian/patches/series                     |  2 -
 debian/patches/wmifinfo-timeval_fix.patch | 23 ----------
 3 files changed, 96 deletions(-)

diff --git a/debian/patches/makefile_patch.patch b/debian/patches/makefile_patch.patch
deleted file mode 100644
index d6f9e7c..0000000
--- a/debian/patches/makefile_patch.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: Various Makefile updates
- This patch includes elements of the original makefile_patch.patch by Enrique
- Monge and makefile_add_ldflags.patch by Emanuele Rocca.
- .
- Rename COPTS and LDOTPS to the more standard CFLAGS and LIBS.  Also use
- CPPFLAGS when compiling and LDFLAGS when linking.
- .
- Use INSTALL instead of cp.  Also honor DESTDIR.
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Author: Enrique Monge <emonge at debian.org.sv>
-Author: Emanuele Rocca <ema at debian.org>
-Last-Update: 2014-12-01
-
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,7 @@
- # Set this to 'y' if you want support for reading the link quality
- # of nowiresneeded 1148 PCMCIA or Swallow cards
- 
--ENABLE_NWN_SUPPORT=n
-+ENABLE_NWN_SUPPORT=y
- 
- 
- ##################################################################
-@@ -13,34 +13,36 @@
- 
- CC = gcc
- LD = gcc
--COPTS = -Wall -O2 -D'VERSION="$(VERSION)"' -D'NAME="$(NAME)"'
--LDOPTS = -lX11 -L/usr/X11R6/lib -lXpm -lXext
--BINDIR = /usr/local/bin
-+CFLAGS = -Wall -O2 -D'VERSION="$(VERSION)"' -D'NAME="$(NAME)"'
-+LIBS = -lX11 -lXpm -lXext
-+PREFIX = /usr/local
-+BINDIR = $(PREFIX)/bin
-+INSTALL=/usr/bin/install
-+INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
- 
- BIN =	wmifinfo
--FILES = wmifinfo.o xutils.o 
-+FILES = wmifinfo.o xutils.o
- 
- ifeq ("$(ENABLE_NWN_SUPPORT)", "y")
- FILES += nwn.o
--COPTS += -DENABLE_NWN_SUPPORT
-+CFLAGS += -DENABLE_NWN_SUPPORT
- endif
- 
- all:	$(BIN)
- 
--.c.o: 	
--	$(CC) $(COPTS) -c $< 
-+.c.o:
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
- 
- $(BIN):	$(FILES)
--	$(LD) -o $@ $(FILES) $(LDOPTS)
-+	$(LD) $(LDFLAGS) -o $@ $(FILES) $(LIBS)
- 
- clean:
- 	rm -f *.o $(BIN) core ./.#* *.orig *.rej
- 
- install:
--	cp $(BIN) $(BINDIR)
-+	$(INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR)
- 
- dist:	clean
- 	rm -rf /tmp/wmifinfo-$(VERSION)
- 	cd .. && cp -a wmifinfo /tmp/wmifinfo-$(VERSION)
- 	cd /tmp && tar --exclude CVS -zcvf wmifinfo-$(VERSION).tgz wmifinfo-$(VERSION)/
--	
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b728c09..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-wmifinfo-timeval_fix.patch
-makefile_patch.patch
diff --git a/debian/patches/wmifinfo-timeval_fix.patch b/debian/patches/wmifinfo-timeval_fix.patch
deleted file mode 100644
index cd24fe5..0000000
--- a/debian/patches/wmifinfo-timeval_fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Author: Julien BLACHE
-Description: This add set a valid timeval to wmifinfo.c 
---- wmifinfo-0.09.orig/wmifinfo.c
-+++ wmifinfo-0.09/wmifinfo.c
-@@ -49,6 +49,7 @@
- #define MAXIFS 10
- #ifdef linux
- #define DELAY 1000000L
-+#define USEC_PER_SEC 1000000L
- #else
- #define DELAY 100000L
- #endif
-@@ -267,8 +268,8 @@
- 		}
- 
- #ifdef linux
--		tv.tv_sec = 0;
--		tv.tv_usec = DELAY;
-+		tv.tv_sec = DELAY / USEC_PER_SEC;
-+		tv.tv_usec = DELAY - (tv.tv_sec * USEC_PER_SEC);
- 		
- 		FD_ZERO(&fds);
- 		FD_SET(ConnectionNumber(display), &fds);

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