[hamradio-commits] [ampr-ripd] 04/07: More fixes

[Ana Custura]

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

ana.c-guest pushed a commit to branch master
in repository ampr-ripd.

commit a5fd887aca09e8cc64bc26f4337ff27781b60d36
Author: Ana C. Custura <ana at netstat.org.uk>
Date:   Fri Sep 23 13:26:17 2016 +0100

    More fixes
---
 debian/ampr-ripd.service |  4 ++--
 debian/copyright         |  2 ++
 debian/patches/man.diff  | 23 ++++++++++++++++++-----
 debian/rules             |  5 ++++-
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/debian/ampr-ripd.service b/debian/ampr-ripd.service
index 64f3be4..255df6f 100644
--- a/debian/ampr-ripd.service
+++ b/debian/ampr-ripd.service
@@ -1,9 +1,9 @@
 [Unit]
-Description= Amprnet routing daemon
+Description=Amprnet routing daemon
+Documentation=man:ampr-ripd(8)
 
 [Service]
 ExecStart=/usr/sbin/ampr-ripd -t 44 -i ampr0 -d
 
 [Install]
 WantedBy=multi-user.target
-
diff --git a/debian/copyright b/debian/copyright
index bab1a2c..30a4735 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,8 @@ License: GPL-2+
 Files: debian/*
 Copyright: 2016 Ana Custura <ana at netstat.org.uk>
 License: GPL-2+
+
+License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
diff --git a/debian/patches/man.diff b/debian/patches/man.diff
index 5c2ce61..116acdc 100644
--- a/debian/patches/man.diff
+++ b/debian/patches/man.diff
@@ -17,13 +17,26 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  .br
  .SH DESCRIPTION
  AMPRnet is a RIPv4 Listener and route injector daemon used with AMPRnet gateways.
-@@ -50,9 +50,6 @@
+@@ -48,10 +48,7 @@
+ \fB\-w\fR <window>
+ Sets the TCP window size to a given value (defaults to 840).
  This is needed since IP over AX.25 connections have small TCP window size.
- A value of 0 diables setting the window size (not recommended, default value should be ok)
- .TP
+-A value of 0 diables setting the window size (not recommended, default value should be ok)
+-.TP
 -\fB\-p\fR <password>
 -RIPv2 password, defaults to the current valid password. Use only if the password should ever change
--.TP
++A value of 0 disables setting the window size (not recommended, default value should be ok)
+ .TP
  \fB\-f\fR <interface>
  Interface for RIP forwarding, defaults to none/disabled
- .TP
+--- a/Makefile
++++ b/Makefile
+@@ -18,7 +18,7 @@
+ #
+ 
+ # Full debug including Netlink
+-#DOPT = -Wall -O2 -D HAVE_DEBUG -D NL_DEBUG
++DOPT = -Wall -O2 -D HAVE_DEBUG -D NL_DEBUG
+ 
+ # Full debug
+ #DOPT = -Wall -O2 -D HAVE_DEBUG
diff --git a/debian/rules b/debian/rules
index 965a9ce..4cfa4a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,11 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE = 1
-
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@ --with=systemd 
 
+override_dh_installinit:
+	dh_installinit --no-start --noscripts
+
 override_dh_auto_install:

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