aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2016-10-17 18:54:00 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2016-10-17 18:54:00 -0400
commit042fc726bfef798b17fea70fbba2742ab5b5d603 (patch)
tree2cb86f60cbaed6cd70ccdb4dbc8e7ea03253abad
parent1960313d4d799fd90fe0cdd76d01b98174c0ab52 (diff)
downloadveracrypt-042fc726bfef798b17fea70fbba2742ab5b5d603.tar.bz2
veracrypt-042fc726bfef798b17fea70fbba2742ab5b5d603.tar.xz
veracrypt-042fc726bfef798b17fea70fbba2742ab5b5d603.tar.zst
d/copyright: Correct URLs, use correct alternate license.
-rw-r--r--debian/copyright69
1 files changed, 18 insertions, 51 deletions
diff --git a/debian/copyright b/debian/copyright
index 734624d..178e515 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: veracrypt
-Source: http://sourceforge.net/projects/truecrypt/
+Source: https://sourceforge.net/projects/veracrypt/
Files: *
Copyright: 2003-2011, TrueCrypt Developers Association
2013-2016, IDRIX
-License: TC-3.0 or Ms-PL
+License: TC-3.0 or Apache-2.0
Files: src/Common/Apidrvr.h
src/Common/Cache.*
@@ -452,54 +452,21 @@ License: TC-3.0
closely as possible.
-License: Ms-PL
- This license governs use of the accompanying software. If you use the
- software, you accept this license. If you do not accept the license, do not
- use the software.
- .
- 1. Definitions
- The terms "reproduce," "reproduction," "derivative works," and "distribution"
- have the same meaning here as under U.S. copyright law.
- A "contribution" is the original software, or any additions or changes to
- the software.
- A "contributor" is any person that distributes its contribution under this
- license.
- "Licensed patents" are a contributor's patent claims that read directly on its
- contribution.
- .
- 2. Grant of Rights
- (A) Copyright Grant- Subject to the terms of this license, including the
- license conditions and limitations in section 3, each contributor grants you
- a non-exclusive, worldwide, royalty-free copyright license to reproduce its
- contribution, prepare derivative works of its contribution, and distribute
- its contribution or any derivative works that you create.
- (B) Patent Grant- Subject to the terms of this license, including the license
- conditions and limitations in section 3, each contributor grants you a
- non-exclusive, worldwide, royalty-free license under its licensed patents to
- make, have made, use, sell, offer for sale, import, and/or otherwise dispose
- of its contribution in the software or derivative works of the
- contribution in the software.
- .
- 3. Conditions and Limitations
- (A) No Trademark License- This license does not grant you rights to use any
- contributors' name, logo, or trademarks.
- (B) If you bring a patent claim against any contributor over patents that you
- claim are infringed by the software, your patent license from such
- contributor to the software ends automatically.
- (C) If you distribute any portion of the software, you must retain all
- copyright, patent, trademark, and attribution notices that are present in the
- software.
- (D) If you distribute any portion of the software in source code form, you may
- do so only under this license by including a complete copy of this license
- with your distribution. If you distribute any portion of the software in
- compiled or object code form, you may only do so under a license that complies
- with this license.
- (E) The software is licensed "as-is." You bear the risk of using it. The
- contributors give no express warranties, guarantees or conditions. You may
- have additional consumer rights under your local laws which this license
- cannot change. To the extent permitted under your local laws, the contributors
- exclude the implied warranties of merchantability, fitness for a particular
- purpose and non-infringement.
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
License: E4M