[hamradio-commits] [direwolf] 04/04: Updates for new upstream 1.1

Iain Learmonth irl-guest at moszumanska.debian.org
Mon Feb 2 00:46:25 UTC 2015 

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

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

commit 879e566c2c16a3542780186cd1bd570d51f9cc59
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Sun Feb 1 22:38:34 2015 +0000

    Updates for new upstream 1.1
    
     * Updated patches for new upstream
     * Added new changelog entry
     * Added libgps-dev for depends and gpsd for suggests
---
 debian/changelog                            |  6 ++
 debian/control                              |  3 +-
 debian/patches/fix_documentation_path.patch |  2 +-
 debian/patches/fix_hardening-no-relro.patch | 89 +++++++++++++++++++----------
 debian/patches/makefile_install.patch       | 87 +++++++++++++++-------------
 5 files changed, 115 insertions(+), 72 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fbf2561..a08bdc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+direwolf (1.1-1) UNRELEASED; urgency=medium
+
+  * Update to new upstream version 1.1.
+
+ -- Iain R. Learmonth <irl at fsfe.org>  Sun, 01 Feb 2015 22:37:47 +0000
+
 direwolf (1.0-3) unstable; urgency=medium
 
   * Changes architecture for direwolf from linux-any to a whitelist of
diff --git a/debian/control b/debian/control
index f10601d..86c93e8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: hamradio
 Priority: optional
 Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
 Uploaders: Iain R. Learmonth <irl at fsfe.org>
-Build-Depends: debhelper (>= 9), libasound2-dev
+Build-Depends: debhelper (>= 9), libasound2-dev, libgps-dev
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/direwolf.git/
 Vcs-Git: git://anonscm.debian.org/pkg-hamradio/direwolf.git
@@ -12,6 +12,7 @@ Homepage: http://home.comcast.net/~wb2osz/site/
 Package: direwolf
 Architecture: alpha amd64 arm64 armel armhf i386 mipsel ppc64el sh4 x32
 Depends: ${shlibs:Depends}, ${misc:Depends}, direwolf-docs
+Suggests: gpsd
 Description: Soundcard TNC for APRS
  Dire Wolf is a software "soundcard" modem/TNC and APRS encoder/decoder. It can
  be used stand-alone to receive APRS messages, as a digipeater, APRStt gateway,
diff --git a/debian/patches/fix_documentation_path.patch b/debian/patches/fix_documentation_path.patch
index 1b6ff1c..efae826 100644
--- a/debian/patches/fix_documentation_path.patch
+++ b/debian/patches/fix_documentation_path.patch
@@ -4,7 +4,7 @@ Last-Update: 2014-09-08
 
 --- direwolf.orig/direwolf.c
 +++ direwolf/direwolf.c
-@@ -875,7 +875,7 @@
+@@ -977,7 +977,7 @@
  
  #if __WIN32__
  #else
diff --git a/debian/patches/fix_hardening-no-relro.patch b/debian/patches/fix_hardening-no-relro.patch
index 36bdc04..703a554 100644
--- a/debian/patches/fix_hardening-no-relro.patch
+++ b/debian/patches/fix_hardening-no-relro.patch
@@ -4,28 +4,39 @@ Last-Update: 2014-09-08
 
 --- direwolf.orig/Makefile.linux
 +++ direwolf/Makefile.linux
-@@ -81,9 +81,9 @@
- arch := $(shell echo | gcc -E -dM - | grep __i386__)
- 
- ifneq ($(arch),)
--CFLAGS := -DUSE_ALSA -O3 -march=pentium3 -pthread
-+CFLAGS += -DUSE_ALSA -O3 -march=pentium3 -pthread ${CPPFLAGS}
+@@ -84,9 +84,9 @@
+ # You might see improvement with -march fine tuned to your hardware.
+ # Probably should keep pentium3 if you will be redistributing binaries
+ # to other people.
+-CFLAGS := -O3 -march=pentium3 -pthread -Iutm
++CFLAGS := -O3 -march=pentium3 -pthread -Iutm $(CPPFLAGS)
  else
--CFLAGS := -DUSE_ALSA -O3 -pthread
-+CFLAGS += -DUSE_ALSA -O3 -pthread ${CPPFLAGS}
+-CFLAGS := -O3 -pthread -Iutm
++CFLAGS := -O3 -pthread -Iutm $(CPPFLAGS)
  endif
  
  
-@@ -109,7 +109,7 @@
+@@ -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 \
+ 		dtmf.o aprs_tt.o tt_user.o tt_text.o igate.o nmea.o log.o telemetry.o \
  		utm.a
--	$(CC) $(CFLAGS) -o $@ $^ -lpthread -lrt -lasound $(LDLIBS) -lm
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lpthread -lrt -lasound $(LDLIBS) -lm
+-	$(CC) $(CFLAGS) -o $@ $^ -lpthread -lrt $(LDLIBS) -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lpthread -lrt $(LDLIBS) -lm
  
  
  # Optimization for slow processors.
-@@ -120,7 +120,7 @@
+@@ -132,7 +132,7 @@
  
  
  fsk_fast_filter.h : demod_afsk.c
@@ -34,7 +45,7 @@ Last-Update: 2014-09-08
  	./gen_fff > fsk_fast_filter.h
  
  
-@@ -129,7 +129,7 @@
+@@ -141,7 +141,7 @@
  	ar -cr $@ $^
  
  LatLong-UTMconversion.o : utm/LatLong-UTMconversion.c
@@ -42,11 +53,11 @@ Last-Update: 2014-09-08
 +	$(CC) $(CFLAGS) $(LDFLAGS) -c -o $@ $^
  
  
- # Optional install step. 
-@@ -166,40 +166,40 @@
+ # Optional installation into /usr/...
+@@ -193,38 +193,38 @@
  # Separate application to decode raw data.
  
- decode_aprs : decode_aprs.c symbols.c ax25_pad.c textcolor.c fcs_calc.c
+ decode_aprs : decode_aprs.c symbols.c ax25_pad.c textcolor.c fcs_calc.c latlong.c log.c telemetry.o
 -	$(CC) $(CFLAGS) -o decode_aprs -DTEST $^ -lm
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o decode_aprs -DTEST $^ -lm
  
@@ -66,37 +77,44 @@ Last-Update: 2014-09-08
  # Convert between Latitude/Longitude and UTM coordinates.
  
  ll2utm : ll2utm.c utm.a
--	$(CC) $(CFLAGS) -I utm -o $@ $^ -lm
-+	$(CC) $(CFLAGS) $(LDFLAGS) -I utm -o $@ $^ -lm
+-	$(CC) $(CFLAGS) -o $@ $^ -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm
  
  utm2ll : utm2ll.c utm.a
--	$(CC) $(CFLAGS) -I utm -o $@ $^ -lm
-+	$(CC) $(CFLAGS) $(LDFLAGS) -I utm -o $@ $^ -lm
+-	$(CC) $(CFLAGS) -o $@ $^ -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm
+ 
+ 
+ # Convert from log file to GPX.
  
+ log2gpx : log2gpx.c 
+-	$(CC) $(CFLAGS) -o $@ $^ -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm
  
  
  # Test application to generate sound.
  
  gen_packets : gen_packets.c ax25_pad.c hdlc_send.c fcs_calc.c gen_tone.c textcolor.c 
--	$(CC) $(CFLAGS) -o $@ $^ -lasound -lm
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lasound -lm
+-	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS) -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) -lm
  
  demod.o : tune.h
  demod_afsk.o : tune.h
- demod_9600.o : tune.h
+@@ -232,7 +232,7 @@
  
- testagc : atest.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o fcs_calc.c ax25_pad.c decode_aprs.c symbols.c tune.h textcolor.c
+ testagc : atest.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o \
+ 		fcs_calc.c ax25_pad.c decode_aprs.c telemetry.c latlong.c symbols.c tune.h textcolor.c
 -	$(CC) $(CFLAGS) -o atest $^ -lm
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o atest $^ -lm
  	./atest 02_Track_2.wav | grep "packets decoded in" > atest.out
  
  
-@@ -207,14 +207,14 @@
- 
+@@ -241,14 +241,14 @@
  
- atest : atest.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o fcs_calc.c ax25_pad.c decode_aprs.c symbols.c textcolor.c
--	$(CC) $(CFLAGS) -o $@ $^ -lm
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm
+ atest : atest.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o \
+ 		fcs_calc.c ax25_pad.c decode_aprs.c telemetry.c latlong.c symbols.c textcolor.c
+-	$(CC) $(CFLAGS) -o $@ $^ -lm -lrt
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm -lrt
  	time ./atest ../direwolf-0.2/02_Track_2.wav 
  
  # Unit test for inner digipeater algorithm
@@ -108,7 +126,7 @@ Last-Update: 2014-09-08
  	./dtest
  
  
-@@ -222,21 +222,21 @@
+@@ -256,14 +256,14 @@
  
  
  itest : igate.c textcolor.c ax25_pad.c fcs_calc.c 
@@ -125,6 +143,15 @@ Last-Update: 2014-09-08
  	./udptest
  
  
+@@ -271,14 +271,14 @@
+ 
+ 
+ etest : telemetry.c ax25_pad.c fcs_calc.c textcolor.c misc.a regex.a
+-	$(CC) $(CFLAGS) -o $@ $^ -lm -lrt
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm -lrt
+ 	./etest
+ 	
+ 
  # Multiple AGWPE network or serial port clients to test TNCs side by side.
  
  aclients : aclients.c ax25_pad.c fcs_calc.c textcolor.c
diff --git a/debian/patches/makefile_install.patch b/debian/patches/makefile_install.patch
index f2c3ab8..26adfb8 100644
--- a/debian/patches/makefile_install.patch
+++ b/debian/patches/makefile_install.patch
@@ -4,54 +4,63 @@ Last-Update: 2014-09-08
 
 --- direwolf.orig/Makefile.linux
 +++ direwolf/Makefile.linux
-@@ -139,28 +139,28 @@
- # For now, just put reference to it at the end so only last step fails.
+@@ -144,33 +144,37 @@
+ 	$(CC) $(CFLAGS) -c -o $@ $^
+ 
+ 
+-# Optional installation into /usr/local/...
++# Optional installation into /usr/...
+ # Needs to be run as root or with sudo.
+ 
+ # TODO: Review file locations.
  
  install : direwolf decode_aprs tocalls.txt symbols-new.txt symbolsX.txt dw-icon.png direwolf.desktop
--	sudo install direwolf /usr/local/bin
--	sudo install decode_aprs /usr/local/bin
--	sudo install text2tt /usr/local/bin
--	sudo install tt2text /usr/local/bin
--	sudo install ll2utm /usr/local/bin
--	sudo install utm2ll /usr/local/bin
--	sudo install aclients /usr/local/bin
--	sudo install -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt
--	sudo install -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt
--	sudo install -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt
--	sudo install -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png
--	sudo install -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop
--	cp direwolf.conf ~
--	cp dw-start.sh ~
--	sudo install -D --mode=644 CHANGES.txt /usr/local/share/doc/direwolf/CHANGES.txt
--	sudo install -D --mode=644 LICENSE-dire-wolf.txt /usr/local/share/doc/direwolf/LICENSE-dire-wolf.txt
--	sudo install -D --mode=644 LICENSE-other.txt /usr/local/share/doc/direwolf/LICENSE-other.txt
--	sudo install -D --mode=644 User-Guide.pdf /usr/local/share/doc/direwolf/User-Guide.pdf
--	sudo install -D --mode=644 Raspberry-Pi-APRS.pdf /usr/local/share/doc/direwolf/Raspberry-Pi-APRS.pdf
--	sudo install -D --mode=644 APRStt-Implementation-Notes.pdf /usr/local/share/doc/direwolf/APRStt-Implementation-Notes.pdf
--	sudo install -D --mode=644 Quick-Start-Guide-Windows.pdf /usr/local/share/doc/direwolf/Quick-Start-Guide-Windows.pdf
--	ln -f -s /usr/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop
+-	install direwolf /usr/local/bin
+-	install decode_aprs /usr/local/bin
+-	install text2tt /usr/local/bin
+-	install tt2text /usr/local/bin
+-	install ll2utm /usr/local/bin
+-	install utm2ll /usr/local/bin
+-	install aclients /usr/local/bin
+-	install log2gpx /usr/local/bin
+-	install -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt
+-	install -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt
+-	install -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt
+-	install -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png
+-	install -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop
+-	install -D --mode=644 CHANGES.txt /usr/local/share/doc/direwolf/CHANGES.txt
+-	install -D --mode=644 LICENSE-dire-wolf.txt /usr/local/share/doc/direwolf/LICENSE-dire-wolf.txt
+-	install -D --mode=644 LICENSE-other.txt /usr/local/share/doc/direwolf/LICENSE-other.txt
+-	install -D --mode=644 User-Guide.pdf /usr/local/share/doc/direwolf/User-Guide.pdf
+-	install -D --mode=644 Raspberry-Pi-APRS.pdf /usr/local/share/doc/direwolf/Raspberry-Pi-APRS.pdf
+-	install -D --mode=644 Raspberry-Pi-APRS-Tracker.pdf /usr/local/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
+-	install -D --mode=644 APRStt-Implementation-Notes.pdf /usr/local/share/doc/direwolf/APRStt-Implementation-Notes.pdf
+-	install -D --mode=644 Quick-Start-Guide-Windows.pdf /usr/local/share/doc/direwolf/Quick-Start-Guide-Windows.pdf
 +	mkdir -p debian/direwolf/usr/bin
++	mkdir -p debian/direwolf/usr/share/direwolf
++	mkdir -p debian/direwolf/usr/share/doc/direwolf
++	mkdir -p debian/direwolf/usr/share/applications
 +	install direwolf debian/direwolf/usr/bin
 +	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 -D --mode=644 tocalls.txt debian/direwolf-docs/usr/share/direwolf/tocalls.txt
-+	install -D --mode=644 symbols-new.txt debian/direwolf-docs/usr/share/direwolf/symbols-new.txt
-+	install -D --mode=644 symbolsX.txt debian/direwolf-docs/usr/share/direwolf/symbolsX.txt
++	install log2gpx debian/direwolf/usr/bin
++	install -D --mode=644 tocalls.txt debian/direwolf/usr/share/direwolf/tocalls.txt
++	install -D --mode=644 symbols-new.txt debian/direwolf/usr/share/direwolf/symbols-new.txt
++	install -D --mode=644 symbolsX.txt debian/direwolf/usr/share/direwolf/symbolsX.txt
 +	install -D --mode=644 dw-icon.png debian/direwolf/usr/share/direwolf/dw-icon.png
 +	install -D --mode=644 direwolf.desktop debian/direwolf/usr/share/applications/direwolf.desktop
-+	install -D --mode=644 direwolf.conf debian/direwolf-docs/usr/share/doc/direwolf/examples/direwolf.conf
-+	install -D --mode=644 dw-start.sh debian/direwolf-docs/usr/share/doc/direwolf/examples/dw-start.sh
-+	install -D --mode=644 CHANGES.txt debian/direwolf-docs/usr/share/doc/direwolf/CHANGES.txt
-+	install -D --mode=644 LICENSE-dire-wolf.txt debian/direwolf-docs/usr/share/doc/direwolf/LICENSE-dire-wolf.txt
-+	install -D --mode=644 LICENSE-other.txt debian/direwolf-docs/usr/share/doc/direwolf/LICENSE-other.txt
-+	install -D --mode=644 User-Guide.pdf debian/direwolf-docs/usr/share/doc/direwolf/User-Guide.pdf
-+	install -D --mode=644 Raspberry-Pi-APRS.pdf debian/direwolf-docs/usr/share/doc/direwolf/Raspberry-Pi-APRS.pdf
-+	install -D --mode=644 APRStt-Implementation-Notes.pdf debian/direwolf-docs/usr/share/doc/direwolf/APRStt-Implementation-Notes.pdf
-+	install -D --mode=644 Quick-Start-Guide-Windows.pdf debian/direwolf-docs/usr/share/doc/direwolf/Quick-Start-Guide-Windows.pdf
++	install -D --mode=644 CHANGES.txt debian/direwolf/usr/share/doc/direwolf/CHANGES.txt
++	install -D --mode=644 LICENSE-dire-wolf.txt debian/direwolf/usr/share/doc/direwolf/LICENSE-dire-wolf.txt
++	install -D --mode=644 LICENSE-other.txt debian/direwolf/usr/share/doc/direwolf/LICENSE-other.txt
++	install -D --mode=644 User-Guide.pdf debian/direwolf/usr/share/doc/direwolf/User-Guide.pdf
++	install -D --mode=644 Raspberry-Pi-APRS.pdf debian/direwolf/usr/share/doc/direwolf/Raspberry-Pi-APRS.pdf
++	install -D --mode=644 Raspberry-Pi-APRS-Tracker.pdf debian/direwolf/usr/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
++	install -D --mode=644 APRStt-Implementation-Notes.pdf debian/direwolf/usr/share/doc/direwolf/APRStt-Implementation-Notes.pdf
++	install -D --mode=644 Quick-Start-Guide-Windows.pdf debian/direwolf/usr/share/doc/direwolf/Quick-Start-Guide-Windows.pdf
  
  
- # Separate application to decode raw data.
+ # The Raspberry Pi has ~/Desktop but Ubuntu does not.

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

More information about the pkg-hamradio-commits mailing list