[Python-modules-commits] [django-simple-redis-admin] 05/06: Add LICENSE file from upstream git

[Scott Kitterman]

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

kitterman pushed a commit to branch master
in repository django-simple-redis-admin.

commit b3cd0987d08abaa4a2f36c76e57ffe03a389a3ac
Merge: 868885c c485020
Author: Scott Kitterman <scott at kitterman.com>
Date:   Mon Nov 14 23:57:04 2016 -0500

    Add LICENSE file from upstream git

 LICENSE                                            | 26 +++++++++++
 MANIFEST.in                                        |  1 +
 debian/.git-dpm                                    |  4 +-
 debian/changelog                                   |  3 +-
 .../0001-Add-LICENSE-file-from-upstream-git.patch  | 51 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 6 files changed, 83 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index b8a0ecf,0000000..9950c72
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
- a4f05b8303ed4eed7280bfae65cd7dcde66bf7c9
- a4f05b8303ed4eed7280bfae65cd7dcde66bf7c9
++c48502042413538a2d4b5fa41fe1c64acbe9cde1
++c48502042413538a2d4b5fa41fe1c64acbe9cde1
 +a4f05b8303ed4eed7280bfae65cd7dcde66bf7c9
 +a4f05b8303ed4eed7280bfae65cd7dcde66bf7c9
 +django-simple-redis-admin_1.4.0.orig.tar.gz
 +301063dbd99ca04c08d578260d7e43ca68912019
 +5751
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 08b273c,0000000..ce7ef21
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,6 @@@
 +django-simple-redis-admin (1.4.0-1) unstable; urgency=medium
 +
 +  * Initial release. (Closes: #844379)
++  * Add LICENSE file from upstream git
 +
-  -- Scott Kitterman <scott at kitterman.com>  Mon, 14 Nov 2016 22:06:07 -0500
++ -- Scott Kitterman <scott at kitterman.com>  Mon, 14 Nov 2016 23:57:04 -0500
diff --cc debian/patches/0001-Add-LICENSE-file-from-upstream-git.patch
index 0000000,0000000..e00bd1a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Add-LICENSE-file-from-upstream-git.patch
@@@ -1,0 -1,0 +1,51 @@@
++From c48502042413538a2d4b5fa41fe1c64acbe9cde1 Mon Sep 17 00:00:00 2001
++From: Scott Kitterman <scott at kitterman.com>
++Date: Mon, 14 Nov 2016 23:56:02 -0500
++Subject: Add LICENSE file from upstream git
++
++---
++ LICENSE     | 26 ++++++++++++++++++++++++++
++ MANIFEST.in |  1 +
++ 2 files changed, 27 insertions(+)
++ create mode 100644 LICENSE
++
++diff --git a/LICENSE b/LICENSE
++new file mode 100644
++index 0000000..df3e4e0
++--- /dev/null
+++++ b/LICENSE
++@@ -0,0 +1,26 @@
+++BSD 2-Clause License
+++
+++Copyright (c) 2012,2014,2016, Nicholas Serra
+++All rights reserved.
+++
+++Redistribution and use in source and binary forms, with or without
+++modification, are permitted provided that the following conditions are met:
+++
+++* Redistributions of source code must retain the above copyright notice, this
+++  list of conditions and the following disclaimer.
+++
+++* 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/MANIFEST.in b/MANIFEST.in
++index f5b5780..53432a9 100755
++--- a/MANIFEST.in
+++++ b/MANIFEST.in
++@@ -1,2 +1,3 @@
++ include README.md
++ recursive-include redis_admin/templates/redis_admin *
+++LICENSE
diff --cc debian/patches/series
index 0000000,0000000..1afc373
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Add-LICENSE-file-from-upstream-git.patch

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