[med-svn] r7438 - trunk/packages/circos/trunk/debian

[Charles Plessy]

Author: plessy
Date: 2011-08-13 13:54:34 +0000 (Sat, 13 Aug 2011)
New Revision: 7438

Modified:
   trunk/packages/circos/trunk/debian/copyright
Log:
Made parsable with config-edit -application dpkg-copyright

Plus a little bit of reorganisation.


Modified: trunk/packages/circos/trunk/debian/copyright
===================================================================
--- trunk/packages/circos/trunk/debian/copyright	2011-08-13 13:44:21 UTC (rev 7437)
+++ trunk/packages/circos/trunk/debian/copyright	2011-08-13 13:54:34 UTC (rev 7438)
@@ -1,7 +1,11 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: circos
-Source: http://circos.ca/
+Source: http://circos.ca/distribution/circos-0.55.tgz
 
+Files: *
+Copyright: Copyright 2004-2011 Martin Krzywinski
+License: GPL-2+
+
 Files: fonts/circles/circlethings.*
 Copyright: 2003 Fonts & Things
 License: Circle-Things
@@ -41,7 +45,7 @@
  http://www.fontsnthings.com/contact.html
  .
  Macintosh conversions are allowed according to the above provisions.
- 
+ .
  This font contains 62 characters: use keys 1 through 0, a through z and
  A through Z (upper case).
  .
@@ -52,7 +56,6 @@
  Fonts & Things
  "the most unusual fonts online"
 
-Comment: See http://bugs.debian.org/620537
 Files: fonts/modern/*
 Copyright: 2005, Andrey V. Panov
 License: X11 with fonts exception
@@ -89,11 +92,11 @@
  X11 License. If you modify these fonts, you may extend this exception to
  your version of the fonts, but you are not obligated to do so. If you do
  not wish to do so, delete this exception statement from your version.
+Comment: See http://bugs.debian.org/620537
 
-Comment: upstream license modification agreed by upstream author see http://bugs.debian.org/632174
 Files: fonts/pointers/*
 Copyright: 1995 Russ Rowlett <rowlett at email.unc.edu>
-License: SIL Open Font License 1.1
+License: OFL-1.1
  This Font Software is licensed under the SIL Open Font License, Version 1.1.
  This license is copied below, and is also available with a FAQ at:
  http://scripts.sil.org/OFL
@@ -176,6 +179,7 @@
  DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
  OTHER DEALINGS IN THE FONT SOFTWARE.
+Comment: upstream license modification agreed by upstream author see http://bugs.debian.org/632174
 
 Files: fonts/shapes/*
 Copyright: 2001 Fonts & Things
@@ -205,15 +209,13 @@
  # by a GPL glyph font designed by Martin Krzywinski
  # for Circos.
 
-
-
 Files: etc/brewer.*
 Copyright: Cynthia A. Brewer, Mark Harrower, Pennsylvania State University
-License: Apache v2.0
+License: Apache-2.0
  License description is found in /usr/share/common-licenses/Apache-2.0
 
-Files: *
-Copyright: Copyright 2004-2011 Martin Krzywinski
+Files: debian/*
+Copyright: 2011 Olivier Sallou <olivier.sallou at irisa.fr>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -231,8 +233,6 @@
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-Files: debian/*
-Copyright: 2011 Olivier Sallou <olivier.sallou at irisa.fr>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by