Additionally license under Apache License version 2.0

The Apache License version 2.0 is now the primary license for qpdf.
However, users may, at their option, continue to use Artistic version
2.0.

1 files changed, 10 insertions, 31 deletions

diff --git a/README.md b/README.md
index 7e59c24f..ea939ae7 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,15 @@ This is the QPDF package.  Information about it can be found at https://qpdf.sou
 
 QPDF is copyright (c) 2005-2017 Jay Berkenbilt
 
-This software may be distributed under the terms of version 2 of the Artistic License which may be found in the source distribution as "Artistic-2.0".  It is provided "as is" without express or implied warranty.
+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.
+
+You may also see the license in the file [LICENSE.txt](LICENSE.txt) in the source distribution.
+
+Versions of qpdf prior to version 7 were released under the terms of version 2.0 of the Artistic License. At your option, you may continue to consider qpdf to be licensed under those terms. Please see the manual for additional information. The Artistic License appears in the file [Artistic-2.0](Artistic-2.0) in the source distribution.
 
 # Prerequisites
 
@@ -14,36 +22,7 @@ QPDF requires a C++ compiler that works with STL.  Your compiler must also suppo
 
 QPDF makes use of zlib and jpeg libraries for its functionality. These packages can be downloaded separately from their own download locations, or they can be downloaded in the external-libs area of the qpdf download site.
 
-The Rijndael encryption implementation used as the basis for AES encryption and decryption support comes from Philip J. Erdelsky's public domain implementation.  The files `libqpdf/rijndael.cc` and `libqpdf/qpdf/rijndael.h` remain in the public domain.  They were obtained from
-* http://www.efgh.com/software/rijndael.htm
-* http://www.efgh.com/software/rijndael.txt
-
-The embedded sha2 code comes from sphlib 3.0
-* http://www.saphir2.com/sphlib/
-
-That code has the following license:
-  ```
-  Copyright (c) 2007-2011  Projet RNRT SAPHIR
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be included
-  in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  ```
+Please see the [NOTICE](NOTICE.md) file for information on licenses of embedded software.
 
 # Building from a pristine checkout