[Python-modules-commits] [python-socksipy] 09/09: d/copyright: Added copyright for test/httpproxy.py

[Ondřej Nový]

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

onovy pushed a commit to branch master
in repository python-socksipy.

commit d8d594f39c784f0a8b25403a99a987345d117ed0
Author: Ondřej Nový <onovy at debian.org>
Date:   Sat Aug 6 22:41:44 2016 +0200

    d/copyright: Added copyright for test/httpproxy.py
---
 debian/changelog |  1 +
 debian/copyright | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5d7735a..9efd3d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ python-socksipy (1.5.7+dfsg1-1) UNRELEASED; urgency=medium
   * Removed pre-wheezy versioned dependency of python-all
   * Removed test/mocks binary from upstream tarball
   * Removed d/README.md to source package, it's back in orig tarball
+  * d/copyright: Added copyright for test/httpproxy.py
 
  -- Ondřej Nový <onovy at debian.org>  Sat, 06 Aug 2016 22:16:53 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 1d56890..b4f9f80 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,6 +19,10 @@ Copyright: 2008 Thomas Bläsing <thomasbl at pool.math.tu-berlin.de>
            2016 Ondřej Nový <novy at ondrej.org>
 License: BSD-3-clause
 
+Files: test/httpproxy.py
+Copyright: 2012 Senko Rasic <senko.rasic at dobarkod.hr>
+License: Expat
+
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without modification,
  are permitted provided that the following conditions are met:
@@ -40,3 +44,22 @@ License: BSD-3-clause
  OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
  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 DAMANGE.
+
+License: Expat
+ 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.

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