From: Russ Allbery Date: Thu, 10 Jan 2013 04:26:07 +0000 (-0800) Subject: Put README in my current format, remove LICENSE X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0604f29a8a337e47f764ffd69650f5e5118e1b96;p=packages%2Fa%2Fafs-monitor.git Put README in my current format, remove LICENSE Include the licensing information in README and remove the now-redundant LICENSE file. --- diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 441dfda..0000000 --- a/LICENSE +++ /dev/null @@ -1,14 +0,0 @@ -The afs-monitor package is: - - Copyright 2003, 2004, 2005, 2006, 2010, 2011 The Board of Trustees of - the Leland Stanford Junior University. - -and released under the following license: - - These programs are free software; you may redistribute them and/or - modify them under the same terms as Perl itself. - -This means that you may choose between the two licenses that Perl is -released under: the GNU GPL (any version) and the Artistic License. -Please see your Perl distribution for the details and copies of the -licenses. diff --git a/Makefile b/Makefile index 721b33d..db1fcc2 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ DATE := $(shell grep '^afs-monitor' NEWS | head -1 | cut -d' ' -f 3) SCRIPTS := check_afs_quotas check_afs_space check_afs_bos check_afs_rxdebug \ check_afs_udebug -EXTRA := LICENSE NEWS README TODO +EXTRA := NEWS README TODO all: diff --git a/README b/README index 33718c3..6956aa0 100644 --- a/README +++ b/README @@ -3,10 +3,9 @@ Maintained by Russ Allbery - Copyright 2003, 2004, 2005, 2006, 2010, 2011 The Board of Trustees of - the Leland Stanford Junior University. These programs are free - software; you may redistribute them and/or modify them under the same - terms as Perl itself. + This program is free software; you may redistribute it and/or modify it + under the same terms as Perl itself. Please see the section LICENSE + below for more information. BLURB @@ -107,7 +106,7 @@ INSTALLATION your file server has a core file, you will want to modify the regex to not filter that out. -HOMEPAGE AND SOURCE REPOSITORY +SUPPORT The afs-monitor web page at: @@ -116,6 +115,13 @@ HOMEPAGE AND SOURCE REPOSITORY will always have the current version of this package, the current documentation, and pointers to any additional resources. + I welcome bug reports and patches for this package at rra@stanford.edu. + However, please be aware that I tend to be extremely busy and work + projects often take priority. I'll save your mail and get to it as soon + as I can, but it may take me a couple of months. + +SOURCE REPOSITORY + afs-monitor is maintained using Git. You can access the current source by cloning the repository at: @@ -124,3 +130,25 @@ HOMEPAGE AND SOURCE REPOSITORY or view the repository via the web at: http://git.eyrie.org/?p=afs/afs-monitor.git + + When contributing modifications, patches (possibly generated by + git-format-patch) are preferred to Git pull requests. + +LICENSE + + The afs-monitor distribution as a whole is covered by the following + copyright statement and license: + + Copyright 2003, 2004, 2005, 2006, 2010, 2011, 2013 + The Board of Trustees of the Leland Stanford Junior University + + This program is free software; you may redistribute it and/or modify + it under the same terms as Perl itself. This means that you may + choose between the two licenses that Perl is released under: the GNU + GPL and the Artistic License. Please see your Perl distribution for + the details and copies of the licenses. + + All individual files are released under this license or a license that + is compatible with it. Files that are released under a compatible + license will have that license noted at the start of the file. Some + files may have additional copyright holders as noted in those files.