|
0 |
From f855de8c8f06fd5ecc609aaab0f49754724e8c71 Mon Sep 17 00:00:00 2001
|
|
1 |
From: Scott Kitterman <scott@kitterman.com>
|
|
2 |
Date: Thu, 10 Nov 2016 15:15:12 -0500
|
|
3 |
Subject: Add missing license from upstream git
|
|
4 |
|
|
5 |
---
|
|
6 |
LICENSE | 23 +++++++++++++++++++++++
|
|
7 |
README.rst | 2 +-
|
|
8 |
setup.py | 2 +-
|
|
9 |
3 files changed, 25 insertions(+), 2 deletions(-)
|
|
10 |
create mode 100644 LICENSE
|
|
11 |
|
|
12 |
diff --git a/LICENSE b/LICENSE
|
|
13 |
new file mode 100644
|
|
14 |
index 0000000..aecebff
|
|
15 |
--- /dev/null
|
|
16 |
+++ b/LICENSE
|
|
17 |
@@ -0,0 +1,23 @@
|
|
18 |
+Copyright (c) 2012-2014, Incuna Ltd
|
|
19 |
+All rights reserved.
|
|
20 |
+
|
|
21 |
+Redistribution and use in source and binary forms, with or without modification,
|
|
22 |
+are permitted provided that the following conditions are met:
|
|
23 |
+
|
|
24 |
+ 1. Redistributions of source code must retain the above copyright notice,
|
|
25 |
+ this list of conditions and the following disclaimer.
|
|
26 |
+
|
|
27 |
+ 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
28 |
+ this list of conditions and the following disclaimer in the documentation
|
|
29 |
+ and/or other materials provided with the distribution.
|
|
30 |
+
|
|
31 |
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
32 |
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
33 |
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
34 |
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
|
35 |
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
36 |
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
37 |
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
38 |
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
39 |
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
40 |
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
41 |
diff --git a/README.rst b/README.rst
|
|
42 |
index 0593793..491d45d 100644
|
|
43 |
--- a/README.rst
|
|
44 |
+++ b/README.rst
|
|
45 |
@@ -66,4 +66,4 @@ Documentation is available at http://django-wkhtmltopdf.readthedocs.org/en/lates
|
|
46 |
License
|
|
47 |
-------
|
|
48 |
|
|
49 |
-MIT licensed. See the bundled `LICENSE <https://github.com/incuna/django-wkhtmltopdf/blob/master/LICENSE>`_ file for more details.
|
|
50 |
+BSD-2-Clause licensed. See the bundled `LICENSE <https://github.com/incuna/django-wkhtmltopdf/blob/master/LICENSE>`_ file for more details.
|
|
51 |
diff --git a/setup.py b/setup.py
|
|
52 |
index 876e9ef..c4c7eb5 100644
|
|
53 |
--- a/setup.py
|
|
54 |
+++ b/setup.py
|
|
55 |
@@ -10,7 +10,7 @@ setup(
|
|
56 |
version=wkhtmltopdf.__version__,
|
|
57 |
description='Converts HTML to PDF using wkhtmltopdf.',
|
|
58 |
long_description=open('README.rst').read(),
|
|
59 |
- license='MIT',
|
|
60 |
+ license='BSD-2-Clause',
|
|
61 |
author=wkhtmltopdf.__author__,
|
|
62 |
author_email='admin@incuna.com',
|
|
63 |
url='https://github.com/incuna/django-wkhtmltopdf',
|