[Python-modules-commits] [matplotlib] 10/11: add/remove stanzas for new upstream code

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository matplotlib.

commit 014c6738c20c427de86c6e022b99263efc08f29a
Author: Sandro Tosi <morph at debian.org>
Date:   Mon Jan 4 21:49:41 2016 +0000

    add/remove stanzas for new upstream code
---
 debian/changelog |  3 ++-
 debian/copyright | 36 +++++++++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46b0ca0..df6648a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ matplotlib (1.5.1~rc1-1) UNRELEASED; urgency=medium
   * New upstream release candidate
   * debian/copyright
     - extend packaging copyright years
+    - add/remove stanzas for new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Mon, 04 Jan 2016 21:31:01 +0000
+ -- Sandro Tosi <morph at debian.org>  Mon, 04 Jan 2016 21:47:13 +0000
 
 matplotlib (1.5.0~rc2-1) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 3abfb6d..8dc0a4a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -64,9 +64,6 @@ Files: debian/*
 Copyright: Copyright (C) 2008-2016 Sandro Tosi <morph at debian.org>
 License: same as upstream
 
-Files: lib/matplotlib/fontconfig_pattern.py
-Author: Michael Droettboom <mdroe at stsci.edu>
-
 Files: lib/matplotlib/backends/backend_wxagg.py
 Copyright: Copyright (C) 2003-5 Jeremy O'Donoghue, John Hunter, Illinois Institute of Technology
 
@@ -445,3 +442,36 @@ License: MIT
 Files: lib/matplotlib/externals/six.py
 Copyright: Copyright (c) 2010-2015 Benjamin Peterson
 License: MIT
+
+Files: lib/matplotlib/testing/disable_internet.py
+Comment: Originally from astropy project (http://astropy.org)
+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:
+ .
+ 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.
+ .
+ 3. Neither the name of AURA and its representatives nor the names
+ of the Smithsonian Astrophysical Observatory, Enthought Inc., Michael Foord,
+ the name of Voidspace, the names of its contributors, David Beazley, or
+ Dabeaz LLC, Allan Jardine nor SpryMedia, may not be used to endorse or
+ promote products derived from this software without specific prior
+ written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY ITS AUTHORS ``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 AURA 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.

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