Browse Source

Update some of the debian files

bbruns 4 years ago
parent
commit
2568517245

+ 0
- 13
debian/patches/01-deb-install-location.patch View File

@@ -1,13 +0,0 @@
1
-Index: srfirewall-2.0a1+svn20140408/bin/srfirewall
2
-===================================================================
3
---- srfirewall-2.0a1+svn20140408.orig/bin/srfirewall	2014-04-08 18:55:30.209705751 -0600
4
-+++ srfirewall-2.0a1+svn20140408/bin/srfirewall	2014-04-08 19:22:51.369154162 -0600
5
-@@ -22,7 +22,7 @@
6
- FW_VERSION="2.0 PreAlpha 1"
7
- 
8
- # Important directory locations
9
--FWPREFIX="/usr/local"
10
-+FWPREFIX="/usr"
11
- FWCONFIGDIR="${FWPREFIX}/etc/srfirewall"
12
- FWLIBDIR="${FWPREFIX}/lib/srfirewall"
13
- FWBINDIR="${FWPREFIX}/bin"

+ 0
- 24
debian/patches/01-deb-makefile-install-location.patch View File

@@ -1,24 +0,0 @@
1
-Index: srfirewall-2.0a1+svn20140408/Makefile
2
-===================================================================
3
---- srfirewall-2.0a1+svn20140408.orig/Makefile	2014-04-08 19:49:20.440285374 -0600
4
-+++ srfirewall-2.0a1+svn20140408/Makefile	2014-04-08 19:49:31.160360827 -0600
5
-@@ -1,14 +1,14 @@
6
--PREFIX=/usr/local
7
-+PREFIX=/usr
8
- 
9
- all: # Nothing here
10
- 
11
- install:
12
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/lib/srfirewall \
13
--	$(DESTDIR)$(PREFIX)/etc/srfirewall
14
-+	$(DESTDIR)/etc/srfirewall
15
- 	cp -r bin/* $(DESTDIR)$(PREFIX)/bin/
16
- 	cp -r lib/* $(DESTDIR)$(PREFIX)/lib/srfirewall/
17
--	cp -r etc/* $(DESTDIR)$(PREFIX)/etc/srfirewall/
18
-+	cp -r etc/* $(DESTDIR)/etc/srfirewall/
19
- 	
20
- install-docs:
21
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/srfirewall
22
--	cp -r ChangeLog doc/* License ReadMe $(DESTDIR)$(PREFIX)/share/doc/srfirewall
23
-\ No newline at end of file
24
-+	cp -r ChangeLog doc/* License ReadMe $(DESTDIR)$(PREFIX)/share/doc/srfirewall

+ 35
- 0
debian/patches/01-location.patch View File

@@ -0,0 +1,35 @@
1
+--- a/Makefile
2
++++ b/Makefile
3
+@@ -1,4 +1,4 @@
4
+-PREFIX=/usr/local
5
++PREFIX=/usr
6
+ 
7
+ all: # Nothing here
8
+ 
9
+@@ -7,11 +7,11 @@
10
+ 	$(DESTDIR)$(PREFIX)/etc/srfirewall
11
+ 	cp -r bin/* $(DESTDIR)$(PREFIX)/bin/
12
+ 	cp -r lib/* $(DESTDIR)$(PREFIX)/lib/srfirewall/
13
+-	if [ ! -e $(DESTDIR)$(PREFIX)/etc/srfirewall/main.conf ]; then cp -r etc/* $(DESTDIR)$(PREFIX)/etc/srfirewall/; fi
14
++	if [ ! -e $(DESTDIR)/etc/srfirewall/main.conf ]; then cp -r etc/* $(DESTDIR)/etc/srfirewall/; fi
15
+ 	
16
+ install-etc:
17
+-	cp -r etc/* $(DESTDIR)$(PREFIX)/etc/srfirewall/
18
++	cp -r etc/* $(DESTDIR)/etc/srfirewall/
19
+ 	
20
+ install-docs:
21
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/srfirewall
22
+-	cp -r ChangeLog doc/* License ReadMe $(DESTDIR)$(PREFIX)/share/doc/srfirewall
23
+\ No newline at end of file
24
++	cp -r ChangeLog doc/* License ReadMe $(DESTDIR)$(PREFIX)/share/doc/srfirewall
25
+--- a/bin/srfirewall
26
++++ b/bin/srfirewall
27
+@@ -22,7 +22,7 @@
28
+ FW_VERSION="2.0 Alpha 2"
29
+ 
30
+ # Important directory locations
31
+-FWPREFIX="/usr/local"
32
++FWPREFIX="/usr"
33
+ FWCONFIGDIR="${FWPREFIX}/etc/srfirewall"
34
+ FWLIBDIR="${FWPREFIX}/lib/srfirewall"
35
+ FWBINDIR="${FWPREFIX}/bin"

Loading…
Cancel
Save