[Python-modules-commits] [django-wkhtmltopdf] 05/06: merge patched into master

[Scott Kitterman]

This is an automated email from the git hooks/post-receive script.

kitterman pushed a commit to branch master
in repository django-wkhtmltopdf.

commit 3edb0e0f03dd191b7bb9e5e82f3247f40cb2fa3b
Merge: 2fbd359 f855de8
Author: Scott Kitterman <scott at kitterman.com>
Date:   Thu Nov 10 15:15:29 2016 -0500

    merge patched into master

 LICENSE                                            | 23 ++++++++
 README.rst                                         |  2 +-
 debian/.git-dpm                                    |  4 +-
 ...001-Add-missing-license-from-upstream-git.patch | 64 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 6 files changed, 92 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 30848e6,0000000..e7d66f7
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- c456aed4c286d3be784bfbd3b2fdd14790372a8f
- c456aed4c286d3be784bfbd3b2fdd14790372a8f
++f855de8c8f06fd5ecc609aaab0f49754724e8c71
++f855de8c8f06fd5ecc609aaab0f49754724e8c71
 +c456aed4c286d3be784bfbd3b2fdd14790372a8f
 +c456aed4c286d3be784bfbd3b2fdd14790372a8f
 +django-wkhtmltopdf_3.1.0.orig.tar.gz
 +34e60349fe029f5fd6ca464eed4ac02d8a0c986c
 +10506
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Add-missing-license-from-upstream-git.patch
index 0000000,0000000..48f4cf3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Add-missing-license-from-upstream-git.patch
@@@ -1,0 -1,0 +1,64 @@@
++From f855de8c8f06fd5ecc609aaab0f49754724e8c71 Mon Sep 17 00:00:00 2001
++From: Scott Kitterman <scott at kitterman.com>
++Date: Thu, 10 Nov 2016 15:15:12 -0500
++Subject: Add missing license from upstream git
++
++---
++ LICENSE    | 23 +++++++++++++++++++++++
++ README.rst |  2 +-
++ setup.py   |  2 +-
++ 3 files changed, 25 insertions(+), 2 deletions(-)
++ create mode 100644 LICENSE
++
++diff --git a/LICENSE b/LICENSE
++new file mode 100644
++index 0000000..aecebff
++--- /dev/null
+++++ b/LICENSE
++@@ -0,0 +1,23 @@
+++Copyright (c) 2012-2014, Incuna Ltd
+++All rights reserved.
+++
+++Redistribution and use in source and binary forms, with or without modification,
+++are permitted provided that the following conditions are met:
+++
+++    1. Redistributions of source code must retain the above copyright notice,
+++    this list of conditions and the following disclaimer.
+++
+++    2. Redistributions in binary form must reproduce the above copyright notice,
+++    this list of conditions and the following disclaimer in the documentation
+++    and/or other materials provided with the distribution.
+++
+++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++diff --git a/README.rst b/README.rst
++index 0593793..491d45d 100644
++--- a/README.rst
+++++ b/README.rst
++@@ -66,4 +66,4 @@ Documentation is available at http://django-wkhtmltopdf.readthedocs.org/en/lates
++ License
++ -------
++ 
++-MIT licensed. See the bundled `LICENSE <https://github.com/incuna/django-wkhtmltopdf/blob/master/LICENSE>`_ file for more details.
+++BSD-2-Clause licensed. See the bundled `LICENSE <https://github.com/incuna/django-wkhtmltopdf/blob/master/LICENSE>`_ file for more details.
++diff --git a/setup.py b/setup.py
++index 876e9ef..c4c7eb5 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -10,7 +10,7 @@ setup(
++     version=wkhtmltopdf.__version__,
++     description='Converts HTML to PDF using wkhtmltopdf.',
++     long_description=open('README.rst').read(),
++-    license='MIT',
+++    license='BSD-2-Clause',
++     author=wkhtmltopdf.__author__,
++     author_email='admin at incuna.com',
++     url='https://github.com/incuna/django-wkhtmltopdf',
diff --cc debian/patches/series
index 0000000,0000000..6d3a34a
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Add-missing-license-from-upstream-git.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-wkhtmltopdf.git