[hamradio-commits] [axmail] 03/04: Add quilt patch to fix install location, add gitignore for .pc

Sat Sep 19 21:39:37 UTC 2015

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

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

commit c34552c9e697fa3d70cec23244f5a7d4a6f91d77
Author: Dave Hibberd <d at vehibberd.com>
Date:   Sat Sep 19 16:39:54 2015 +0100

    Add quilt patch to fix install location, add gitignore for .pc
---
 .gitignore                          |  1 +
 debian/changelog                    |  2 +-
 debian/copyright                    | 33 +++++++++++++++++++++++++++------
 debian/patches/install_dir_creation | 24 ++++++++++++++++++++++++
 debian/patches/install_locations    | 29 +++++++++++++++++++++++++++++
 debian/patches/series               |  2 ++
 debian/rules                        |  1 +
 7 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..224e7f0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc/
diff --git a/debian/changelog b/debian/changelog
index 2c7283e..e0bafa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 axmail (2.5-1) UNRELEASED; urgency=medium
 
-  * Initial release. (Closes: #XXXXXX)
+  * Initial release. (Closes: #799482)
 
  -- Dave Hibberd <d at vehibberd.com>  Sat, 19 Sep 2015 16:05:55 +0100
diff --git a/debian/copyright b/debian/copyright
index c76e73d..31d0ae0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,32 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: <pkg>
-Source: <path_to_download>
+Upstream-Name: axmail
+Source: http://sourceforge.net/projects/axmail/files/latest/download
 
 Files: *
-Copyright: © 20xx-20yy <upstream>
-License: <license>
+Copyright: 
+	(C) 2005-2015 Brian Rogers (N1URO) <n1uro at n1uro.net>
+	(C) 1996-2005 Heikky Hannikainen (OH7LZB) <hessu at pspt.fi>
+License: GPL-2+
 
 Files: debian/*
-Copyright: © 2014 maintainername <maintainer at e.mail>
-License: <license>
+Copyright: (C) 2015 Dave Hibberd <d at vehibberd.com>
+License: GPL-2+
+
+License: GPL-2+
+ This program 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
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ .
+ The GPL License which applies to this package can be found on your Debian
+ system at /usr/share/common-licenses/GPL-2.
+
diff --git a/debian/patches/install_dir_creation b/debian/patches/install_dir_creation
new file mode 100644
index 0000000..ea33959
--- /dev/null
+++ b/debian/patches/install_dir_creation
@@ -0,0 +1,24 @@
+Description: Create folders for axmail install
+Author: Dave Hibberd <d at vehibberd.com>
+Last-Update: 2015-09-19
+
+--- a/Makefile
++++ b/Makefile
+@@ -14,14 +14,17 @@
+ install: installbin installconf installhelp
+ 
+ installbin: all
++	install -m 0755	-D -d debian/axmail/usr/sbin
+ 	install -m 0755 -s -o root -g root axmail	 debian/axmail/usr/sbin
+ 
+ installconf:
++	install -m 755	-D -d debian/axmail/etc/ax25
+ 	install -m 755    -o root -g root -d		debian/axmail/etc/ax25
+ 	install -m 644    -o root -g root etc/axmail.conf debian/axmail/etc/ax25
+ 	install -m 644    -o root -g root etc/welcome.txt debian/axmail/etc/ax25
+ 
+ installhelp:
++	install -m 755	-D -d debian/axmail/var/lib/ax25/axmail/help
+ 	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
+ 
diff --git a/debian/patches/install_locations b/debian/patches/install_locations
new file mode 100644
index 0000000..759b024
--- /dev/null
+++ b/debian/patches/install_locations
@@ -0,0 +1,29 @@
+Description: Update the folders in which axmail is installed
+Author: Dave Hibberd <d at vehibberd.com>
+Last-Update: 2015-09-19
+
+--- a/Makefile
++++ b/Makefile
+@@ -14,16 +14,16 @@
+ install: installbin installconf installhelp
+ 
+ installbin: all
+-	install -m 0755 -s -o root -g root axmail	 /usr/local/sbin
++	install -m 0755 -s -o root -g root axmail	 debian/axmail/usr/sbin
+ 
+ installconf:
+-	install -m 755    -o root -g root -d		/usr/local/etc/ax25
+-	install -m 644    -o root -g root etc/axmail.conf /usr/local/etc/ax25
+-	install -m 644    -o root -g root etc/welcome.txt /usr/local/etc/ax25
++	install -m 755    -o root -g root -d		debian/axmail/etc/ax25
++	install -m 644    -o root -g root etc/axmail.conf debian/axmail/etc/ax25
++	install -m 644    -o root -g root etc/welcome.txt debian/axmail/etc/ax25
+ 
+ installhelp:
+-	install -m 755    -o root -g root -d		  /usr/local/var/ax25/axmail/help
+-	install -m 644    -o root -g root etc/help/*.hlp  /usr/local/var/ax25/axmail/help
++	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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ef35b5d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+install_locations
+install_dir_creation
diff --git a/debian/rules b/debian/rules
index 74d8ebe..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,4 @@
+#!/usr/bin/make -f
 
 %:
 	dh $@

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

