[Debian-astro-commits] [python-pyds9] 07/09: Combine expat licensed paragraphs

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository python-pyds9.

commit 18ebaf1698998fa1dd6464a3c97bf03d85f2bd46
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Oct 19 12:17:17 2015 +0200

    Combine expat licensed paragraphs
---
 debian/copyright | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index d9a7118..27bd541 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,8 +9,9 @@ License: LGPL-2.1
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-Files: xpa/install-sh
-Copyright: Copyright 1991 by the Massachusetts Institute of Technology
+Files: xpa/install-sh xpa/mklib
+Copyright: 1991 by the Massachusetts Institute of Technology
+ 1999-2006  Brian Paul
 License: Expat
  Permission to use, copy, modify, distribute, and sell this software and its
  documentation for any purpose is hereby granted without fee, provided that
@@ -22,26 +23,6 @@ License: Expat
  suitability of this software for any purpose.  It is provided "as is"
  without express or implied warranty.
 
-Files: xpa/mklib
-Copyright: Copyright (C) 1999-2006  Brian Paul
-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
- BRIAN PAUL 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.
-
 Files: debian/*
 Copyright: not applicable
 License: public-domain

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