[hamradio-commits] [direwolf] 02/02: Imported Debian patch 1.3-1
Iain R. Learmonth
irl at moszumanska.debian.org
Wed Sep 7 12:03:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
irl pushed a commit to branch master
in repository direwolf.
commit a6aa45b0fb794f054fceae44ffc39f3297749e10
Merge: 4b9e69a 6e91e57
Author: Iain R. Learmonth <irl at debian.org>
Date: Tue Jul 5 22:14:07 2016 +0100
Imported Debian patch 1.3-1
.gitattributes | 41 +
.gitignore | 108 +-
APRStt-Implementation-Notes.pdf | Bin 1007433 -> 0 bytes
CHANGES.md | 329 +
CHANGES.txt | 314 -
LICENSE-dire-wolf.txt | 562 +-
LICENSE-other.txt | 8 +-
Makefile | 11 +-
Makefile.linux | 541 +-
Makefile.macosx | 620 ++
Makefile.win | 999 ++-
README.md | 96 +
Raspberry-Pi-APRS-Tracker.pdf | Bin 717451 -> 0 bytes
Raspberry-Pi-APRS.pdf | Bin 1558740 -> 0 bytes
User-Guide.pdf | Bin 3139411 -> 0 bytes
aclients.c | 1694 ++--
aprs_tt.c | 3581 ++++----
aprs_tt.h | 309 +-
atest.c | 1482 ++--
audio.c | 2823 +++---
audio.h | 664 +-
audio_portaudio.c | 1326 +++
audio_stats.c | 178 +
audio_stats.h | 7 +
audio_win.c | 2311 +++--
ax25_pad.c | 4635 +++++-----
ax25_pad.h | 759 +-
beacon.c | 1731 ++--
beacon.h | 12 +-
config.c | 7885 +++++++++--------
config.h | 322 +-
.../A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.docx | Bin 0 -> 228905 bytes
debian/APRS-Telemetry-Toolkit.docx | Bin 0 -> 198732 bytes
debian/APRStt-Implementation-Notes.docx | Bin 129102 -> 178371 bytes
debian/APRStt-Listening-Example.docx | Bin 0 -> 113631 bytes
debian/APRStt-interface-for-SARTrack.docx | Bin 0 -> 1284800 bytes
debian/Raspberry-Pi-APRS-Tracker.docx | Bin 157723 -> 159616 bytes
debian/Raspberry-Pi-APRS.docx | Bin 943315 -> 1385988 bytes
debian/Raspberry-Pi-SDR-IGate.docx | Bin 0 -> 18683 bytes
debian/User-Guide.docx | Bin 1899037 -> 2146537 bytes
debian/WA8LMF-TNC-Test-CD-Results.docx | Bin 0 -> 17824 bytes
debian/changelog | 27 +
debian/control | 24 +-
debian/direwolf-docs.docs | 18 +-
debian/patches/enable_gps.patch | 17 -
debian/patches/fix_documentation_path.patch | 22 +-
debian/patches/fix_hardening-no-relro.patch | 29 +-
debian/patches/fix_spelling.patch | 91 +-
debian/patches/fix_start_script_paths.patch | 23 -
debian/patches/libgps22.patch | 14 -
debian/patches/series | 3 -
debian/rules | 4 +
debian/source/include-binaries | 6 +
debian/watch | 4 +-
decode_aprs.c | 9047 ++++++++++----------
decode_aprs.h | 236 +-
dedupe.c | 497 +-
dedupe.h | 20 +-
demod.c | 1753 ++--
demod.h | 32 +-
demod_9600.c | 1044 ++-
demod_9600.h | 50 +-
demod_afsk.c | 2301 ++---
demod_afsk.h | 16 +-
digipeater.c | 1860 ++--
digipeater.h | 142 +-
direwolf.c | 2149 ++---
direwolf.conf | 458 -
direwolf.h | 390 +-
direwolf.spec | 0
direwolf.txt | 1064 +--
dlq.c | 1276 +--
dlq.h | 59 +-
...er-APRS-Packet-Demodulator-Part-1-1200-baud.pdf | Bin
...er-APRS-Packet-Demodulator-Part-2-9600-baud.pdf | Bin
doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf | Bin 0 -> 461593 bytes
doc/APRS-Telemetry-Toolkit.pdf | Bin 0 -> 1253277 bytes
doc/APRStt-Implementation-Notes.pdf | Bin 0 -> 1502085 bytes
doc/APRStt-Listening-Example.pdf | Bin 0 -> 789455 bytes
doc/APRStt-interface-for-SARTrack.pdf | Bin 0 -> 1123525 bytes
doc/README.md | 81 +
doc/Raspberry-Pi-APRS-Tracker.pdf | Bin 0 -> 732449 bytes
doc/Raspberry-Pi-APRS.pdf | Bin 0 -> 1873515 bytes
doc/Raspberry-Pi-SDR-IGate.pdf | Bin 0 -> 543002 bytes
doc/User-Guide.pdf | Bin 0 -> 3506061 bytes
doc/WA8LMF-TNC-Test-CD-Results.pdf | Bin 0 -> 488843 bytes
dsp.c | 504 +-
dsp.h | 18 +-
dtime_now.c | 113 +-
dtime_now.h | 4 +-
dtmf.c | 922 +-
dtmf.h | 24 +-
dw-icon.ico | Bin
dw-icon.png | Bin
dw-icon.rc | 0
dw-start.sh | 39 +-
dwespeak.bat | 14 +-
dwespeak.sh | 0
dwgps.c | 687 +-
dwgps.h | 76 +-
dwgpsd.c | 440 +
dwgpsd.h | 22 +
dwgpsnmea.c | 800 ++
dwgpsnmea.h | 28 +
encode_aprs.c | 1713 ++--
encode_aprs.h | 32 +-
fcs_calc.c | 216 +-
fcs_calc.h | 22 +-
fsk_demod_agc.h | 4 +-
fsk_demod_state.h | 527 +-
fsk_filters.h | 14 +-
fsk_gen_filter.h | 28 +-
gen_packets.c | 1565 ++--
gen_tone.c | 971 ++-
gen_tone.h | 33 +-
direwolf.txt => generic.conf | 1105 +--
geotranz/README-FIRST.txt | 10 +-
geotranz/error_string.c | 262 +-
geotranz/error_string.h | 14 +-
geotranz/mgrs.c | 2694 +++---
geotranz/mgrs.h | 506 +-
geotranz/polarst.c | 1046 +--
geotranz/polarst.h | 404 +-
geotranz/readme.txt | 82 +-
geotranz/releasenotes.txt | 930 +-
geotranz/tranmerc.c | 1236 +--
geotranz/tranmerc.h | 418 +-
geotranz/ups.c | 604 +-
geotranz/ups.h | 350 +-
geotranz/usng.c | 2512 +++---
geotranz/usng.h | 504 +-
geotranz/utm.c | 708 +-
geotranz/utm.h | 356 +-
grm_sym.h | 1002 +--
hdlc_rec.c | 1297 +--
hdlc_rec.h | 55 +-
hdlc_rec2.c | 2360 +++--
hdlc_rec2.h | 145 +-
hdlc_send.c | 432 +-
hdlc_send.h | 20 +-
igate.c | 3608 ++++----
igate.h | 154 +-
kiss.c | 1924 ++---
kiss.h | 42 +-
kiss_frame.c | 1332 +--
kiss_frame.h | 106 +-
kissnet.c | 1375 +--
kissnet.h | 42 +-
latlong.c | 1583 ++--
latlong.h | 46 +-
ll2utm.c | 226 +-
log.c | 738 +-
log.h | 32 +-
log2gpx.c | 1084 +--
man1/aclients.1 | 7 +-
man1/direwolf.1 | 16 +-
man1/gen_packets.1 | 8 +-
mgn_icon.h | 534 +-
misc/README-dire-wolf.txt | 43 +-
misc/strcasestr.c | 128 +-
misc/strlcat.c | 127 +
misc/strlcpy.c | 119 +
misc/strsep.c | 44 +-
misc/strtok_r.c | 204 +-
morse.c | 924 +-
morse.h | 8 +
multi_modem.c | 1333 ++-
multi_modem.h | 39 +-
nmea.c | 1502 +---
nmea.h | 38 +-
pfilter.c | 2210 ++---
pfilter.h | 6 +-
ptt.c | 2233 ++---
ptt.h | 51 +-
rdq.c | 748 +-
rdq.h | 56 +-
recv.c | 655 +-
recv.h | 10 +-
redecode.c | 507 +-
redecode.h | 30 +-
regex/COPYING | 0
regex/COPYING.LIB | 510 --
regex/INSTALL | 0
regex/LICENSES | 0
regex/NEWS | 0
regex/README | 0
regex/README-dire-wolf.txt | 12 +-
regex/re_comp.h | 0
regex/regcomp.c | 0
regex/regex.c | 0
regex/regex.h | 0
regex/regex_internal.c | 0
regex/regex_internal.h | 0
regex/regexec.c | 0
rpack.h | 188 +-
rrbb.c | 1055 ++-
rrbb.h | 182 +-
sdr.conf | 30 +
search_sdks.sh | 109 +
serial_port.c | 451 +
serial_port.h | 27 +
server.c | 3262 +++----
server.h | 41 +-
symbols-new.txt | 946 +-
symbols.c | 1964 +++--
symbols.h | 33 +-
symbolsX.txt | 771 +-
telemetry-toolkit/telem-balloon.conf | 55 +
telemetry-toolkit/telem-balloon.pl | 43 +
telemetry-toolkit/telem-bits.pl | 33 +
telemetry-toolkit/telem-data.pl | 31 +
telemetry-toolkit/telem-data91.pl | 65 +
telemetry-toolkit/telem-eqns.pl | 28 +
telemetry-toolkit/telem-m0xer-3.txt | 7 +
telemetry-toolkit/telem-parm.pl | 27 +
telemetry-toolkit/telem-seq.sh | 7 +
telemetry-toolkit/telem-unit.pl | 27 +
telemetry-toolkit/telem-volts.conf | 28 +
telemetry-toolkit/telem-volts.py | 36 +
telemetry.c | 2460 +++---
telemetry.h | 30 +-
textcolor.c | 775 +-
textcolor.h | 116 +-
tocalls.txt | 442 +-
tq.c | 1118 +--
tq.h | 70 +-
tt_text.c | 2958 ++++---
tt_text.h | 63 +-
tt_user.c | 2016 +++--
tt_user.h | 27 +-
ttcalc.c | 1089 +--
utm2ll.c | 288 +-
version.h | 16 +-
walk96.c | 205 +
xid.c | 1018 +--
xmit.c | 2054 ++---
xmit.h | 50 +-
237 files changed, 70943 insertions(+), 61665 deletions(-)
diff --cc debian/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.docx
index 0000000,0000000..221a645
new file mode 100644
Binary files differ
diff --cc debian/APRS-Telemetry-Toolkit.docx
index 0000000,0000000..ccf0971
new file mode 100644
Binary files differ
diff --cc debian/APRStt-Implementation-Notes.docx
index 8ece1f8,0000000..377da99
mode 100644,000000..100644
Binary files differ
diff --cc debian/APRStt-Listening-Example.docx
index 0000000,0000000..7600f09
new file mode 100644
Binary files differ
diff --cc debian/APRStt-interface-for-SARTrack.docx
index 0000000,0000000..e268c9a
new file mode 100644
Binary files differ
diff --cc debian/Raspberry-Pi-APRS-Tracker.docx
index 452eee8,0000000..c0961f6
mode 100644,000000..100644
Binary files differ
diff --cc debian/Raspberry-Pi-APRS.docx
index ebe7f53,0000000..a4a4416
mode 100644,000000..100644
Binary files differ
diff --cc debian/Raspberry-Pi-SDR-IGate.docx
index 0000000,0000000..557dadf
new file mode 100644
Binary files differ
diff --cc debian/User-Guide.docx
index 08f3114,0000000..4253982
mode 100644,000000..100644
Binary files differ
diff --cc debian/WA8LMF-TNC-Test-CD-Results.docx
index 0000000,0000000..d1da23c
new file mode 100644
Binary files differ
diff --cc debian/changelog
index 730bd59,0000000..b089266
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,85 -1,0 +1,112 @@@
++direwolf (1.3-1) unstable; urgency=medium
++
++ * New upstream version
++ * Updated watch file to use GitHub releases
++ * debian/patches:
++ - Removed libgps22.patch (fixed upstream)
++ - Removed enable_gps.patch (fixed upstream)
++ - Removed fix_start_script_paths.patch (fixed upstream)
++ - Refreshed fix_spelling.patch (de-fuzz; submitted upstream)
++ - Refreshed fix_hardening-no-relro.patch (de-fuzz; submitted upstream)
++ - Refreshed fix_documentation_path.patch (de-fuzz)
++ * debian/source/include-binaries:
++ - New Word document sources added for the PDF documentation:
++ + debian/APRStt-Listening-Example.docx
++ + debian/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.docx
++ + debian/APRS-Telemetry-Toolkit.docx
++ + debian/APRStt-interface-for-SARTrack.docx
++ + debian/Raspberry-Pi-SDR-IGate.docx
++ * debian/control:
++ - Updated Homepage
++ - Updated Vcs-* URIs to secure versions
++ * debian/rules:
++ - Enable all hardening options in the build
++ - Remove gen_fff and direwolf.conf in clean target (Closes: #819384)
++
++ -- Iain R. Learmonth <irl at debian.org> Tue, 05 Jul 2016 22:14:07 +0100
++
+direwolf (1.2-3) unstable; urgency=medium
+
+ * Allow for building only architecture-independent packages (Closes: #806015)
+ - Thanks Santiago Vila!
+
+ -- Iain R. Learmonth <irl at debian.org> Fri, 08 Apr 2016 21:40:24 +0100
+
+direwolf (1.2-2) unstable; urgency=medium
+
+ * Allow building with gpsd API major version 6 (Closes: #803686)
+ - Thanks Bas Couwenberg!
+ * debian/control:
+ - Updated my email address in uploaders.
+
+ -- Iain R. Learmonth <irl at debian.org> Mon, 02 Nov 2015 14:15:36 +0000
+
+direwolf (1.2-1) unstable; urgency=medium
+
+ * Update to new upstream version 1.2.
+ * Microsoft Word sources for PDF files:
+ - Added:
+ * A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.docx
+ * A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.docx
+ - Updated:
+ * APRStt-Implementation-Notes.docx
+ * Raspberry-Pi-APRS-Tracker.docx
+ * Raspberry-Pi-APRS.docx
+ * User-Guide.docx
+ - Removed:
+ * Quick-Start-Guide-Windows.docx
+ * debian/source/include-binaries:
+ - Allowed inclusion of new Microsoft Word sources and removed the removed
+ source.
+ * man pages:
+ - Dire Wolf now ships with its own man pages, using the upstream man pages
+ instead of the man pages created for Debian.
+ * debian/rules:
+ - Installation is now performed using dh instead of using the Makefile
+ * debian/direwolf-docs.doc-base:
+ - PDFs are now installed under the direwolf-docs doc directory
+ * debian/direwolf.examples:
+ - Installs the example direwolf.conf
+ * Refreshed patches:
+ - fix_documentation_path.patch (de-fuzz)
+ - enable_gps.patch (de-fuzz)
+ - fix_hardening-no-relro.patch (now adding LDFLAGS to CFLAGS instead of
+ passing LDFLAGS on every CC call)
+ - fix_spelling.patch (multiple new spelling fixes)
+ * debian/copyright:
+ - Dire Wolf now includes some code copied from geotranz
+
+ -- Iain R. Learmonth <irl at fsfe.org> Sat, 13 Jun 2015 19:58:02 +0100
+
+direwolf (1.1-2) unstable; urgency=medium
+
+ * Added a Breaks+Replaces as files have moved between packages. (Closes:
+ #777674)
+
+ -- Iain R. Learmonth <irl at fsfe.org> Wed, 11 Feb 2015 14:52:06 +0000
+
+direwolf (1.1-1) unstable; urgency=medium
+
+ * Update to new upstream version 1.1.
+
+ -- Iain R. Learmonth <irl at fsfe.org> Thu, 05 Feb 2015 00:32:28 +0000
+
+direwolf (1.0-3) unstable; urgency=medium
+
+ * Changes architecture for direwolf from linux-any to a whitelist of
+ little-endian architectures. (Closes: #774389)
+
+ -- Iain R. Learmonth <irl at fsfe.org> Tue, 20 Jan 2015 05:32:05 +0000
+
+direwolf (1.0-2) unstable; urgency=medium
+
+ * No longer install the ll2utm or utm2ll binaries or man pages. (Closes:
+ #768223)
+
+ -- Iain R. Learmonth <irl at fsfe.org> Fri, 07 Nov 2014 13:40:27 +0000
+
+direwolf (1.0-1) unstable; urgency=medium
+
+ * Initial release. (Closes: #759639)
+
+ -- Iain R. Learmonth <irl at fsfe.org> Sat, 11 Oct 2014 18:54:51 +0100
diff --cc debian/control
index d218501,0000000..b96ab68
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,39 -1,0 +1,43 @@@
+Source: direwolf
- Section: hamradio
- Priority: optional
+Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
+Uploaders: Iain R. Learmonth <irl at debian.org>
- 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
- Homepage: http://home.comcast.net/~wb2osz/site/
++Section: hamradio
++Priority: optional
++Build-Depends: debhelper (>= 9),
++ libasound2-dev,
++ libgps-dev
++Standards-Version: 3.9.8
++Vcs-Browser: https://anonscm.debian.org/cgit/pkg-hamradio/direwolf.git/
++Vcs-Git: https://anonscm.debian.org/git/pkg-hamradio/direwolf.git
++Homepage: https://github.com/wb2osz/direwolf
+
+Package: direwolf
+Architecture: alpha amd64 arm64 armel armhf i386 mipsel ppc64el sh4 x32
- Depends: ${shlibs:Depends}, ${misc:Depends}, direwolf-docs
++Depends: ${shlibs:Depends},
++ ${misc:Depends},
++ direwolf-docs
+Suggests: gpsd
+Breaks: direwolf-docs (<< 1.1-1)
+Replaces: direwolf-docs (<< 1.1-1)
+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,
+ or Internet Gateway (IGate). It can also be used as a virtual TNC for other
+ applications such as APRSIS32, UI-View32, Xastir, APRS-TW, YAAC, UISS, Linux
+ AX25, SARTrack, and many others.
+
+Package: direwolf-docs
+Architecture: all
+Section: doc
- Depends: ${shlibs:Depends}, ${misc:Depends}
++Depends: ${shlibs:Depends},
++ ${misc:Depends}
+Breaks: direwolf (<< 1.1-1)
+Replaces: direwolf (<< 1.1-1)
+Description: Soundcard TNC for APRS - Documentation
+ 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,
+ or Internet Gateway (IGate). It can also be used as a virtual TNC for other
+ applications such as APRSIS32, UI-View32, Xastir, APRS-TW, YAAC, UISS, Linux
+ AX25, SARTrack, and many others.
+ .
+ This package contains architecture independent documentation for direwolf.
-
diff --cc debian/direwolf-docs.docs
index b403184,0000000..4f0fd2e
mode 100644,000000..100644
--- a/debian/direwolf-docs.docs
+++ b/debian/direwolf-docs.docs
@@@ -1,6 -1,0 +1,12 @@@
- User-Guide.pdf
- Raspberry-Pi-APRS.pdf
- Raspberry-Pi-APRS-Tracker.pdf
- APRStt-Implementation-Notes.pdf
- A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
- A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
++doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
++doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
++doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf
++doc/APRS-Telemetry-Toolkit.pdf
++doc/APRStt-Implementation-Notes.pdf
++doc/APRStt-interface-for-SARTrack.pdf
++doc/APRStt-Listening-Example.pdf
++doc/Raspberry-Pi-APRS.pdf
++doc/Raspberry-Pi-APRS-Tracker.pdf
++doc/Raspberry-Pi-SDR-IGate.pdf
++doc/User-Guide.pdf
++doc/WA8LMF-TNC-Test-CD-Results.pdf
diff --cc debian/patches/fix_documentation_path.patch
index d739b58,0000000..84da3aa
mode 100644,000000..100644
--- a/debian/patches/fix_documentation_path.patch
+++ b/debian/patches/fix_documentation_path.patch
@@@ -1,15 -1,0 +1,15 @@@
+Description: Correct all mentions of the documentation path in the source code
+Author: Iain R. Learmonth <irl at fsfe.org>
+Last-Update: 2014-09-08
+
- --- direwolf.orig/direwolf.c
- +++ direwolf/direwolf.c
- @@ -1034,7 +1034,7 @@
-
- #if __WIN32__
- #else
- - dw_printf ("Complete documentation can be found in /usr/local/share/doc/direwolf.\n");
- + dw_printf ("Complete documentation can be found in /usr/share/doc/direwolf.\n");
- #endif
- exit (EXIT_FAILURE);
- }
++--- a/direwolf.c
+++++ b/direwolf.c
++@@ -1103,7 +1103,7 @@
++
++ #if __WIN32__
++ #else
++- dw_printf ("Complete documentation can be found in /usr/local/share/doc/direwolf.\n");
+++ dw_printf ("Complete documentation can be found in /usr/share/doc/direwolf.\n");
++ #endif
++ exit (EXIT_FAILURE);
++ }
diff --cc debian/patches/fix_hardening-no-relro.patch
index 6eb82b8,0000000..0de47de
mode 100644,000000..100644
--- a/debian/patches/fix_hardening-no-relro.patch
+++ b/debian/patches/fix_hardening-no-relro.patch
@@@ -1,15 -1,0 +1,34 @@@
+Description: Do not override and ensure use of CFLAGS and LDFLAGS
+Author: Iain R. Learmonth <irl at fsfe.org>
+Last-Update: 2014-09-08
+
- --- direwolf.orig/Makefile.linux
- +++ direwolf/Makefile.linux
- @@ -10,7 +10,7 @@
++--- a/Makefile.linux
+++++ b/Makefile.linux
++@@ -12,9 +12,9 @@
+ @echo " "
+
+ CC := gcc
+-CFLAGS := -O3 -pthread -Igeotranz
- +CFLAGS += -O3 -pthread -Igeotranz $(LDFLAGS)
+++CFLAGS += -O3 -pthread -Igeotranz
+
++-LDFLAGS := -lm -lpthread -lrt
+++LDFLAGS += -lm -lpthread -lrt
+
- #
++
++
++@@ -338,13 +338,13 @@
++ # Multiple AGWPE network or serial port clients to test TNCs side by side.
++
++ aclients : aclients.c ax25_pad.c fcs_calc.c textcolor.o misc.a
++- $(CC) $(CFLAGS) -g -o $@ $^
+++ $(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
++
++
++ # Touch Tone to Speech sample application.
++
++ ttcalc : ttcalc.o ax25_pad.o fcs_calc.o textcolor.o misc.a
++- $(CC) $(CFLAGS) -g -o $@ $^
+++ $(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
++
++
++ # ----------------------------------------- Libraries --------------------------------------------
diff --cc debian/patches/fix_spelling.patch
index 92f8783,0000000..7381a07
mode 100644,000000..100644
--- a/debian/patches/fix_spelling.patch
+++ b/debian/patches/fix_spelling.patch
@@@ -1,139 -1,0 +1,138 @@@
+Description: Fix a few spelling mistakes
+Author: Iain R. Learmonth <irl at fsfe.org>
+Last-Update: 2015-02-05
+
- --- direwolf.orig/config.c
- +++ direwolf/config.c
- @@ -3468,7 +3468,7 @@
- }
- else {
- text_color_set(DW_COLOR_ERROR);
- - dw_printf ("Config file, line %d: When any of ZONE, EASTING, NORTHING specifed, they must all be specified.\n", line);
- + dw_printf ("Config file, line %d: When any of ZONE, EASTING, NORTHING specified, they must all be specified.\n", line);
- }
- }
-
- --- direwolf.orig/decode_aprs.c
- +++ direwolf/decode_aprs.c
- @@ -1597,7 +1597,7 @@
- *
- * Outputs: ??? TBD
- *
- - * Description: An APRS message is a text string with a specifed addressee.
- + * Description: An APRS message is a text string with a specified addressee.
- *
- * It's a lot more complicated with different types of addressees
- * and replies with acknowledgement or rejection.
- --- direwolf.orig/gen_packets.c
- +++ direwolf/gen_packets.c
- @@ -350,7 +350,7 @@
-
- if (strlen(output_file) == 0) {
- text_color_set(DW_COLOR_ERROR);
- - dw_printf ("ERROR: The -o ouput file option must be specified.\n");
- + dw_printf ("ERROR: The -o output file option must be specified.\n");
- usage (argv);
- exit (1);
- }
- --- direwolf.orig/man1/direwolf.1
- +++ direwolf/man1/direwolf.1
- @@ -119,13 +119,13 @@
++--- a/config.c
+++++ b/config.c
++@@ -4299,7 +4299,7 @@
++ }
++ else {
++ text_color_set(DW_COLOR_ERROR);
++- dw_printf ("Config file, line %d: When any of ZONE, EASTING, NORTHING specifed, they must all be specified.\n", line);
+++ dw_printf ("Config file, line %d: When any of ZONE, EASTING, NORTHING specified, they must all be specified.\n", line);
++ }
++ }
++
++--- a/man1/direwolf.1
+++++ b/man1/direwolf.1
++@@ -133,13 +133,13 @@
+ direwolf can listen over a UDP port with options like this:
+ .RS
+ .P
+-direwolf -n 1 -r 48000 -b 16 udp:7355
++direwolf \-n 1 \-r 48000 \-b 16 udp:7355
+ .RE
+ .P
+ Other SDR applications might produce audio on stdout so it is convenient to pipe into the next application. In this example, the final "-" means read from stdin.
+ .RS
+ .P
+-rtl_fm -f 144.39M -o 4 - | direwolf -n 1 -r 24000 -b 16 -
++rtl_fm \-f 144.39M \-o 4 \- | direwolf \-n 1 \-r 24000 \-b 16 \-
+ .RE
+
+
- --- direwolf.orig/man1/gen_packets.1
- +++ direwolf/man1/gen_packets.1
++--- a/man1/gen_packets.1
+++++ b/man1/gen_packets.1
+@@ -5,12 +5,12 @@
+
+
+ .SH SYNOPSIS
+-.B gen_packets -o
++.B gen_packets \-o
+ .I wav-file-out
+-[ \fIoptions\fR ] [ \fItext-file\fR | - ]
++[ \fIoptions\fR ] [ \fItext-file\fR | \- ]
+ .RS
+ .P
+-\fIwav-file-out\fR is the result. The -o option is required.
++\fIwav-file-out\fR is the result. The \-o option is required.
+ .P
+ \fItext-file\fR may contain AX.25 packets in the standard monitoring format. Use "-" to read from stdin. If not specified, a default builtin message will be used.
+ .RE
+@@ -25,7 +25,7 @@
+
+ .TP
+ .BI "-a " "n"
+-Signal amplitude in range of 0 - 200%. Default 50. Note that 100% is corresponds to signal peaks of +/- 16383 so we have plenty of headroom to avoid saturation.
++Signal amplitude in range of 0-200%. Default 50. Note that 100% is corresponds to signal peaks of +/- 16383 so we have plenty of headroom to avoid saturation.
+
+ .TP
+ .BI "-b " "n"
+@@ -70,7 +70,7 @@
+
+ .SH EXAMPLES
+ .P
+-.B gen_packets -o x.wav
++.B gen_packets \-o x.wav
+ .P
+ .RS
+ With all defaults, a built-in test message is generated
+@@ -78,27 +78,27 @@
+ VHF FM transceivers.
+ .RE
+ .P
+-.B gen_packets -o x.wav -g -b 9600
++.B gen_packets \-o x.wav \-g \-b 9600
+ .PD 0
+ .P
+ .PD
+-.B gen_packets -o x.wav -B 9600
++.B gen_packets \-o x.wav \-B 9600
+ .P
+ .RS
- -Both of these are equivalent. "-B 9600" automatically selects scrambled baseband rather than AFSK.
- +Both of these are equivalent. "\-B 9600" automatically selects scrambled baseband rather than AFSK.
++ Both of these are equivalent. "-B 9600" automatically selects scrambled baseband rather than AFSK.
+ .RE
+ .P
+-.B gen_packets -o x.wav -m 1600 -s 1800 -b 300
++.B gen_packets \-o x.wav \-m 1600 \-s 1800 \-b 300
+ .PD 0
+ .P
+ .PD
+-.B gen_packets -o x.wav -B 300
++.B gen_packets \-o x.wav \-B 300
+ .P
+ .RS
+ Both of these generate 200 Hz shift, 300 baud, suitable for HF SSB transceiver.
+ .RE
+ .P
- -.B echo -n "WB2OSZ>WORLD:Hello, world!" | gen_packets -a 25 -o x.wav -
- +.B echo \-n "WB2OSZ>WORLD:Hello, world!" | gen_packets \-a 25 \-o x.wav \-
++-.B echo -n 'WB2OSZ>WORLD:Hello, world!' | gen_packets -a 25 -o x.wav -
+++.B echo \-n 'WB2OSZ>WORLD:Hello, world!' | gen_packets \-a 25 \-o x.wav \-
++ .PD 0
+ .P
- .RS
- Read message from stdin and put quarter volume sound into the file x.wav.
- --- direwolf.orig/man1/decode_aprs.1
- +++ direwolf/man1/decode_aprs.1
++ .PD
++--- a/man1/decode_aprs.1
+++++ b/man1/decode_aprs.1
+@@ -46,9 +46,11 @@
+ cut-n-paste the bad packets into a text file. Here a couple examples:
+ .P
+ .RS
++.nf
+ n2cma>APRS,TCPIP*,qAC,SEVENTH:@212127z43.2333n/77.1w_338/002g001t025P000h65b10208.wview_5_19_0
+ .P
+ K0YTH-10>APNU3B,NULL,qAR,K0DMF-10:!4601.5NS09255.52W#PHG6360/W2,MNn 444.575
++.fi
+ .RE
+ .P
+ If you simply fed this into decode_aprs, it would complain about the
++--- a/decode_aprs.c
+++++ b/decode_aprs.c
++@@ -1417,7 +1417,7 @@
++ *
++ * Outputs: ??? TBD
++ *
++- * Description: An APRS message is a text string with a specifed addressee.
+++ * Description: An APRS message is a text string with a specified addressee.
++ *
++ * It's a lot more complicated with different types of addressees
++ * and replies with acknowledgement or rejection.
++--- a/gen_packets.c
+++++ b/gen_packets.c
++@@ -374,7 +374,7 @@
++
++ if (strlen(output_file) == 0) {
++ text_color_set(DW_COLOR_ERROR);
++- dw_printf ("ERROR: The -o ouput file option must be specified.\n");
+++ dw_printf ("ERROR: The -o output file option must be specified.\n");
++ usage (argv);
++ exit (1);
++ }
diff --cc debian/patches/series
index d2698fd,0000000..30f2595
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,3 @@@
- libgps22.patch
- fix_start_script_paths.patch
+fix_documentation_path.patch
+fix_hardening-no-relro.patch
- enable_gps.patch
+fix_spelling.patch
diff --cc debian/rules
index 8c7f85f,0000000..f4a1212
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,18 -1,0 +1,22 @@@
+#!/usr/bin/make -f
+
++export DEB_BUILD_MAINT_OPTIONS = hardening=+all
++
+%:
+ dh $@
+
+override_dh_auto_build:
+ make -f Makefile.linux
+
+override_dh_auto_install:
+ @echo "Skipping the install to /usr/local"
+
+override_dh_auto_clean:
+ make -f Makefile.linux clean
++ -rm gen_fff
++ -rm direwolf.conf
+
+override_dh_fixperms-arch:
+ dh_fixperms
+ chmod 644 debian/direwolf/usr/share/direwolf/dw-icon.png
+
diff --cc debian/source/include-binaries
index 9833b82,0000000..15a7103
mode 100644,000000..100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@@ -1,6 -1,0 +1,12 @@@
+debian/APRStt-Implementation-Notes.docx
+debian/Raspberry-Pi-APRS.docx
+debian/User-Guide.docx
+debian/Raspberry-Pi-APRS-Tracker.docx
+debian/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.docx
+debian/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.docx
++debian/WA8LMF-TNC-Test-CD-Results.docx
++debian/APRStt-Listening-Example.docx
++debian/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.docx
++debian/APRS-Telemetry-Toolkit.docx
++debian/APRStt-interface-for-SARTrack.docx
++debian/Raspberry-Pi-SDR-IGate.docx
diff --cc debian/watch
index 3176a15,0000000..ff545bc
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,4 -1,0 +1,2 @@@
+version=3
-
- http://home.comcast.net/~wb2osz/site/?/page/Download/ http://home.comcast.net/~wb2osz/.*/direwolf-([\d\.]+)-src.zip
-
++https://github.com/wb2osz/direwolf/releases .*/archive/v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
--
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