[Python-modules-commits] [ipython4] 01/01: Update debian/copyright for IPython/utils/_get_terminal_size.py

[Diane Trout]

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

diane pushed a commit to branch master
in repository ipython4.

commit db2ffa5deb4da495e7ff0bb375603e67b0e197be
Author: Diane Trout <diane at ghic.org>
Date:   Wed Oct 25 14:27:45 2017 -0700

    Update debian/copyright for IPython/utils/_get_terminal_size.py
---
 debian/changelog |  4 ++++
 debian/copyright | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5bb9cd6..d9bcd8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ipython (5.5.0-1) UNRELEASED; urgency=medium
 
+  [ Gordon Ball ]
   * New upstream release
   * Update Standards-Version to 4.1.0
   * Update debhelper compat to 10
@@ -14,6 +15,9 @@ ipython (5.5.0-1) UNRELEASED; urgency=medium
     equivalent for python3
   * Quote arguments to ipython -c (closes: #843793)
 
+  [ Diane Trout ]
+  * Update debian/copyright for IPython/utils/_get_terminal_size.py
+
  -- Gordon Ball <gordon at chronitis.net>  Sun, 17 Sep 2017 16:05:57 +0200
 
 ipython (5.1.0-2) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index a9ac968..ab6250d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,6 +24,9 @@ Copyright: 2001, Python Software Foundation, www.python.org
  2005-2006, Fernando Perez. <fperez at colorado.edu>
 License: PSF
 
+Files: IPython/utils/_get_terminal_size.py
+Copyright: 2014 Christopher Rosell
+License: MIT
 
 License: BSD-3-clause
  All rights reserved.
@@ -104,3 +107,23 @@ License: PSF
  8. By copying, installing or otherwise using Python, Licensee
  agrees to be bound by the terms and conditions of this License
  Agreement.
+
+License: MIT
+ 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/ipython4.git