Updated d/copyright

2 files changed, 22 insertions, 64 deletions

diff --git a/debian/changelog b/debian/changelog
index 7121b5c..5ee7452 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,9 +18,10 @@ open-axiom (1.5.0~svn3056-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
   * Bump standards version 3.9.3 → 3.9.4, no changes
 
- -- Igor Pashev <pashev.igor@gmail.com>  Thu, 31 Oct 2013 17:42:51 +0400
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 02 Nov 2013 21:32:54 +0400
 
 open-axiom (1.4.1+svn~2626-2) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index a71d8c7..4ceefe0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,41 +1,39 @@
-This package was debianized by Igor Pashev <pashev.igor@gmail.com>
-on Sat, 03 Sep 2011 03:19:50 +0400.
-
-It was downloaded from (SVN) https://open-axiom.svn.sf.net/svnroot/open-axiom
-
-Upstream Authors: Gabriel Dos Reis <gdr@cs.tamu.edu>, et.al.
-
-
+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>
+Copyright: 1991-2002, The Numerical ALgorithms Group Ltd
+  2003-2007, The Axiom Team
+  2007-2013, Gabriel Dos Reis
+License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2011, Igor Pashev <pashev.igor@gmail.com>
+Copyright: 2013, Igor Pashev <pashev.igor@gmail.com>
 License: WTFPL-2
             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE 
                     Version 2, December 2004 
-
+ .
  Copyright (C) 2004 Sam Hocevar <sam@hocevar.net> 
-
+ .
  Everyone is permitted to copy and distribute verbatim or modified 
  copies of this license document, and changing it is allowed as long 
  as the name is changed. 
-
+ .
             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE 
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
-
+ .
   0. You just DO WHAT THE FUCK YOU WANT TO. 
 
-
-
 Files: contrib/windows-installer/*
 Copyright: 2007-2011, Dan Martens <dan_martens@lycos.com>
  Bill Page <bill.page1@sympatico.ca>
  Alfredo Portes <alfredo.portes@gmail.com>
-License: Modified BSD License
+License: BSD-3-clause
 
 Files: contrib/texmacs/src/texbreaker.c
  contrib/texmacs/src/useproto.h
 Copyright: 1991, Robert S. Sutor
-License: Modified BSD License
+License: BSD-3-clause
 
 Files: contrib/texmacs/src/tm_openaxiom.c
 Copyright: 2004, Bill Page <bill.page1@sympatico.ca>
@@ -51,50 +49,9 @@ Files: contrib/texmacs/packages/session/openaxiom.ts
 Copyright: 2002-2004, Joris van der Hoeven
 License: GPL-3
 
-Comment:
- On Debian systems the 'GNU General Public License' version 3 is located
- in '/usr/share/common-licenses/GPL-3'.
- .
- You should have received a copy of the 'GNU General Public License'
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-
-License: 
- 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:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - 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.
-
- - Neither the name of The Numerical Algorithms Group Ltd. nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER
- OR CONTRIBUTORS 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: ./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