[hamradio-commits] [axmail] 04/06: Refreshed patches, updated for new manpage additions

[Dave Hibberd]

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

hibby-guest pushed a commit to branch master
in repository axmail.

commit 7ce6e0e43c16d0b89c6188b2971ac17a42a7702f
Author: Hibby <d at vehibberd.com>
Date:   Tue Sep 6 21:01:35 2016 +0100

    Refreshed patches, updated for new manpage additions
---
 debian/changelog                    |  1 +
 debian/patches/hardening            |  8 ++++----
 debian/patches/install_dir_creation | 12 +++++++++---
 debian/patches/install_locations    | 18 +++++++++++++-----
 debian/patches/spelling             |  2 +-
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38f596f..47faed5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 axmail (2.5.1-1) UNRELEASED; urgency=medium
 
   * Imported new upstream release
+  * Refreshed Patches
 
  -- Dave Hibberd <d at vehibberd.com>  Tue, 06 Sep 2016 20:54:55 +0100
 
diff --git a/debian/patches/hardening b/debian/patches/hardening
index 2ec9618..5c58a62 100644
--- a/debian/patches/hardening
+++ b/debian/patches/hardening
@@ -1,11 +1,11 @@
 Description: Patch to ensure debhelper can apply appropriate CFLAGS, CPPFLAGS and LDFLAGS
 Author: Dave Hibberd <d at vehibberd.com>
-Last-Update: 2016-04-05
+Last-Update: 2016-09-06
 
 --- a/Makefile
 +++ b/Makefile
-@@ -2,12 +2,12 @@
- 
+@@ -3,12 +3,12 @@
+ MAN_DIR = /usr/local/share/man
  CC = gcc
  LD = gcc
 -CFLAGS = -O2 -Wstrict-prototypes -g -I../lib
@@ -17,5 +17,5 @@ Last-Update: 2016-04-05
 -	$(CC) $(CFLAGS) -c $<
 +	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $<
  
- upgrade: installbin installhelp
+ upgrade: installbin installhelp installman
  
diff --git a/debian/patches/install_dir_creation b/debian/patches/install_dir_creation
index ea33959..7755be4 100644
--- a/debian/patches/install_dir_creation
+++ b/debian/patches/install_dir_creation
@@ -1,11 +1,11 @@
 Description: Create folders for axmail install
 Author: Dave Hibberd <d at vehibberd.com>
-Last-Update: 2015-09-19
+Last-Update: 2016-09-06
 
 --- a/Makefile
 +++ b/Makefile
-@@ -14,14 +14,17 @@
- install: installbin installconf installhelp
+@@ -15,18 +15,23 @@
+ install: installbin installconf installhelp installman
  
  installbin: all
 +	install -m 0755	-D -d debian/axmail/usr/sbin
@@ -22,3 +22,9 @@ Last-Update: 2015-09-19
  	install -m 755    -o root -g root -d		  debian/axmail/var/lib/ax25/axmail/help
  	install -m 644    -o root -g root etc/help/*.hlp  debian/axmail/var/lib/ax25/axmail/help
  
+ installman:
++	install -m 755	-D -d $(MAN_DIR)/man8
++	install -m 755	-D -d $(MAN_DIR)/man5
+ 	install -m 644    -p man/axmail.8	$(MAN_DIR)/man8
+ 	install -m 644    -p man/axmail.conf.5	$(MAN_DIR)/man5
+ back:
diff --git a/debian/patches/install_locations b/debian/patches/install_locations
index 759b024..8340145 100644
--- a/debian/patches/install_locations
+++ b/debian/patches/install_locations
@@ -1,11 +1,19 @@
 Description: Update the folders in which axmail is installed
 Author: Dave Hibberd <d at vehibberd.com>
-Last-Update: 2015-09-19
+Last-Update: 2016-09-06
 
 --- a/Makefile
 +++ b/Makefile
-@@ -14,16 +14,16 @@
- install: installbin installconf installhelp
+@@ -1,6 +1,6 @@
+ all: axmail
+ 
+-MAN_DIR = /usr/local/share/man
++MAN_DIR = debian/axmail/usr/local/share/man
+ CC = gcc
+ LD = gcc
+ # CFLAGS = -O2 -Wstrict-prototypes -g -I../lib
+@@ -15,16 +15,16 @@
+ install: installbin installconf installhelp installman
  
  installbin: all
 -	install -m 0755 -s -o root -g root axmail	 /usr/local/sbin
@@ -25,5 +33,5 @@ Last-Update: 2015-09-19
 +	install -m 755    -o root -g root -d		  debian/axmail/var/lib/ax25/axmail/help
 +	install -m 644    -o root -g root etc/help/*.hlp  debian/axmail/var/lib/ax25/axmail/help
  
- back:
- 	rm -f ../mail.tar.gz
+ installman:
+ 	install -m 644    -p man/axmail.8	$(MAN_DIR)/man8
diff --git a/debian/patches/spelling b/debian/patches/spelling
index 6f40c70..0d3f348 100644
--- a/debian/patches/spelling
+++ b/debian/patches/spelling
@@ -1,6 +1,6 @@
 Description: Fix spelling error in utils.c
 Author: Dave Hibberd <d at vehibberd.com>
-Last-Update: 2016-04-05 
+Last-Update: 2016-09-06 
 
 --- a/utils.c
 +++ b/utils.c

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