Commit patch queue (exported by git-debrebase)debian/1.4.2+git20200928.392c40f9-1

[git-debrebase make-patches: export and commit patches]

3 files changed, 85 insertions, 0 deletions

diff --git a/debian/patches/add-a-.gitignore.patch b/debian/patches/add-a-.gitignore.patch
new file mode 100644
index 0000000..19bf967
--- /dev/null
+++ b/debian/patches/add-a-.gitignore.patch
@@ -0,0 +1,20 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+Date: Mon, 8 Feb 2021 00:14:11 -0700
+Subject: add a .gitignore
+
+---
+ .gitignore | 5 +++++
+ 1 file changed, 5 insertions(+)
+ create mode 100644 .gitignore
+
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..17d640d
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1,5 @@
++*.o
++*.cgi
++bin2c
++wfmicon*.h
++debian/wfm
diff --git a/debian/patches/patch-Makefile-for-.deb-builds.patch b/debian/patches/patch-Makefile-for-.deb-builds.patch
new file mode 100644
index 0000000..fd7ad5b
--- /dev/null
+++ b/debian/patches/patch-Makefile-for-.deb-builds.patch
@@ -0,0 +1,63 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+Date: Mon, 8 Feb 2021 00:14:18 -0700
+Subject: patch Makefile for .deb builds
+
+---
+ Makefile | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index bc6e45c..ccd0332 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,31 +1,31 @@
+-# With GIT Integration
+-#CC=gcc -Wall -O3 -DWFMGIT 
+-#LD=-lgit2 -lpthread
++LDFLAGS += -Wl,-z,muldefs
+ 
+-# Without GIT Integration
+-CC=gcc -Wall -O3
+-LD=
++all: wfm.cgi wfm_git.cgi
+ 
+-OB=wfm.o dir.o dialogs.o fileio.o cgic.o md5.o urlencode.o git.o
++wfm.cgi: wfm.o dir.o dialogs.o fileio.o cgic.o md5.o urlencode.o git_nogit.o
++	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+ 
+-all: wfm
++wfm_git.cgi: wfm.o dir.o dialogs.o fileio.o cgic.o md5.o urlencode.o git_git.o
++	$(CC) $(CPPFLAGS) -DWFMGIT $(CFLAGS) -o $@ $^ $(LDFLAGS) -lgit2 -lpthread
+ 
+-wfm: ${OB}
+-	${CC} ${OB} -o wfm ${LD}
+-	@strip wfm
+-	@du -h wfm
++wfm.h: wfmiconres.h
+ 
+-wfm.o: wfm.c wfmiconres.h wfm.h
++dir.o: dir.c wfm.h
++dialogs.o: dialogs.c wfm.h
++wfm.o: wfm.c wfm.h
++fileio.o: fileio.c wfm.h
++
++git_nogit.o: git.c wfm.h
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
++
++git_git.o: git.c wfm.h
++	$(CC) $(CPPFLAGS) -DWFMGIT $(CFLAGS) -c -o $@ $<
+ 
+ wfmiconres.h: bin2c
+ 	sh ./mkicons.sh
+ 
+ bin2c: bin2c.c
+-	${CC} -o bin2c bin2c.c
+-
+-.c.o:
+-	${CC} -c $< 
++	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+ 
+ clean:
+-	rm -f *.o  wfm wfmicon*.h bin2c
+-
++	rm -f *.o *.cgi wfmicon*.h bin2c
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..27e6016
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+add-a-.gitignore.patch
+patch-Makefile-for-.deb-builds.patch