[SCM] library of programs for modular symbols and elliptic curves over Q branch, master, updated. upstream/2012-06-01-13-ga0b2d52

[Julien Puydt]

The following commit has been merged in the master branch:
commit a0b2d52d685735bfe8b2838e5f1d62006670a355
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Mon Jun 18 20:48:17 2012 +0200

    Rewrote debian/copyright to be machine-readable (hopefully)

diff --git a/debian/copyright b/debian/copyright
index 7661cd1..928bd94 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,56 +1,49 @@
-This package was debianized by Julien Puydt <julien.puydt at laposte.net> in 2012.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: EClib
+Upstream-Contact: John Cremona
+Source: http://code.google.com/p/eclib/
 
-Upstream Author: John Cremona
+Files: *
+Copyright: 1990-2012, John Cremona
+License: LGPL-2+
+ mwrank is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+ .
+ mwrank is distributed in the hope that it will be useful, 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with mwrank; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ .
+ On Debian systems, the complete text of the GNU Library General Public
+ License can be found in `/usr/share/common-licenses/LGPL-2'
 
-Copyright: (C) 1990-2012 John Cremona
+Files: libsrc/GetOpt.cc
+Copyright: 1987, 1989 Free Software Foundation, Inc.
+License: LGPL-2+
+ (Modified by Douglas C. Schmidt for use with GNU G++.)
+ This file is part of the GNU C++ Library.  This library is free
+ software; you can redistribute it and/or modify it under the terms of
+ the GNU Library General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your
+ option) any later version.  This library is distributed in the hope
+ that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU Library General Public License for more details.
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU Library General Public
+ License can be found in `/usr/share/common-licenses/LGPL-2'
 
-Upstream's COPYING is the text of the GNU GENERAL PUBLIC LICENCE,
-Version 3, 29 June 2007. On Debian systems, the complete text of the
-GNU General Public License can be found in
-`/usr/share/common-licenses/GPL-3'.
-
-In addition, the source files have the following licence grant (where
-sometimes the package is only named "mwrank") :
-//////////////////////////////////////////////////////////////////////////
-//
-// Copyright 1990-2012 John Cremona
-//
-// This file is part of the mwrank/g0n package.
-//
-// mwrank is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2 of the License, or (at your
-// option) any later version.
-//
-// mwrank is distributed in the hope that it will be useful, 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.
-//
-// You should have received a copy of the GNU General Public License
-// along with mwrank; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-//////////////////////////////////////////////////////////////////////////
-
-Finally, the file libsrc/GetOpt.cc has:
-/*
-Getopt for GNU.
-Copyright (C) 1987, 1989 Free Software Foundation, Inc.
-
-(Modified by Douglas C. Schmidt for use with GNU G++.)
-This file is part of the GNU C++ Library.  This library is free
-software; you can redistribute it and/or modify it under the terms of
-the GNU Library General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your
-option) any later version.  This library is distributed in the hope
-that it will be useful, but WITHOUT ANY WARRANTY; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free Software
-Foundation, 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-On Debian systems, the complete text of the GNU Library General Public
-License can be found in `/usr/share/common-licenses/LGPL-2'
+Files: debian/*
+Copyright: 2012, Julien Puydt <julien.puydt at laposte.net>
+License: LGPL-2+
+ On Debian systems, the complete text of the GNU Library General Public
+ License can be found in `/usr/share/common-licenses/LGPL-2'

-- 
library of programs for modular symbols and elliptic curves over Q