Finish conversion of debian/copyright to machine-readable format 1.0

diff --git a/debian/copyright b/debian/copyright
index 930e22f138524071b0776cf18b7a4a3e727b06b5..9b11f8f516a2ea8c7bce40dca2dcd97546f36d1d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,13 @@
-Author: Alexey Balakin <mathgl.abalakin@gmail.com>
-Download: http://mathgl.sourceforge.net/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: MathGL
+Upstream-Contact: Alexey Balakin <mathgl.abalakin@gmail.com>
+Source: http://mathgl.sourceforge.net/
 
 Files: *
-Copyright:
- (C) 2007 Alexey Balakin <mathgl.abalakin@gmail.com>
- (C) 2008 Dmitry Kulagin <dik@kulagin.nnov.ru>
- (C) 2008 Michail Vidiassov
- (C) 2007-2008 Sergey Plis
+Copyright: (C) 2007 Alexey Balakin <mathgl.abalakin@gmail.com>
+           (C) 2008 Dmitry Kulagin <dik@kulagin.nnov.ru>
+           (C) 2008 Michail Vidiassov
+           (C) 2007-2008 Sergey Plis
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify it
  under the terms of the GNU Library General Public License as published by
@@ -19,18 +20,20 @@ License: GPL-2+
 
 Files: texinfo/*
 Copyright: (C) 2008 Alexey Balakin <mathgl.abalakin@gmail.com>
-License: GFDL-1.2+
+License: GFDL-NIV-1.2+
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.2
  or any later version published by the Free Software Foundation;
  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
  Texts.  A copy of the license is included in the section entitled ``GNU
  Free Documentation License.''
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU Free Documentation
+ License can be found in `/usr/share/common-licenses/GFDL-1.2'.
 
 Files: debian/*
-Copyright: 
- (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
- (C) 2010 Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
+Copyright: (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+           (C) 2010 Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
 License: GPL-2+.
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -41,9 +44,6 @@ License: GPL-2+.
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
-
-On Debian GNU/Linux systems, the complete text of the GNU Free Documentation
-License can be found in `/usr/share/common-licenses/GFDL-1.2'.
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL-2'.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL-2'.