[blitz++] 14/18: DEP5 issues

[Jerome Benoit]

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

calculus-guest pushed a commit to annotated tag debian/0.10-1
in repository blitz++.

commit 2ef77489473df0182bbf9ea261c4193eebe4daf9
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jun 15 11:41:52 2012 +0000

    DEP5 issues
---
 changelog |  1 +
 copyright | 43 ++++++++++++++++++++++---------------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/changelog b/changelog
index 839d12f..f9c2e37 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,7 @@ blitz++ (1:0.9-13) UNRELEASED; urgency=low
       them automatically to build twice in a row successfully
   * debian/{libblitz-doc.examples,libblitz0-dev.install}: Do not use
     brace expansion
+  * debian/copyright: Fix DEP5 issues
 
  -- Andreas Tille <tille at debian.org>  Fri, 15 Jun 2012 11:37:15 +0200
 
diff --git a/copyright b/copyright
index 77d3b4e..0a660be 100644
--- a/copyright
+++ b/copyright
@@ -1,16 +1,29 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?sc=1
-Name: Blitz++
-Maintainer: Todd Veldhuizen <tveldhui at acm.org>,
-            Julian Cummings <cummings at valhalla.cacr.caltech.edu>
-            No new version since October 2005 (no active upstream maintainer any more)
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Blitz++
+Upstream-Contact: Todd Veldhuizen <tveldhui at acm.org>,
+                  Julian Cummings <cummings at valhalla.cacr.caltech.edu>
+                  No new version since October 2005 (no active upstream maintainer any more)
 Source: http://www.oonumerics.org/blitz/
 
+Files: *
 Copyright: © 1997 - 2002 Todd Veldhuizen
            © 2002 - 2005 Todd Veldhuizen, Julian Cummings and others
-License: GPL-2+ or Artistic License
- GPL-2+:
- =======
+License: GPL-2+ or Artistic
+
+Files: debian/*
+Copyright: © 1998-2000 John Lapeyre <lapeyre at physics.arizona.edu>,
+             2000-2007 Konstantinos Margaritis <markos at debian.org>,
+             2007-2009 Andreas Tille <tille at debian.org>
+License: GPL-2+
+
+License: Artistic
+ This program is free software; you can redistribute it and/or
+ modify it under the same terms as Perl itself.
  .
+ The complete text of the Artistic license can be found in
+ `/usr/share/common-licenses/Artistic`.
+
+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
  the Free Software Foundation; either version 2 of the License, or
@@ -25,18 +38,6 @@ License: GPL-2+ or Artistic License
  with this program; if not, write to the Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  .
- Artistic License:
- =================
- .
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
-X-Comment: On Debian systems, the complete text of the GNU General Public
+ On Debian systems, the complete text of the GNU General Public
  License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
- The complete text of the Artistic license can be found in
- `/usr/share/common-licenses/Artistic`.
 
-Files: debian/*
-Copyright: © 1998-2000 John Lapeyre <lapeyre at physics.arizona.edu>,
-             2000-2007 Konstantinos Margaritis <markos at debian.org>,
-             2007-2009 Andreas Tille <tille at debian.org>
-License: Same as Blitz++

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