[hamradio-commits] [ax25-tools] 01/01: Formatting & rules updates
Dave Hibberd
hibby-guest at moszumanska.debian.org
Mon Oct 30 23:29:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
hibby-guest pushed a commit to branch master
in repository ax25-tools.
commit 3c434435171e1793047d717d274ad370bcb1dfa6
Author: hibby <d at vehibberd.com>
Date: Mon Oct 30 22:29:47 2017 +0000
Formatting & rules updates
---
debian/changelog | 13 +++---
debian/patches/01-spelling-fixes.patch | 77 ++++++++++++++++++++++++++++++++++
debian/patches/series | 2 +-
debian/rules | 3 ++
4 files changed, 89 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ba0522a..a0de5c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,14 @@ ax25-tools (0.0.10-rc4-2) UNRELEASED; urgency=medium
* Add patch 02-ptsname-prototype.patch to fix segfault at runtime
- Closes: #878322
* Adds standards 4.1.1 and dh compat 10
- * New debian/rules to enable hardening
- * New patch 03-string_literal.patch
- - Clears -Werrors errors due to passing string literals
-
- -- Dave Hibberd <d at vehibberd.com> Sun, 29 Oct 2017 22:45:00 +0000
+ - Updated debian/control
+ - Updated debian/compat
+ * Updated hardening
+ - Cleaned up debian/rules
+ - New patch 03-string_literal.patch
+ - Clears -Werrors errors due to passing string literals
+
+ -- Dave Hibberd <d at vehibberd.com> Mon, 30 Oct 2017 23:05:50 +0000
ax25-tools (0.0.10-rc4-1) unstable; urgency=medium
diff --git a/debian/patches/01-spelling-fixes.patch b/debian/patches/01-spelling-fixes.patch
index 02a2913..947e61f 100644
--- a/debian/patches/01-spelling-fixes.patch
+++ b/debian/patches/01-spelling-fixes.patch
@@ -1,5 +1,7 @@
Fix spelling errors
Author: colint at debian.org
+Author: Dave Hibberd <d at vehibberd.com>
+Last-Update: 2017-10-30
--- a/ax25/axgetput/axgetput.c
+++ b/ax25/axgetput/axgetput.c
@@ -12,6 +14,15 @@ Author: colint at debian.org
} else {
fprintf(stderr, " -b value is the blocksize (framelen) of the transmitted data\n");
fprintf(stderr, " default %d, which is a useful choice for ampr ax25.\n", BLOCKSIZ_DEFAULT);
+@@ -175,7 +175,7 @@
+ fprintf(stderr, " otherwise, the data will be read to memory until EOF.\n");
+ fprintf(stderr, " -s is only available if stdin is a pipe\n");
+ fprintf(stderr, " if filename specified in filter, the given name will be suggested instead.\n");
+- fprintf(stderr, " filename may be ommited if used as filter.\n");
++ fprintf(stderr, " filename may be omitted if used as filter.\n");
+ }
+ fputc('\n', stderr);
+ fprintf(stderr, "Tips: - compressed download:\n");
--- a/hdlcutil/sethdlc.8
+++ b/hdlcutil/sethdlc.8
@@ -94,7 +94,7 @@
@@ -145,6 +156,24 @@ Author: colint at debian.org
#BIN protocol.
.LP
+@@ -60,7 +60,7 @@
+ .B yget
+ or
+ .B yput
+-is reserverd for the yapp protocol, which is not supported in this version.
++is reserved for the yapp protocol, which is not supported in this version.
+
+ .LP
+ .B II. DIDADIT Protocol
+@@ -68,7 +68,7 @@
+ .B rget
+ or
+ .B rput
+-is reserverd for the didadit protocol, which is not supported in this version.
++is reserved for the didadit protocol, which is not supported in this version.
+ .LP
+ Anyone like to implement yapp and didadit protcols?
+ .LP
--- a/rose/rsuplnk.8
+++ b/rose/rsuplnk.8
@@ -47,7 +47,7 @@
@@ -178,6 +207,21 @@ Author: colint at debian.org
write_ax25(buf, strlen(buf), 1);
sprintf(buf, " MD5 is recommended.\r");
write_ax25(buf, strlen(buf), 1);
+@@ -280,12 +280,12 @@
+ goto end;
+ }
+ if (!S_ISREG(statbuf.st_mode)) {
+- sprintf(buf, "Error: password file .%s should be a regular file. Skiping..\r", PWFILE);
++ sprintf(buf, "Error: password file .%s should be a regular file. Skipping..\r", PWFILE);
+ write_ax25(buf, strlen(buf), 1);
+ goto end;
+ }
+ if (statbuf.st_uid != 0 && statbuf.st_uid != pw->pw_uid) {
+- sprintf(buf, "Error: your password file .%s is not owned by you. Skiping..\r", PWFILE);
++ sprintf(buf, "Error: your password file .%s is not owned by you. Skipping..\r", PWFILE);
+ write_ax25(buf, strlen(buf), 1);
+ goto end;
+ }
--- a/tcpip/ttylinkd.c
+++ b/tcpip/ttylinkd.c
@@ -427,7 +427,7 @@
@@ -189,3 +233,36 @@ Author: colint at debian.org
close(skt);
close(ctl_skt);
return 0;
+--- a/ax25/ax25d.c
++++ b/ax25/ax25d.c
+@@ -1280,7 +1280,7 @@
+ AXL = axl_build; /* Assign our built list to AXL */
+
+ if (Logging)
+- syslog(LOG_INFO, "new config file loaded successfuly");
++ syslog(LOG_INFO, "new config file loaded successfully");
+
+ update_maxfd();
+ return 0;
+--- a/dmascc/dmascc_cfg.1
++++ b/dmascc/dmascc_cfg.1
+@@ -82,7 +82,7 @@
+ on to \fImilliseconds\fR. Maximum wait time is 2500 ms.
+ .TP 10
+ .BI "\-\-persist "\fIf\fR
+-Set the persistance parameter to \fIf\fR. Must be between 0 and 255
++Set the persistence parameter to \fIf\fR. Must be between 0 and 255
+ (inclusive).
+ .TP 10
+ .BI "\-\-dma "\fIchannel\fR
+--- a/tcpip/rip98d.c
++++ b/tcpip/rip98d.c
+@@ -199,7 +199,7 @@
+
+ if (network == 0 || network == 127) {
+ if (debug && logging)
+- syslog(LOG_DEBUG, "rejecting route to %s/%ld - should not be propogated\n", inet_ntoa(address), netmask);
++ syslog(LOG_DEBUG, "rejecting route to %s/%ld - should not be propagated\n", inet_ntoa(address), netmask);
+ continue;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 1d57312..9e01d39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-03-string_literal.patch
01-spelling-fixes.patch
02-ptsname-prototype.patch
+03-string_literal.patch
diff --git a/debian/rules b/debian/rules
index 9338f8b..cd8aaff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,6 @@ override_dh_installdirs:
mv debian/ax25-tools/usr/sbin/rsusers.sh debian/ax25-tools/usr/sbin/rsusers
dh_movefiles --sourcedir=debian/ax25-tools -pax25-xtools
+override_dh_installdocs:
+ dh_installdocs
+ rm debian/ax25-tools/usr/share/doc/ax25-tools/INSTALL
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/ax25-tools.git
More information about the pkg-hamradio-commits
mailing list