From 2568517245188a638fa67304c1a05a352de61bd4 Mon Sep 17 00:00:00 2001
From: bbruns <bbruns@e5899ace-8841-11de-95b9-8f387cfb8bc3>
Date: Sat, 12 Apr 2014 15:35:21 +0000
Subject: [PATCH] Update some of the debian files

---
 debian/patches/01-deb-install-location.patch  | 13 -------
 .../01-deb-makefile-install-location.patch    | 24 -------------
 debian/patches/01-location.patch              | 35 +++++++++++++++++++
 3 files changed, 35 insertions(+), 37 deletions(-)
 delete mode 100644 debian/patches/01-deb-install-location.patch
 delete mode 100644 debian/patches/01-deb-makefile-install-location.patch
 create mode 100644 debian/patches/01-location.patch

diff --git a/debian/patches/01-deb-install-location.patch b/debian/patches/01-deb-install-location.patch
deleted file mode 100644
index 04825a0..0000000
--- a/debian/patches/01-deb-install-location.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: srfirewall-2.0a1+svn20140408/bin/srfirewall
-===================================================================
---- srfirewall-2.0a1+svn20140408.orig/bin/srfirewall	2014-04-08 18:55:30.209705751 -0600
-+++ srfirewall-2.0a1+svn20140408/bin/srfirewall	2014-04-08 19:22:51.369154162 -0600
-@@ -22,7 +22,7 @@
- FW_VERSION="2.0 PreAlpha 1"
- 
- # Important directory locations
--FWPREFIX="/usr/local"
-+FWPREFIX="/usr"
- FWCONFIGDIR="${FWPREFIX}/etc/srfirewall"
- FWLIBDIR="${FWPREFIX}/lib/srfirewall"
- FWBINDIR="${FWPREFIX}/bin"
diff --git a/debian/patches/01-deb-makefile-install-location.patch b/debian/patches/01-deb-makefile-install-location.patch
deleted file mode 100644
index 23162f3..0000000
--- a/debian/patches/01-deb-makefile-install-location.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: srfirewall-2.0a1+svn20140408/Makefile
-===================================================================
---- srfirewall-2.0a1+svn20140408.orig/Makefile	2014-04-08 19:49:20.440285374 -0600
-+++ srfirewall-2.0a1+svn20140408/Makefile	2014-04-08 19:49:31.160360827 -0600
-@@ -1,14 +1,14 @@
--PREFIX=/usr/local
-+PREFIX=/usr
- 
- all: # Nothing here
- 
- install:
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/lib/srfirewall \
--	$(DESTDIR)$(PREFIX)/etc/srfirewall
-+	$(DESTDIR)/etc/srfirewall
- 	cp -r bin/* $(DESTDIR)$(PREFIX)/bin/
- 	cp -r lib/* $(DESTDIR)$(PREFIX)/lib/srfirewall/
--	cp -r etc/* $(DESTDIR)$(PREFIX)/etc/srfirewall/
-+	cp -r etc/* $(DESTDIR)/etc/srfirewall/
- 	
- install-docs:
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/srfirewall
--	cp -r ChangeLog doc/* License ReadMe $(DESTDIR)$(PREFIX)/share/doc/srfirewall
-\ No newline at end of file
-+	cp -r ChangeLog doc/* License ReadMe $(DESTDIR)$(PREFIX)/share/doc/srfirewall
diff --git a/debian/patches/01-location.patch b/debian/patches/01-location.patch
new file mode 100644
index 0000000..da77348
--- /dev/null
+++ b/debian/patches/01-location.patch
@@ -0,0 +1,35 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-PREFIX=/usr/local
++PREFIX=/usr
+ 
+ all: # Nothing here
+ 
+@@ -7,11 +7,11 @@
+ 	$(DESTDIR)$(PREFIX)/etc/srfirewall
+ 	cp -r bin/* $(DESTDIR)$(PREFIX)/bin/
+ 	cp -r lib/* $(DESTDIR)$(PREFIX)/lib/srfirewall/
+-	if [ ! -e $(DESTDIR)$(PREFIX)/etc/srfirewall/main.conf ]; then cp -r etc/* $(DESTDIR)$(PREFIX)/etc/srfirewall/; fi
++	if [ ! -e $(DESTDIR)/etc/srfirewall/main.conf ]; then cp -r etc/* $(DESTDIR)/etc/srfirewall/; fi
+ 	
+ install-etc:
+-	cp -r etc/* $(DESTDIR)$(PREFIX)/etc/srfirewall/
++	cp -r etc/* $(DESTDIR)/etc/srfirewall/
+ 	
+ install-docs:
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/srfirewall
+-	cp -r ChangeLog doc/* License ReadMe $(DESTDIR)$(PREFIX)/share/doc/srfirewall
+\ No newline at end of file
++	cp -r ChangeLog doc/* License ReadMe $(DESTDIR)$(PREFIX)/share/doc/srfirewall
+--- a/bin/srfirewall
++++ b/bin/srfirewall
+@@ -22,7 +22,7 @@
+ FW_VERSION="2.0 Alpha 2"
+ 
+ # Important directory locations
+-FWPREFIX="/usr/local"
++FWPREFIX="/usr"
+ FWCONFIGDIR="${FWPREFIX}/etc/srfirewall"
+ FWLIBDIR="${FWPREFIX}/lib/srfirewall"
+ FWBINDIR="${FWPREFIX}/bin"