[Pkg-wmaker-commits] [wmget] 03/16: debian/patches: Remove directory; patches applied upstream, or, in the case of 01_Makefile.patch, unnecessary due to switch to autotools.

[Doug Torrance]

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

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

commit 52f3d8f1eaddc5ec33c6448a81d2937d9ae561d5
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Sun Feb 7 12:13:27 2016 -0500

    debian/patches: Remove directory; patches applied upstream, or, in the case
    of 01_Makefile.patch, unnecessary due to switch to autotools.
---
 debian/patches/01_Makefile.patch               | 48 --------------------------
 debian/patches/fix_-Wpointer-to-int-cast.patch | 34 ------------------
 debian/patches/fix_resource_leaks.patch        | 25 --------------
 debian/patches/series                          |  3 --
 4 files changed, 110 deletions(-)

diff --git a/debian/patches/01_Makefile.patch b/debian/patches/01_Makefile.patch
deleted file mode 100644
index 322bc58..0000000
--- a/debian/patches/01_Makefile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Update Makefile.
- In particular,
- - Install Makefile in /usr/share/man instead of /usr/man. (This was the only
-   purpose of the dpatch version of this patch that existed prior to version
-   0.6.0-4.)
- - Introduce LIBS variable to fix linking order and avoid "undefined reference"
-   errors during build.
- - Remove unnecessary inclusion of CFLAGS during linking.
- - Honor DESTDIR variable.
- - Drop unnecessary -lm from LIBS.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-01-30
-
---- a/Makefile
-+++ b/Makefile
-@@ -54,7 +54,8 @@
- CFLAGS=		-Wall -W -I/usr/X11R6/include -O
- # The following line is what I use during development
- #CFLAGS:=	$(CFLAGS) -Werror -g 
--LDFLAGS=	-L/usr/X11R6/lib -lXpm -lXext -lX11 -lm -lcurl
-+LDFLAGS=	-L/usr/X11R6/lib
-+LIBS=		-lXpm -lXext -lX11 -lcurl
- DOCS=		wmget.1
- 
- VERSION:=	$(shell grep '\#define WMGET_VERSION ' wmget.h \
-@@ -81,17 +82,17 @@
- 
- install:	all
- 		echo $(PREFIX) > install.prefix ; \
--		$(INSTALLDIR) $(PREFIX)/bin ; \
--		$(INSTALLBIN) wmget $(PREFIX)/bin/wmget ; \
--		$(INSTALLDIR) $(PREFIX)/man/man1 ; \
--		$(INSTALLMAN) wmget.1 $(PREFIX)/man/man1/wmget.1 ; \
-+		$(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin ; \
-+		$(INSTALLBIN) wmget $(DESTDIR)$(PREFIX)/bin/wmget ; \
-+		$(INSTALLDIR) $(DESTDIR)$(PREFIX)/share/man/man1 ; \
-+		$(INSTALLMAN) wmget.1 $(DESTDIR)$(PREFIX)/share/man/man1/wmget.1 ; \
- 
- uninstall:
- 		cd `cat install.prefix` && rm -f bin/wmget man/man1/wmget.1
- 		rm -f install.prefix
- 
- wmget:		dockapplib $(OBJS)
--		$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(DALIB) -o $@
-+		$(CC) $(LDFLAGS) $(OBJS) $(DALIB) -o $@ $(LIBS)
- 
- 
- ##### LIBRARY ##########################################################
diff --git a/debian/patches/fix_-Wpointer-to-int-cast.patch b/debian/patches/fix_-Wpointer-to-int-cast.patch
deleted file mode 100644
index 8d56844..0000000
--- a/debian/patches/fix_-Wpointer-to-int-cast.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Fix -Wpointer-to-int-cast compiler warnings.
- In particular, use intptr_t instead of int.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-01-30
-
---- a/server.c
-+++ b/server.c
-@@ -949,7 +949,7 @@
- static dockapp_rv_t on_click_pbar (
-         void *cbdata, int x_unused, int y_unused)
- {
--    int which = (int)cbdata;
-+    int which = (intptr_t)cbdata;
-     (void)x_unused;
-     (void)y_unused;
- 
-@@ -969,7 +969,7 @@
- static dockapp_rv_t on_click_stop (
-         void *cbdata, int x_unused, int y_unused)
- {
--    int which = (int)cbdata;
-+    int which = (intptr_t)cbdata;
-     (void)x_unused;
-     (void)y_unused;
- 
-@@ -1047,7 +1047,7 @@
-  */
- int server (int argc, char **argv)
- {
--    int i;
-+    intptr_t i;
- 
-     config_server (argc, argv, &config);
- 
diff --git a/debian/patches/fix_resource_leaks.patch b/debian/patches/fix_resource_leaks.patch
deleted file mode 100644
index e07498d..0000000
--- a/debian/patches/fix_resource_leaks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix resource leaks.
- In particular, fclose() all the files we fopen().
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-01-30
-
---- a/configure.c
-+++ b/configure.c
-@@ -373,6 +373,7 @@
- 
-     if ((rcfp = fopen (rcfile, "rt"))) {
-         read_rcfile (rcfp, cfg);
-+        fclose (rcfp);
-     } else {
-         /* rcfiles are fully optional... */
-         debug_sys ("Could not open rcfile '%s'", rcfile);
---- a/retrieve.c
-+++ b/retrieve.c
-@@ -98,6 +98,7 @@
-     fprintf (error_file, " To file: %s\n", job->options.save_to);
-     fprintf (error_file, " Error: %s\n", msg);
-     fprintf (error_file, " (" WMGET_VERSION_BANNER ")\n");
-+    fclose (error_file);
- }
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9cadf08..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01_Makefile.patch
-fix_-Wpointer-to-int-cast.patch
-fix_resource_leaks.patch

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