Rewritten d/copyright as suggested by Boris Pek

2 files changed, 39 insertions, 113 deletions

diff --git a/debian/changelog b/debian/changelog
index 3938949..de313a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,14 +18,14 @@ open-axiom (1.5.0~svn3056+ds-1) unstable; urgency=low
   * Added keywords to d/open-axiom.desktop
   * Added description to non-static-open-axiom-binary.patch and
     no-missing-messages.patch
-  * Updated d/copyright
+  * Updated d/copyright (thanks to Boris Pek)
   * Updated d/watch to use SourceForge SVN repository
   * Omit contrib directory (that's why +ds):
     - Unclear licenses (GPL, but which one?)
     - It is for Windows
   * Bump standards version 3.9.3 → 3.9.4, no changes
 
- -- Igor Pashev <pashev.igor@gmail.com>  Sat, 02 Nov 2013 22:31:42 +0400
+ -- Igor Pashev <pashev.igor@gmail.com>  Sun, 15 Dec 2013 12:11:38 +0400
 
 open-axiom (1.4.1+svn~2626-2) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 919296c..e92039e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,45 +1,28 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Open Axiom
-Source: http://sourceforge.net/projects/open-axiom/
 Upstream-Contact: Gabriel Dos Reis <gdr@cs.tamu.edu>
+Source: http://sourceforge.net/projects/open-axiom/
+
+Files: *
 Copyright: 1991-2002, The Numerical ALgorithms Group Ltd
   2003-2007, The Axiom Team
   2007-2013, Gabriel Dos Reis
+  2009-2010, Alfredo Portes
+  1992-2013, Free Software Foundation, Inc
+  2004-2005, Manuel Bronstein
+  2004-2005, INRIA
+  1988, Leslie Lamport
 License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2011-2013, Igor Pashev <pashev.igor@gmail.com>
 License: BSD-3-clause
 
-Files: ./src/hyper/htsearch.cc
-Copyright: 1991-2002, The Numerical Algorithms Group Ltd
-  2007-2010, Gabriel Dos Reis
-  2009-2010, Alfredo Portes
-License: BSD-3-clause
-
-Files: ./config/install-sh
-Copyright: 1994, X Consortium
-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 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.
+Files: configure.ac
+Copyright: 2006-2013, Gabriel Dos Reis.
+License: BSD-2-clause
 
-Files: ./config/*
- ./configure
+Files: config/*
 Copyright: 1992-2013, Free Software Foundation, Inc
 License: GPL-2+ or BSD-3-clause
  These files are free software; you can redistribute them and/or modify
@@ -62,89 +45,34 @@ License: GPL-2+ or BSD-3-clause
  configuration script generated by Autoconf, you may include it under
  the same distribution terms that you use for the rest of that program.
 
-Files: ./configure.ac
-Copyright: 2006-2013, Gabriel Dos Reis.
-License: BSD-2-clause
-
-Files: ./src/hyper/pages/newuser.ht
- ./src/hyper/pages/numbers.ht
-Copyright: 1988, Leslie Lamport
-  1991-1993, The Numerical Algorithms Group Ltd
-License: BSD-3-clause
-
-Files: ./src/hyper/pages/topics.ht
- ./src/hyper/pages/util.ht
-Copyright: 1988, Leslie Lamport
-  1992-1994, The Numerical Algorithms Group Ltd
-License: BSD-3-clause
-
-Files: ./src/hyper/pages/rootpage.ht
-Copyright: 1988, Leslie Lamport
-  1991-1997, The Numerical Algorithms Group Ltd
-License: BSD-3-clause
-
-Files: ./src/hyper/pages/man0.ht
-Copyright: 1988, Leslie Lamport
-  1991-1994, The Numerical Algorithms Group Ltd
-License: BSD-3-clause
-
-Files: ./src/hyper/pages/CPHelp.ht
- ./src/hyper/pages/algebra.ht
- ./src/hyper/pages/basic.ht
- ./src/hyper/pages/bmcat.ht
- ./src/hyper/pages/evalex.ht
- ./src/hyper/pages/exdiff.ht
- ./src/hyper/pages/exint.ht
- ./src/hyper/pages/exlap.ht
- ./src/hyper/pages/exlimit.ht
- ./src/hyper/pages/exmatrix.ht
- ./src/hyper/pages/explot2d.ht
- ./src/hyper/pages/explot3d.ht
- ./src/hyper/pages/expose.ht
- ./src/hyper/pages/exseries.ht
- ./src/hyper/pages/exsum.ht
- ./src/hyper/pages/function.ht
- ./src/hyper/pages/graphics.ht
- ./src/hyper/pages/grpthry.ht
- ./src/hyper/pages/help.ht
- ./src/hyper/pages/hyperdoc.ht
- ./src/hyper/pages/patch.ht
- ./src/hyper/pages/polys.ht
- ./src/hyper/pages/srchkey.ht
-Copyright: 1988, Leslie Lamport
- 1991, The Numerical Algorithms Group Ltd
-License: BSD-3-clause
-
-Files: ./src/input/pmint.input.pamphlet
-Copyright: 2004-2005, Manuel Bronstein
- 2004-2005, INRIA
-License: BSD-3-clause
-
-Files: ./Makefile.in
- ./src/Makefile.in
- ./src/io/Makefile.in
- ./src/rt/Makefile.in
- ./src/syntax/Makefile.in
-Copyright: 1994-2013, Free Software Foundation, Inc
-  2012-2013, Gabriel Dos Reis
-License: BSD-3-clause
+Files: config/install-sh
+Copyright: 1994, X Consortium
+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 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.
 
-Files: ./src/algebra/Makefile.in
-Copyright: 1991-2002, The Numerical Algorithms Group Ltd
-  1994-2013, Free Software Foundation, Inc
-  2007-2013, Gabriel Dos Reis
-License: BSD-3-clause
+Files: config/mkinstalldirs
+Copyright: 1993, Noah Friedman <friedman@prep.ai.mit.edu>
+License: public-domain
+ No license required for any purpose; the work is not subject to copyright
+ in any jurisdiction.
 
 License: BSD-3-clause
- OpenAxiom is derived from AXIOM, which was released as open source
- under the BSD-style license.  All changes to OpenAxiom have been
- released open source under the BSD-style license reproduced below.
- .
- Portions Copyright (C) 2007-2011, Gabriel Dos Reis
- Portions Copyright (C) 2003-2007, The Axiom Team
- Portions Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
- All rights reserved.
- .
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:
@@ -174,8 +102,6 @@ License: BSD-3-clause
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 License: BSD-2-clause
- All rights reserved.
- .
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met: