Update COPYING

- Use "or later" clause for GPLv3 and LGPLv3
- Make LGPL exception more general

diff --git a/COPYING b/COPYING
index 81af0c4e748983e0aadb9777b93b23dba7b1a8a7..eb329f62315e32c4b2657b06de3eab043baa414d 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,16 @@
 Unless otherwise specified, wimlib and all programs and scripts distributed with
 Unless otherwise specified, wimlib and all programs and scripts distributed with

-it, including 'wimlib-imagex', are released under the GNU GPL (General Public
-License), version 3.  See COPYING.GPLv3 for the full text of this license.
+it may be redistributed and/or modified under the terms of the GNU General
+Public License; either version 3 of the License, or (at your option) any later
+version.  See COPYING.GPLv3.

 
 

-However, as of version 1.7.0, the following exception applies to wimlib itself
---- that is, the shared library or DLL file:  If you do not use the libntfs-3g
-support in wimlib --- that is, your application never uses the flags
-WIMLIB_EXTRACT_FLAG_NTFS or WIMLIB_ADD_FLAG_NTFS, or wimlib is not linked to
-libntfs-3g at all, such as is the case for the Windows builds distributed on
-sourceforge.net --- you are also granted the rights of the GNU LGPL (Lesser
-General Public License), version 3.  See COPYING.LGPLv3 for the full text of
-this additional license.
+However, the following exception is granted.  When not prohibited by conflict
+with a third-party software license, you may opt to redistribute and/or modify
+the library portion of wimlib under the terms of the GNU Lesser General Public
+License; either version 3 of the License, or (at your option) any later version.
+See COPYING.LGPLv3.
+
+The following paragraph is informational only.  The above exception is known to
+be relevant for the third-party library "libntfs-3g", which is licensed GPLv2+.
+On UNIX-like systems, wimlib can optionally be compiled with libntfs-3g support.
+However, a binary copy of wimlib that was compiled without libntfs-3g support
+need not be affected by the libntfs-3g license (for example).

diff --git a/NEWS b/NEWS
index 0376c592e47c7b23d7e1b3e1fbbc9bc0a309870d..7ce8537170732ae4375e5e480ff36e762917ebcc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,8 @@ Version 1.7.2-BETA:
 
                Some documentation improvements.
 
 
                Some documentation improvements.
 

+       Made some clarifications to the license text in the COPYING file.
+

 Version 1.7.1:
        Made more improvements to the XPRESS, LZX, and LZMS compressors.
 
 Version 1.7.1:
        Made more improvements to the XPRESS, LZX, and LZMS compressors.
 

diff --git a/debian/copyright b/debian/copyright
index d527408754a85f8a199c83c6e433037f1cf8f654..40aa7fdfc32ef00d7102b8240e07eacffc3beb3d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,19 +3,26 @@ Upstream-Name: wimlib
 Source: http://sourceforge.net/projects/wimlib
 
 Files: *
 Source: http://sourceforge.net/projects/wimlib
 
 Files: *

-Copyright: 2012 Eric Biggers <ebiggers3@gmail.com>
-License: GPLv3+
- This library 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 3 of the License, or (at your option) any later
- version.
- .
- This library is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General Public License version
- 3 can be found in "/usr/share/common-licenses/GPL-3".
+Copyright: 2012, 2013, 2014 Eric Biggers <ebiggers3@gmail.com>
+License: GPLv3+ with exception
+  Unless otherwise specified, wimlib and all programs and scripts distributed with
+  it may be redistributed and/or modified under the terms of the GNU General
+  Public License; either version 3 of the License, or (at your option) any later
+  version.  See COPYING.GPLv3.
+  .
+  However, the following exception is granted.  When not prohibited by conflict
+  with a third-party software license, you may opt to redistribute and/or modify
+  the library portion of wimlib under the terms of the GNU Lesser General Public
+  License; either version 3 of the License, or (at your option) any later version.
+  See COPYING.LGPLv3.
+  .
+  The following paragraph is informational only.  The above exception is known to
+  be relevant for the third-party library "libntfs-3g", which is licensed GPLv2+.
+  On UNIX-like systems, wimlib can optionally be compiled with libntfs-3g support.
+  However, a binary copy of wimlib that was compiled without libntfs-3g support
+  need not be affected by the libntfs-3g license (for example).
+
+Files: debian/*
+License: Public domain
+  The Debian packaging scripts are free to be redistributed and/or modified with
+  no restrictions.