about summary refs log tree commit diff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorLuca Bruno <lucab@debian.org>2015-01-22 15:45:47 +0100
committerLuca Bruno <lucab@debian.org>2015-01-22 15:45:47 +0100
commitdf2c3a288a1f0218fe1abe34aa7b2287a39aa8f8 (patch)
treef1631b1f2d2abebedc92332517be3731251bf4e6 /COPYRIGHT
parent5d2056a7e3e52b2aec41662cfd960e0eafe8494c (diff)
downloadrust-df2c3a288a1f0218fe1abe34aa7b2287a39aa8f8.tar.gz
rust-df2c3a288a1f0218fe1abe34aa7b2287a39aa8f8.zip
copyright: update paths and entries
valgrind files moved and modpath.iss deleted. Both entries updated in
COPYRIGHT file.

Signed-off-by: Luca Bruno <lucab@debian.org>
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT20
1 files changed, 4 insertions, 16 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index da8ac7b3add..d4ad98e6e87 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -23,12 +23,12 @@ The following third party packages are included, and carry
 their own copyright notices and license terms:
 
 * Two header files that are part of the Valgrind
-  package. These files are found at src/rt/vg/valgrind.h and
-  src/rt/vg/memcheck.h, within this distribution. These files
+  package. These files are found at src/rt/valgrind/valgrind.h and
+  src/rt/valgrind/memcheck.h, within this distribution. These files
   are redistributed under the following terms, as noted in
   them:
 
-  for src/rt/vg/valgrind.h:
+  for src/rt/valgrind/valgrind.h:
 
     This file is part of Valgrind, a dynamic binary
     instrumentation framework.
@@ -74,7 +74,7 @@ their own copyright notices and license terms:
     USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
     OF SUCH DAMAGE.
 
-  for src/rt/vg/memcheck.h:
+  for src/rt/valgrind/memcheck.h:
 
     This file is part of MemCheck, a heavyweight Valgrind
     tool for detecting memory errors.
@@ -120,18 +120,6 @@ their own copyright notices and license terms:
     USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
     OF SUCH DAMAGE.
 
-* The auxiliary file src/etc/pkg/modpath.iss contains a
-  library routine compiled, by Inno Setup, into the Windows
-  installer binary. This file is licensed under the LGPL,
-  version 3, but, in our legal interpretation, this does not
-  affect the aggregate "collected work" license of the Rust
-  distribution (MIT/ASL2) nor any other components of it. We
-  believe that the terms governing distribution of the
-  binary Windows installer built from modpath.iss are
-  therefore LGPL, but not the terms governing distribution
-  of any of the files installed by such an installer (such
-  as the Rust compiler or runtime libraries themselves).
-
 * The src/rt/miniz.c file, carrying an implementation of
   RFC1950/RFC1951 DEFLATE, by Rich Geldreich
   <richgel99@gmail.com>. All uses of this file are