Improve the history of individual contributions and repositories

The source code has been through a rather complicated journey, and
it's occasionally useful to understand this history from CVS to a
private Subversion repository to its current location in git.  So
document this more thoroughly, and ensure that everyone involved
is in the THANKS file.

3 files changed, 67 insertions, 21 deletions

diff --git a/AUTHORS b/AUTHORS
index aae08e0..58d7ad1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,23 +1,36 @@
-Stow was written by Bob Glickstein <bobg+stow@zanshin.com>, Zanshin
-Software, Inc.
+Stow was originally written by Bob Glickstein <bobg+stow@zanshin.com>,
+Zanshin Software, Inc.
 
-Contributions from Gord Matzigkeit <gord@enci.ucalgary.ca>.
+Gord Matzigkeit <gord@enci.ucalgary.ca> made some early contributions.
 
 John Bazik wrote `fastcwd', the Perl subroutine for computing the
-current working directory.
+current working directory (later removed in 1.3.3).
 
 Charles Briscoe-Smith <cpbs@debian.org> wrote the fix to prevent
-stow -D / stow -R removing initially-empty directories.
+stow -D / stow -R removing initially-empty directories (mentioned
+in 1.3.3 section of NEWS).
 
-Adam Lackorzynski <al10@inf.tu-dresden.de> wrote the fix to prevente
+Adam Lackorzynski <al10@inf.tu-dresden.de> wrote the fix to prevent
 the generation of wrong links if there are links in the stow directory.
 
-Stow was maintained by Guillaume Morin <gmorin@gnu.org> up to November 2007.
+Stow was maintained by Guillaume Morin <gmorin@gnu.org> up to November
+2007.  Guillaume originally imported the source code into the Savannah
+CVS repository on 2001/12/24 with the tag "v1_3_2".  This history was
+later imported into git as described below.
 
-Kahlil (Kal) Hodgson <kahlil@internode.on.net> performed a major rewrite
-in order to implement:
+1.3.3 was the last release of the 1.x series.  The CVS history
+contains a few commits after 1.3.3 preparing for a 1.3.4 release which
+was never published (see the "import-cvs" tag in git).
 
-    1. defered operations,
+Between 2007 and 2009, a small team of people collaborated on a
+private in-house project on Stow:
+
+    https://lists.gnu.org/archive/html/stow-devel/2011-11/msg00003.html
+
+Kahlil (Kal) Hodgson <kahlil@internode.on.net> performed a major
+rewrite in order to implement:
+
+    1. deferred operations,
     2. option parsing via Getopt::Long,
     3. options to support shared files,
     4. support for multiple operations per invocation,
@@ -25,16 +38,38 @@ in order to implement:
     6. better cooperation between multiple stow directories,
     7. a test suite (and support code) to ensure that everything still works.
 
-As these changes required a dramatic reorganisation of the code, very little
-was left untouched, and so Stow's major version was bumped up to version 2.
+As these changes required a dramatic reorganisation of the code, very
+little was left untouched, and so Stow's major version number was
+bumped up to 2.  Austin Wood <austin.wood@rmit.edu.au> and Chris
+Hoobin <christopher.hoobin@rmit.edu.au> helped clean up the
+documentation for the new 2.x.y series, and created the texi2man
+script.
+
+Kahlil obtained permission to donate these changes back to GNU.  The
+Subversion history from this period is no longer accessible, so the
+breakdown of the individual changes to the source code between 1.3.3
+and the unreleased 2.0.2 version have been lost; however some details
+are still visible in ChangeLog.OLD, which also acknowledges the
+contributions of Geoffrey Giesemann and Emil Mikulc.
+
+Sometime after this, Troy Will took over maintainership and imported
+the unreleased 2.0.2 code base as the original root commit into
+Savannah git repository.
+
+On 25th November 2011, Adam Spiers <stow@adamspiers.org> took over
+maintainership.  He imported the CVS history into the Savannah git
+repository, grafting it onto the previous root commit imported by
+Troy, and tagged this as v2.0.2:
+
+  https://lists.gnu.org/archive/html/stow-devel/2011-11/msg00001.html
+  https://lists.gnu.org/archive/html/stow-devel/2011-11/msg00002.html
 
-Austin Wood <austin.wood@rmit.edu.au> and Chris Hoobin
-<christopher.hoobin@rmit.edu.au> helped clean up the documentation for
-version 2 and created the texi2man script.
+refactored the backend code into new Stow.pm and Stow/Util.pm modules
+providing an OO interface, tightened up the test suite, added support
+for ignore lists, `make test', and distribution via CPAN, and cleaned
+up numerous other minor issues.
 
-Adam Spiers <stow@adamspiers.org> refactored the backend code into new
-Stow.pm and Stow/Util.pm modules providing an OO interface, tightened
-up the test suite, added support for ignore lists, `make test', and
-distribution via CPAN, and cleaned up numerous other minor issues.
+These changes were included in 2.1.0, which was the first official
+release since 1.3.3 in 2002.
 
 Stow is currently maintained by Adam Spiers.
diff --git a/README.md b/README.md
index bde1cf0..6381fbc 100644
--- a/README.md
+++ b/README.md
@@ -78,8 +78,8 @@ Please do send comments, questions, and constructive criticism.  The
 mailing lists and any other communication channels are detailed on the
 above home page.
 
-Brief history
--------------
+Brief history and authorship
+----------------------------
 
 Stow was inspired by Carnegie Mellon's "Depot" program, but is
 substantially simpler.  Whereas Depot requires database files to keep
@@ -89,3 +89,8 @@ hierarchies don't match the database.  Also unlike Depot, Stow will
 never delete any files, directories, or links that appear in a Stow
 directory (e.g., `/usr/local/stow/emacs`), so it's always possible to
 rebuild the target tree (e.g., `/usr/local`).
+
+For a high-level overview of the contributions of the main developers
+over the years, see [the `AUTHORS` file](AUTHORS).
+
+For a more detailed history, please see the `ChangeLog` file.
diff --git a/THANKS b/THANKS
index 2940859..64147fb 100644
--- a/THANKS
+++ b/THANKS
@@ -7,6 +7,7 @@ Greg Fox            <fox@zanshin.com>
 David Hartmann      <davidh@zanshin.com>
 Ben Liblit          <liblit@well.com>
 Gord Matzigkeit     <gord@enci.ucalgary.ca>
+Adam Lackorzynski   <al10@inf.tu-dresden.de>
 Roland McGrath      <roland@gnu.ai.mit.edu>
 Jim Meyering        <meyering@asic.sc.ti.com>
 Fritz Mueller       <fritzm@netcom.com>
@@ -15,6 +16,7 @@ Richard Stallman    <rms@gnu.ai.mit.edu>
 Spencer Sun         <zorak@netcom.com>
 Tom Tromey          <tromey@cygnus.com>
 Steve Webster       <srw@zanshin.com>
+Kahlil Hodgson      <kahlil@internode.on.net>
 Geoffrey Giesemann  <geoffrey.giesemann@rmit.edu.au>
 Emil Mikulic        <emil.mikulic@rmit.edu.au>
 Austin Wood         <austin.wood@rmit.edu.au>
@@ -38,3 +40,7 @@ Brice Waegeneire
 Email addresses of new contributors are no longer being added by default
 for privacy reasons; however please contact the maintainer if you are
 happy for your email address to be listed here.
+
+More authorship and contribution details can be found in the AUTHORS
+and ChangeLog files, and of course also in the git version control
+history.