#
#
# patch "AUTHORS"
#  from [c82f6c55ddb1672320f8dca9629ec6ed95b8b25f]
#    to [3bc6c49bc366af5300dbb7a09257d5788aa7fd70]
# 
# patch "debian/changelog"
#  from [4c0fa57b18a942b3fff0cc691e1fdfa891fcdc56]
#    to [f1eba08fa5174ff1ad99d0719a9a8c5754557731]
# 
# patch "debian/copyright"
#  from [bff6aab6446c5e06dc88f9896ce143397f5380ac]
#    to [a6c63a110086b4af7d1d53e11bfdca6b6f22dbbb]
#
============================================================
--- AUTHORS	c82f6c55ddb1672320f8dca9629ec6ed95b8b25f
+++ AUTHORS	3bc6c49bc366af5300dbb7a09257d5788aa7fd70
@@ -128,8 +128,10 @@ of files that were at one time available
 unix/main.cc and win32/main.cc were originally execution_monitor.cc
 from the Boost project.  The files in the boost/ directory are copies
 of files that were at one time available from the boost "sandbox" CVS
-repository, linked off of http://www.boost.org/.  Boost in general is
-licensed under the Boost Software License:
+repository, linked off of http://www.boost.org/.  monotone also makes
+use of several "header-only" Boost libraries (not included in the
+source distribution) and therefore the binary incorporates their code.
+Boost in general is licensed under the Boost Software License:
 
 #  Boost Software License - Version 1.0 - August 17th, 2003
 #
@@ -158,8 +160,7 @@ licensed under the Boost Software Licens
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 #  DEALINGS IN THE SOFTWARE.
 
-The files in boost/ related to circular buffers are under a slightly
-different license:
+The files in boost/ are under a slightly different license:
 
 #  Copyright (c) 2003 Jan Gaspar, Whitestein Technologies
 #
@@ -415,7 +416,7 @@ http://botan.randombit.net/.  It is lice
 botan/thanks.txt.  The Botan distribution may be retrieved from
 http://botan.randombit.net/.  It is licensed under a BSD-like license:
 
-#  Copyright (C) 1999-2004 The Botan Project. All rights reserved.
+#  Copyright (C) 1999-2006 The Botan Project. All rights reserved.
 #
 #  Redistribution and use in source and binary forms, for any use,
 #  with or without modification, is permitted provided that the
============================================================
--- debian/changelog	4c0fa57b18a942b3fff0cc691e1fdfa891fcdc56
+++ debian/changelog	f1eba08fa5174ff1ad99d0719a9a8c5754557731
@@ -1,6 +1,7 @@ monotone (0.37-1) UNRELEASED; urgency=lo
 monotone (0.37-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Clarifications to debian/copyright and AUTHORS.
   * No longer depends on any external Boost library modules.
     And there was much rejoicing.
   * Ensure sqlite I/O code sees a prototype for pread/pwrite, and make
============================================================
--- debian/copyright	bff6aab6446c5e06dc88f9896ce143397f5380ac
+++ debian/copyright	a6c63a110086b4af7d1d53e11bfdca6b6f22dbbb
@@ -1,16 +1,15 @@
-This package was debianized by Tomas Fasth <address@hidden> on
-2005-04-12 and adopted by Shaun Jackman <address@hidden> on
-2006-07-24.
+This package was debianized by Tomas Fasth <address@hidden> on 2005-04-12,
+adopted by Shaun Jackman <address@hidden> on 2006-07-24, and adopted
+again by a team reachable at address@hidden on 2007-07-10.
 
 The source files was downloaded from
 http://www.monotone.ca/downloads/
 
-The upstream author is Graydon Hoare <address@hidden>
+Upstream authors are reachable at address@hidden
+Copyright holders are listed in /usr/share/doc/monotone/AUTHORS.gz
 
-Copyright holders can be found in /usr/share/doc/monotone/AUTHORS
+Overall license:
 
-License:
-
    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
@@ -28,4 +27,7 @@ Public License can be found in `/usr/sha
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
+Monotone includes substantial bodies of code developed by
+others and available under terms more permissive than the GPL.
+See /usr/share/doc/monotone/AUTHORS.gz for complete statements of
+authorship, copyrights, and licensing.
-See /usr/share/doc/monotone/COPYING for more information.