[gnuplot5] 02/03: Update d/copyright.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gnuplot5.

commit 5a638de3ee4cb2ad9b3d4abb6a94136cd394e22e
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Jan 18 09:08:19 2016 +0100

    Update d/copyright.
---
 debian/copyright | 74 ++++++++++++++++++++------------------------------------
 1 file changed, 26 insertions(+), 48 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e72aaab..dce49fc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -42,49 +42,11 @@ License: other
 
 Files: src/wxterminal/*
 Copyright: Copyright 2005,2006   Timothee Lecomte
-License: other
- Permission to use, copy, and distribute this software and its
- documentation for any purpose with or without fee is hereby granted,
- .
- provided that the above copyright notice appear in all copies and that
- both that copyright notice and this permission notice appear in supporting
- documentation.
- .
- Permission to modify the software is granted, but not the right to
- distribute the complete modified source code.  Modifications are to be
- distributed as patches to the released version.  Permission to distribute
- binaries produced by compiling modified sources is granted, provided you
-   1. distribute the corresponding source modifications from the released
-      version in the form of a patch file along with the binaries,
-   2. add special version identification to distinguish your version in
-      addition to the base release version number,
-   3. provide your name and address as the primary contact for the support
-      of your modified version, and
-   4. retain our contact information in regard to use of the base software.
- Permission to distribute the released version of the source code along
- with corresponding source modifications in the form of a patch file is
- granted with same provisions 2 through 4 for binary distributions.
- .
- This software is provided "as is" without express or implied warranty to
- the extent permitted by applicable law.
- .
- Alternatively, the contents of this file may be used under the terms of
- the GNU General Public License Version 2 or later (the "GPL"), in which
- case the provisions of GPL are applicable instead of those above. If you
- wish to allow use of your version of this file only under the terms of the
- GPL and not to allow others to use your version of this file under the
- above gnuplot license, indicate your decision by deleting the provisions
- above and replace them with the notice and other provisions required by
- the GPL. If you do not delete the provisions above, a recipient may use
- your version of this file under either the GPL or the gnuplot license.
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+License: BSD-4-clause or GPL-2
 
 Files: term/PostScript/aglfn.txt
 Copyright: 2003,2005,2006,2007 Adobe Systems Incorporated
-License: BSD-like
+License: BSD-like-aglfn
  # Permission is hereby granted, free of charge, to any person obtaining a
  # copy of this documentation file to use, copy, publish, distribute,
  # sublicense, and/or sell copies of the documentation, and to permit
@@ -118,7 +80,7 @@ Files: term/object.h
 Copyright: 1985 by Supoj Sutanthavibul,
            Parts Copyright (c) 1994 by Brian V. Smith,
            Parts Copyright (c) 1991 by Paul King
-License: BSD-like
+License: BSD-like-X
  * The X Consortium, and any party obtaining a copy of these files from
  * the X Consortium, directly or indirectly, is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -134,6 +96,16 @@ License: BSD-like
 Files: term/fig.trm
 Copyright:  1990 - 1993, 1998, 2004 Micah Beck, David Kotz
 License: BSD-4-clause
+
+Files: pm3d/contrib/pm3dConvertToImage.awk
+Copyright: 2002 Petr Mikulik, mikulik at physics.muni.cz
+License: public-domain
+ Distribution policy: this script belongs to the distribution of pm3d and
+ gnuplot programs.
+ .
+ License: public domain.
+
+License: BSD-4-clause
  * Permission to use, copy, and distribute this software and its
  * documentation for any purpose with or without fee is hereby granted,
  * provided that the above copyright notice appear in all copies and
@@ -160,11 +132,17 @@ License: BSD-4-clause
  * This software is provided "as is" without express or implied warranty
  * to the extent permitted by applicable law.
 
-Files: pm3d/contrib/pm3dConvertToImage.awk
-Copyright: 2002 Petr Mikulik, mikulik at physics.muni.cz
-License: public-domain
- Distribution policy: this script belongs to the distribution of pm3d and
- gnuplot programs.
+License: GPL-2
+ Alternatively, the contents of this file may be used under the terms of
+ the GNU General Public License Version 2 or later (the "GPL"), in which
+ case the provisions of GPL are applicable instead of those above. If you
+ wish to allow use of your version of this file only under the terms of the
+ GPL and not to allow others to use your version of this file under the
+ above gnuplot license, indicate your decision by deleting the provisions
+ above and replace them with the notice and other provisions required by
+ the GPL. If you do not delete the provisions above, a recipient may use
+ your version of this file under either the GPL or the gnuplot license.
  .
- License: public domain.
-
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gnuplot5.git