[Debian-astro-commits] [python-astropy] 07/08: Update d/copyright

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository python-astropy.

commit 7bfc612be256c69041bf630a611ff364c57e920f
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Jul 10 12:14:57 2017 +0200

    Update d/copyright
    
    The debian/ subdir has now the same copyright as astropy itself.
---
 debian/copyright | 36 ++----------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index b79b22b..993dc28 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,9 @@ Upstream-Author: The Astropy Developers
 Source: http://www.astropy.org/
 
 Files: * astropy/io/fits/*
- astropy_helpers/astropy_helpers/sphinx/ext/compiler_unparse.py
- astropy_helpers/astropy_helpers/sphinx/ext/comment_eater.py
- astropy_helpers/astropy_helpers/sphinx/ext/traitsdoc.py
  astropy/extern/configobj/*
  astropy/extern/js/jquery.dataTables.js
-Copyright: Copyright (c) 2011, Astropy Developers,
+Copyright: 2011-2017 Astropy Developers,
  2004-2005 Association of Universities for Research in Astronomy,
  2006 Enthought, Inc.,
  2010-2011 Smithsonian Astrophysical Observatory,
@@ -17,6 +14,7 @@ Copyright: Copyright (c) 2011, Astropy Developers,
  1995-2010 Jean-loup Gailly and Mark Adler,
  2001-2011 David M. Beazley (Dabeaz LLC)
  2008-2013 Allan Jardine
+ 2012-2017 Ole Streicher <olebole at debian.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:
@@ -71,36 +69,6 @@ License: Expat
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-Files: astropy_helpers/astropy_helpers/sphinx/ext/numpydoc.py
- astropy_helpers/astropy_helpers/sphinx/ext/docscrape.py
- astropy_helpers/astropy_helpers/sphinx/ext/docscrape_sphinx.py
- astropy_helpers/astropy_helpers/sphinx/ext/phantom_import.py
- debian/*
-Copyright: Copyright (C) 2008 Stefan van der Walt <stefan at mentat.za.net>,
- Pauli Virtanen <pav at iki.fi>,
- 2012-2015 Ole Streicher <olebole at debian.org>
-License: BSD-2-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.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR "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 AUTHOR 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.
-
 Files: cextern/wcslib/*
 Copyright: Copyright (C) 1995-2012, Mark Calabretta
 License: LGPL-3

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