summaryrefslogtreecommitdiffstats
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
parentAuto merge of #21473 - alexcrichton:rollup, r=alexcrichton (diff)
downloadgrust-df2c3a288a1f0218fe1abe34aa7b2287a39aa8f8.tar.gz
grust-df2c3a288a1f0218fe1abe34aa7b2287a39aa8f8.tar.bz2
grust-df2c3a288a1f0218fe1abe34aa7b2287a39aa8f8.tar.xz
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 da8ac7b3ad..d4ad98e6e8 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -23,12 +23,12 @@ The following third party packages are included, and carry
23their own copyright notices and license terms: 23their own copyright notices and license terms:
24 24
25* Two header files that are part of the Valgrind 25* Two header files that are part of the Valgrind
26 package. These files are found at src/rt/vg/valgrind.h and 26 package. These files are found at src/rt/valgrind/valgrind.h and
27 src/rt/vg/memcheck.h, within this distribution. These files 27 src/rt/valgrind/memcheck.h, within this distribution. These files
28 are redistributed under the following terms, as noted in 28 are redistributed under the following terms, as noted in
29 them: 29 them:
30 30
31 for src/rt/vg/valgrind.h: 31 for src/rt/valgrind/valgrind.h:
32 32
33 This file is part of Valgrind, a dynamic binary 33 This file is part of Valgrind, a dynamic binary
34 instrumentation framework. 34 instrumentation framework.
@@ -74,7 +74,7 @@ their own copyright notices and license terms:
74 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 74 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
75 OF SUCH DAMAGE. 75 OF SUCH DAMAGE.
76 76
77 for src/rt/vg/memcheck.h: 77 for src/rt/valgrind/memcheck.h:
78 78
79 This file is part of MemCheck, a heavyweight Valgrind 79 This file is part of MemCheck, a heavyweight Valgrind
80 tool for detecting memory errors. 80 tool for detecting memory errors.
@@ -120,18 +120,6 @@ their own copyright notices and license terms:
120 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 120 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
121 OF SUCH DAMAGE. 121 OF SUCH DAMAGE.
122 122
123* The auxiliary file src/etc/pkg/modpath.iss contains a
124 library routine compiled, by Inno Setup, into the Windows
125 installer binary. This file is licensed under the LGPL,
126 version 3, but, in our legal interpretation, this does not
127 affect the aggregate "collected work" license of the Rust
128 distribution (MIT/ASL2) nor any other components of it. We
129 believe that the terms governing distribution of the
130 binary Windows installer built from modpath.iss are
131 therefore LGPL, but not the terms governing distribution
132 of any of the files installed by such an installer (such
133 as the Rust compiler or runtime libraries themselves).
134
135* The src/rt/miniz.c file, carrying an implementation of 123* The src/rt/miniz.c file, carrying an implementation of
136 RFC1950/RFC1951 DEFLATE, by Rich Geldreich 124 RFC1950/RFC1951 DEFLATE, by Rich Geldreich
137 <richgel99@gmail.com>. All uses of this file are 125 <richgel99@gmail.com>. All uses of this file are