[hamradio-commits] [aprsdigi] 01/06: Removed patches now included upstream and changelog updates
Iain Learmonth
irl-guest at moszumanska.debian.org
Sat Jul 4 18:56:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
irl-guest pushed a commit to branch master
in repository aprsdigi.
commit a105ee0760b58e3c702f4568702f97ffa5470437
Author: Iain R. Learmonth <irl at fsfe.org>
Date: Sat Jul 4 17:47:25 2015 +0100
Removed patches now included upstream and changelog updates
---
debian/changelog | 10 ++-
debian/patches/aprsd-title.patch | 27 --------
debian/patches/ax25-includes.patch | 75 --------------------
debian/patches/man-fix.patch | 137 -------------------------------------
debian/patches/series | 4 --
debian/patches/spelling-fix.patch | 22 ------
6 files changed, 9 insertions(+), 266 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3c5e36f..892524b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
-aprsdigi (3.10.0) UNRELEASED; urgency=medium
+aprsdigi (3.10.0-1) UNRELEASED; urgency=medium
* New Upstream Version
+ * debian/watch:
+ - Updated to use the new GitHub location as project has moved from
+ SourceForge.
+ * Removed patches now included upstream:
+ - aprsd-title.patch
+ - ax25-includes.patch
+ - man-fix.patch
+ - spelling-fix.patch
-- Iain R. Learmonth <irl at fsfe.org> Sat, 04 Jul 2015 17:32:58 +0100
diff --git a/debian/patches/aprsd-title.patch b/debian/patches/aprsd-title.patch
deleted file mode 100644
index 84d362e..0000000
--- a/debian/patches/aprsd-title.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix problem with non sensible title strings
-Author: Iain g7iii at g7iii.net
---- a/aprsmon.c
-+++ b/aprsmon.c
-@@ -186,6 +186,7 @@
- uname(&me);
- printf("aprsmon>JAVA:javaMSG :Linux APRS server (%s-%s by Alan Crosswell, N2YGK) on %s running %s %s\r\n",
- PACKAGE, VERSION, me.nodename, me.sysname, me.release);
-+ printf("# %s\r\n",title);
- #ifdef USE_SHM
- (void) shm_slave(stdout,infofile);
- #endif
---- a/aprsmon.8
-+++ b/aprsmon.8
-@@ -55,7 +55,11 @@
- .BI "-t title"
- Sets the
- .I javAPRS
--title string. Default is "Live data from Linux."
-+or
-+.I aprsd
-+title string. Default is "Live data from Linux." For use with aprsd the
-+format must be something like "aprsmon v2.4.4 padd padb." pada and padb
-+can be anything, and are ignored but you *must* have 4 words in all.
- .TP 10
- .BI "-i infofile"
- .I Infofile
diff --git a/debian/patches/ax25-includes.patch b/debian/patches/ax25-includes.patch
deleted file mode 100644
index 3a5e1f5..0000000
--- a/debian/patches/ax25-includes.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Fix ax25 header file include problems
---- a/aprsdigi.c
-+++ b/aprsdigi.c
-@@ -55,9 +55,7 @@
- #include <time.h>
- #include <signal.h>
- #include <errno.h>
--#include <netax25/ax25.h>
--#include <netax25/axlib.h>
--#include <netax25/axconfig.h>
-+#include <linux/ax25.h>
- #ifndef AX25_MTU
- #define AX25_MTU 256
- #endif
---- a/libax25ext.c
-+++ b/libax25ext.c
-@@ -9,7 +9,6 @@
-
- #include <netax25/ax25.h>
- #include <netrose/rose.h>
--#include <netax25/axlib.h>
- #include "libax25ext.h"
- #include <string.h>
-
---- a/aprsmon.c
-+++ b/aprsmon.c
-@@ -61,9 +61,7 @@
- #include <time.h>
- #include <signal.h>
-
--#include <netax25/ax25.h>
--#include <netax25/axlib.h>
--#include <netax25/axconfig.h>
-+#include <linux/ax25.h>
-
- #ifndef HAVE_LIBAX25_EXTENSIONS
- #include "libax25ext.h"
---- a/aprsshm.c
-+++ b/aprsshm.c
-@@ -44,9 +44,6 @@
- #include <ctype.h>
- #include <time.h>
-
--#include <netax25/ax25.h>
--
--#include <netax25/axconfig.h>
- #include "aprsshm.h"
-
- #define MAXPPM 10
---- a/testmcast.c
-+++ b/testmcast.c
-@@ -16,9 +16,7 @@
- #include <time.h>
- #include <signal.h>
- #include <errno.h>
--#include <netax25/ax25.h>
--#include <netax25/axlib.h>
--#include <netax25/axconfig.h>
-+#include <linux/ax25.h>
- #ifndef AX25_MTU
- #define AX25_MTU 256
- #endif
---- a/testparse.c
-+++ b/testparse.c
-@@ -16,9 +16,7 @@
- #include <time.h>
- #include <signal.h>
- #include <errno.h>
--#include <netax25/ax25.h>
--#include <netax25/axlib.h>
--#include <netax25/axconfig.h>
-+#include <linux/ax25.h>
- #include <netdb.h>
- #include "libax25ext.h"
- static void print_it(FILE *f,
diff --git a/debian/patches/man-fix.patch b/debian/patches/man-fix.patch
deleted file mode 100644
index 3b68994..0000000
--- a/debian/patches/man-fix.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Fix minor errors in man page formatting.
-Author: Colin colint at debian.org
---- a/aprsmon.8
-+++ b/aprsmon.8
-@@ -11,7 +11,7 @@
- listen(1).
- .LP
- .B Aprsmon
--collects (-m)
-+collects (\-m)
- or displays standard AX.25 UI text frames in a format similar
- to that output by a standard TNC in "Monitor ON" mode and is intended
- to be used with programs like javAPRS which wish to see a TNC data
-@@ -69,7 +69,7 @@
- this.
- .sp
- .nf
--aprsmon -a -m&
-+aprsmon \-a \-m&
- .fi
- .sp
- Add an entry into /etc/services with the port number you
-@@ -82,7 +82,7 @@
- Add an entry into /etc/inetd.conf for this service:
- .sp
- .nf
--aprs stream tcp nowait root /usr/sbin/aprsmon aprsmon -a
-+aprs stream tcp nowait root /usr/sbin/aprsmon aprsmon \-a
- .fi
- .sp
- To test, simply "telnet localhost aprs". To use with javAPRS,
-@@ -140,7 +140,7 @@
- E - TAPR Mic-Encoder
- T - Kenwood TH-D7
- .fi
--.RP
-+.sp
- .TP 10
- .BI m
- is the status message number, and
-@@ -158,7 +158,7 @@
- 6 - PRIORITY..
- 7 - EMERGENCY.
- .fi
--.RP
-+.sp
- .TP 10
- .BI aaa,bbb,ccc,ddd,eee,fff
- are the values of the telemetry channels.
---- a/aprsdigi.8
-+++ b/aprsdigi.8
-@@ -80,7 +80,7 @@
- .TP 10
- .BI "\-D \--kill_dupes"
- Suppress Duplicate packets. Remembers
--duplicate packets for the number of seconds given by the -k option and
-+duplicate packets for the number of seconds given by the \-k option and
- will not repeat them more than once. This reduces conjestion caused
- when several digipeaters that share a common flooding alias (e.g. WIDE)
- have overlapping footprints, causing geometric duplication
-@@ -107,11 +107,11 @@
- .TP 10
- .BI "\-f \--flood"
- Set flooding alias. Use \(lq-f WIDE\(rq to enable WIDEn-n flooding.
--Use -f multiple times to define several flooding aliases.
-+Use \-f multiple times to define several flooding aliases.
- .TP 10
- .BI "\-F \--trace"
- Set flooding trace callsign. Use \(lq-F TRACE\(rq to enable TRACE and
--TRACEn-n flooding. Use -F multiple times to define several trace aliases.
-+TRACEn-n flooding. Use \-F multiple times to define several trace aliases.
- .TP 10
- .BI "\-k \--keep secs"
- Remember old packets for this long for duplicate packet detection.
-@@ -437,37 +437,37 @@
- all the features. Comments to the right describe each feature.
- .nf
- aprsdigi \\
-- --verbose \\ # verbose
-- --north "N2YGK-2 WB2ZII WA2YSM-14" \\ # North digi path
-- --south "N2YGK-3 WB2ZII WA2JNF-4" \\ # South ...
-- --east "N2YGK-3 WB2ZII KD1LY" \\ # East ...
-- --west "N2YGK-2 WB2ZII N2MH-15" \\ # West ...
-- --flood "WIDE" \\ # WIDEn-n flooding
-- --trace "TRACE" \\ # TRACEn-n tracing
-- --kill_dupes \\ # kill dupes
-- --kill_loops \\ # kill loops
-- --mice_xlate \\ # do Mic-E translation
-- --subst_mycall \\ # do callsign substituton
-- --tag " via 147.06 (WB2ZII/R)" \\ # add this tag to rec'd pkts
-- --nobud "ax25:NOCALL" \\ # ignore pkts from NOCALL
-- --dupe udp:233.0.14.100 \\ # dupe everything heard
-- --int ax25:sm0:RELAY,WIDE,TRACE \\ # ax25 soundmodem intf
-- --nomice_xlate \\ # turn off Mic-E translation
-- --x1j4_xlate \\ # do X1J4 translation
-- --nosubst_mycall \\ # turn off callsign subst.
-- --tag - \\ # clear the tag
-- --int ax25:ax0:RELAY,WIDE,FOO,TRACE \\ # ax25 ax0 intf.
-- --bud - \\ # clear the budlist
-- --bud ip:128.59.39.150/32 \\ # allow only from this IP host
-- --int udp:233.0.14.99/12345/16:N2YGK-4,RELAY,WIDE,TRACE \\ # multicast
-- --int udp:233.0.14.100/12345/16:N2YGK-5 # to this mcast group
-+ \-\-verbose \\ # verbose
-+ \-\-north "N2YGK-2 WB2ZII WA2YSM-14" \\ # North digi path
-+ \-\-south "N2YGK-3 WB2ZII WA2JNF-4" \\ # South ...
-+ \-\-east "N2YGK-3 WB2ZII KD1LY" \\ # East ...
-+ \-\-west "N2YGK-2 WB2ZII N2MH-15" \\ # West ...
-+ \-\-flood "WIDE" \\ # WIDEn-n flooding
-+ \-\-trace "TRACE" \\ # TRACEn-n tracing
-+ \-\-kill_dupes \\ # kill dupes
-+ \-\-kill_loops \\ # kill loops
-+ \-\-mice_xlate \\ # do Mic-E translation
-+ \-\-subst_mycall \\ # do callsign substituton
-+ \-\-tag " via 147.06 (WB2ZII/R)" \\ # add this tag to rec'd pkts
-+ \-\-nobud "ax25:NOCALL" \\ # ignore pkts from NOCALL
-+ \-\-dupe udp:233.0.14.100 \\ # dupe everything heard
-+ \-\-int ax25:sm0:RELAY,WIDE,TRACE \\ # ax25 soundmodem intf
-+ \-\-nomice_xlate \\ # turn off Mic-E translation
-+ \-\-x1j4_xlate \\ # do X1J4 translation
-+ \-\-nosubst_mycall \\ # turn off callsign subst.
-+ \-\-tag - \\ # clear the tag
-+ \-\-int ax25:ax0:RELAY,WIDE,FOO,TRACE \\ # ax25 ax0 intf.
-+ \-\-bud - \\ # clear the budlist
-+ \-\-bud ip:128.59.39.150/32 \\ # allow only from this IP host
-+ \-\-int udp:233.0.14.99/12345/16:N2YGK-4,RELAY,WIDE,TRACE \\ # multicast
-+ \-\-int udp:233.0.14.100/12345/16:N2YGK-5 # to this mcast group
-
- opening UDP socket on 233.0.14.99/12345/16
- UDP address info: family 2 type 2 proto 17 next 0x0
- Linux APRS(tm) digipeater
- Copyright (c) 1996,1997,1999,2001,2002,2003 Alan Crosswell, n2ygk at weca.org
- Version: aprsdigi aprsdigi-2.4.3
--This is free software covered under the GNU Public License.
-+This is free software covered under the GNU General Public License.
- There is no warranty. See the file COPYING for details.
-
- # configuration:
diff --git a/debian/patches/series b/debian/patches/series
index 36bfab7..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +0,0 @@
-ax25-includes.patch
-man-fix.patch
-aprsd-title.patch
-spelling-fix.patch
diff --git a/debian/patches/spelling-fix.patch b/debian/patches/spelling-fix.patch
deleted file mode 100644
index 003fba4..0000000
--- a/debian/patches/spelling-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix spelling errors
-Author Colin colint at debian.org
---- a/aprsdigi.c
-+++ b/aprsdigi.c
-@@ -1697,7 +1697,7 @@
- fprintf(stderr," -0 | --no3rdparty -- perform transparent tunneling (default)\n");
- fprintf(stderr," -o r (R) | --[no]rx -- do (not) mark interface receive-only\n");
- fprintf(stderr," -o t (T) | --[no]tx -- do (not) mark interface transmit-only\n");
-- fprintf(stderr," -o s (S) | --[no]txsame -- do (not) supress retransmission on RX intf.\n");
-+ fprintf(stderr," -o s (S) | --[no]txsame -- do (not) suppress retransmission on RX intf.\n");
- fprintf(stderr," -i | --idinterval -- seconds between ID transmissions\n");
- fprintf(stderr," (Use \"-i 0\" to disable IDs)\n");
- fprintf(stderr," -t | --tag -- tag text to add to received packets\n");
-@@ -2077,7 +2077,7 @@
-
- printf("Linux APRS(tm) digipeater\n%s\n",copyr);
- printf("Version: aprsdigi %s-%s\n",PACKAGE,VERSION);
-- printf("This is free software covered under the GNU Public License.\n");
-+ printf("This is free software covered under the GNU General Public License.\n");
- printf("There is no warranty. See the file COPYING for details.\n\n");
-
- config_print(stdout);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/aprsdigi.git
More information about the pkg-hamradio-commits
mailing list