[hamradio-commits] [direwolf] 02/08: Fixes to some patches

[Iain Learmonth]

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

irl-guest pushed a commit to branch master
in repository direwolf.

commit 29d166766c5da07b703594e0fd771f43778cd982
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Thu Feb 5 00:03:49 2015 +0000

    Fixes to some patches
    
     * Don't install ll2utm or utm2ll, these names cause issues with
       conflicts and are only convience utilities anyway.
     * Enable GPS in its own patch.
---
 debian/patches/enable_gps.patch             | 13 +++++++++++++
 debian/patches/fix_hardening-no-relro.patch | 11 -----------
 debian/patches/makefile_install.patch       |  4 ++--
 debian/patches/series                       |  1 +
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/debian/patches/enable_gps.patch b/debian/patches/enable_gps.patch
new file mode 100644
index 0000000..8a0ec4f
--- /dev/null
+++ b/debian/patches/enable_gps.patch
@@ -0,0 +1,13 @@
+--- direwolf.orig/Makefile.linux
++++ direwolf/Makefile.linux
+@@ -100,8 +100,8 @@
+ 
+ # Uncomment following lines to enable GPS interface & tracker function.
+ 
+-#CFLAGS += -DENABLE_GPS
+-#LDLIBS += -lgps
++CFLAGS += -DENABLE_GPS
++LDLIBS += -lgps
+ 
+ 
+ 
diff --git a/debian/patches/fix_hardening-no-relro.patch b/debian/patches/fix_hardening-no-relro.patch
index 703a554..bc398d7 100644
--- a/debian/patches/fix_hardening-no-relro.patch
+++ b/debian/patches/fix_hardening-no-relro.patch
@@ -16,17 +16,6 @@ Last-Update: 2014-09-08
  endif
  
  
-@@ -100,8 +100,8 @@
- 
- # Uncomment following lines to enable GPS interface & tracker function.
- 
--#CFLAGS += -DENABLE_GPS
--#LDLIBS += -lgps
-+CFLAGS += -DENABLE_GPS
-+LDLIBS += -lgps
- 
- 
- 
 @@ -121,7 +121,7 @@
  		ptt.o beacon.o dwgps.o encode_aprs.o latlong.o encode_aprs.o latlong.o textcolor.o \
  		dtmf.o aprs_tt.o tt_user.o tt_text.o igate.o nmea.o log.o telemetry.o \
diff --git a/debian/patches/makefile_install.patch b/debian/patches/makefile_install.patch
index 26adfb8..fb643fa 100644
--- a/debian/patches/makefile_install.patch
+++ b/debian/patches/makefile_install.patch
@@ -44,8 +44,8 @@ Last-Update: 2014-09-08
 +	install decode_aprs debian/direwolf/usr/bin
 +	install text2tt debian/direwolf/usr/bin
 +	install tt2text debian/direwolf/usr/bin
-+	install ll2utm debian/direwolf/usr/bin
-+	install utm2ll debian/direwolf/usr/bin
++	#install ll2utm debian/direwolf/usr/bin
++	#install utm2ll debian/direwolf/usr/bin
 +	install aclients debian/direwolf/usr/bin
 +	install log2gpx debian/direwolf/usr/bin
 +	install -D --mode=644 tocalls.txt debian/direwolf/usr/share/direwolf/tocalls.txt
diff --git a/debian/patches/series b/debian/patches/series
index f76beb2..654b4d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ makefile_install.patch
 fix_start_script_paths.patch
 fix_documentation_path.patch
 fix_hardening-no-relro.patch
+enable_gps.patch

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