Format copyright file according to DEP5 rules

1 files changed, 61 insertions, 64 deletions

diff --git a/debian/copyright b/debian/copyright
index f1b0c9d..41453d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Copyright: © 2007-2009, JSR305 expert group
 License: BSD-3-clause
  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, 
@@ -17,7 +17,7 @@ License: BSD-3-clause
      * Neither the name of the JSR305 expert group 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 
@@ -34,7 +34,7 @@ Files: ri/src/main/java/javax/annotation/concurrent/NotThreadSafe.java,
  ri/src/main/java/javax/annotation/concurrent/Immutable.java
  ri/src/main/java/javax/annotation/concurrent/GuardedBy.java
 Copyright: © 2005 Brian Goetz <brian@briangoetz.com>
-License: CC-BY-SA-2.5, CC-BY-SA-3.0
+License: CC-BY-SA-2.5 or CC-BY-SA-3.0
 Comment: Those files are very simple modifications of code included in
  libjcip-annotations-java package. Even though the source code indicates
  is licensed under Creative Commons Attribution License 2.5 (non-free
@@ -43,17 +43,17 @@ Comment: Those files are very simple modifications of code included in
  http://packages.debian.org/changelogs/pool/main/libj/libjcip-annotations-java/current/copyright
  or review the emails exchanged between Brian Goetz and Torsten Werner
  what are shown below:
-
-  Torsten Werner <twerner@debian.org> has got the following emails from
-Brian Goetz about the license change to CC 3.0:
-
+ .
+ Torsten Werner <twerner@debian.org> has got the following emails from
+ Brian Goetz about the license change to CC 3.0:
+ .
   From: Brian Goetz <brian@briangoetz.com>
   To: mail.twerner@googlemail.com
   Subject: Re: license for jcip-annotations-src.jar
   Date: Sat, 16 Aug 2008 17:57:32 -0400
-
+ .
   I don't have any problem with the Attribution-ShareAlike 3.0 license.
-
+ .
   I do have to say, though, that collectively, I find the open-source
   community to be quite difficult in the near-religious degree over which
   licenses are "good" enough.  Over the past twenty years, I've been
@@ -64,7 +64,7 @@ Brian Goetz about the license change to CC 3.0:
   and priorities, but the whole thing tends to leave me with that "no good
   deed goes unpunished" feeling -- that I've tried to give something to
   the world for free, but it somehow isn't enough.
-
+ .
   I offer these thoughts not as a personal criticism, as I know you are
   contributing your effort for the good of the world as well and simply
   trying to follow the policies of your community, but in the hopes that
@@ -75,11 +75,10 @@ Brian Goetz about the license change to CC 3.0:
   Brian", where the various revolutionary groups are so focused on
   undermining each other, that they forget that their common enemy is the
   Romans.)
-
+ .
   Regards,
   -Brian Goetz
-
-
+ .
   Torsten Werner wrote:
   > Dear Mr. Goetz,
   >
@@ -95,17 +94,17 @@ Brian Goetz about the license change to CC 3.0:
   > Best regards,
   > Torsten Werner
   >
-
+ .
   ----------
-
+ .
   From: Brian Goetz <brian@briangoetz.com>
   To: mail.twerner@googlemail.com
   Subject: Re: license for jcip-annotations-src.jar
   Date: Thu, 21 Aug 2008 21:50:44 -0400
-
+ .
   I hereby grant license to the "JCiP Annotations" code contained in
   jcip-annotations-src.jar under the Creative Commons Attribution License.
-
+ .
   Torsten Werner wrote:
   > On Tue, Aug 19, 2008 at 4:20 AM, Brian Goetz <brian@briangoetz.com> wrote:
   >> I'll go with Attribution.  What do you need from me?
@@ -121,29 +120,28 @@ Copyright: © 2010-2011, Miguel Landaeta <miguel@miguel.cc>
 License: public-domain
 
 License: CC-BY-SA-3.0
-
  Attribution 3.0 Unported
-
+ .
  CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
  SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
  RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
  CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
  DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
-
+ .
  License
- 
+ .
  THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
  COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
  COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
  AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
- 
+ .
  BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE
  BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE
  CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE
  IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
- 
+ .
  1. Definitions
- 
+ .
  "Adaptation" means a work based upon the Work, or upon the Work and other
  pre-existing works, such as a translation, adaptation, derivative work,
  arrangement of music or other alterations of a literary or artistic work, or
@@ -155,7 +153,7 @@ License: CC-BY-SA-3.0
  performance or phonogram, the synchronization of the Work in timed-relation
  with a moving image ("synching") will be considered an Adaptation for the
  purpose of this License.
-
+ .
  "Collection" means a collection of literary or artistic works, such as
  encyclopedias and anthologies, or performances, phonograms or broadcasts, or
  other works or subject matter other than works listed in Section 1(f) below,
@@ -166,14 +164,14 @@ License: CC-BY-SA-3.0
  assembled into a collective whole. A work that constitutes a Collection will
  not be considered an Adaptation (as defined above) for the purposes of this
  License.
-
+ .
  "Distribute" means to make available to the public the original and copies of
  the Work or Adaptation, as appropriate, through sale or other transfer of
  ownership.
-
+ .
  "Licensor" means the individual, individuals, entity or entities that offer(s)
  the Work under the terms of this License.
-
+ .
  "Original Author" means, in the case of a literary or artistic work, the
  individual, individuals, entity or entities who created the Work or if no
  individual or entity can be identified, the publisher; and in addition (i) in
@@ -183,7 +181,7 @@ License: CC-BY-SA-3.0
  case of a phonogram the producer being the person or legal entity who first
  fixes the sounds of a performance or other sounds; and, (iii) in the case of
  broadcasts, the organization that transmits the broadcast.
-
+ .
  "Work" means the literary and/or artistic work offered under the terms of this
  License including without limitation any production in the literary,
  scientific and artistic domain, whatever may be the mode or form of its
@@ -200,12 +198,12 @@ License: CC-BY-SA-3.0
  compilation of data to the extent it is protected as a copyrightable work; or
  a work performed by a variety or circus performer to the extent it is not
  otherwise considered a literary or artistic work.
-
+ .
  "You" means an individual or entity exercising rights under this License who
  has not previously violated the terms of this License with respect to the
  Work, or who has received express permission from the Licensor to exercise
  rights under this License despite a previous violation.
-
+ .
  "Publicly Perform" means to perform public recitations of the Work and to
  communicate to the public those public recitations, by any means or process,
  including by wire or wireless means or public digital performances; to make
@@ -215,50 +213,50 @@ License: CC-BY-SA-3.0
  to the public of the performances of the Work, including by public digital
  performance; to broadcast and rebroadcast the Work by any means including
  signs, sounds or images.
-
+ .
  "Reproduce" means to make copies of the Work by any means including without
  limitation by sound or visual recordings and the right of fixation and
  reproducing fixations of the Work, including storage of a protected
  performance or phonogram in digital form or other electronic medium.
-
+ .
  2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit,
  or restrict any uses free from copyright or rights arising from limitations or
  exceptions that are provided for in connection with the copyright protection
  under copyright law or other applicable laws.
- 
+ .
  3. License Grant. Subject to the terms and conditions of this License,
  Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual
  (for the duration of the applicable copyright) license to exercise the rights
  in the Work as stated below:
- 
+ .
  to Reproduce the Work, to incorporate the Work into one or more Collections,
  and to Reproduce the Work as incorporated in the Collections;
-
+ .
  to create and Reproduce Adaptations provided that any such Adaptation,
  including any translation in any medium, takes reasonable steps to clearly
  label, demarcate or otherwise identify that changes were made to the original
  Work. For example, a translation could be marked "The original work was
  translated from English to Spanish," or a modification could indicate "The
  original work has been modified.";
-
+ .
  to Distribute and Publicly Perform the Work including as incorporated in
  Collections; and,
-
+ .
  to Distribute and Publicly Perform Adaptations.
-
+ .
  For the avoidance of doubt:
- 
+ .
  Non-waivable Compulsory License Schemes. In those jurisdictions in which the
  right to collect royalties through any statutory or compulsory licensing
  scheme cannot be waived, the Licensor reserves the exclusive right to collect
  such royalties for any exercise by You of the rights granted under this
  License;
-
+ .
  Waivable Compulsory License Schemes. In those jurisdictions in which the right
  to collect royalties through any statutory or compulsory licensing scheme can
  be waived, the Licensor waives the exclusive right to collect such royalties
  for any exercise by You of the rights granted under this License; and,
-
+ .
  Voluntary License Schemes. The Licensor waives the right to collect royalties,
  whether individually or, in the event that the Licensor is a member of a
  collecting society that administers voluntary licensing schemes, via that
@@ -268,10 +266,10 @@ License: CC-BY-SA-3.0
  modifications as are technically necessary to exercise the rights in other
  media and formats. Subject to Section 8(f), all rights not expressly granted
  by Licensor are hereby reserved.
- 
+ .
  4. Restrictions. The license granted in Section 3 above is expressly made
  subject to and limited by the following restrictions:
- 
+ .
  You may Distribute or Publicly Perform the Work only under the terms of this
  License. You must include a copy of, or the Uniform Resource Identifier (URI)
  for, this License with every copy of the Work You Distribute or Publicly
@@ -291,7 +289,7 @@ License: CC-BY-SA-3.0
  credit as required by Section 4(b), as requested. If You create an Adaptation,
  upon notice from any Licensor You must, to the extent practicable, remove from
  the Adaptation any credit as required by Section 4(b), as requested.
-
+ .
  If You Distribute, or Publicly Perform the Work or any Adaptations or
  Collections, You must, unless a request has been made pursuant to Section
  4(a), keep intact all copyright notices for the Work and provide, reasonable
@@ -320,7 +318,7 @@ License: CC-BY-SA-3.0
  Parties, as appropriate, of You or Your use of the Work, without the separate,
  express prior written permission of the Original Author, Licensor and/or
  Attribution Parties.
-
+ .
  Except as otherwise agreed in writing by the Licensor or as may be otherwise
  permitted by applicable law, if You Reproduce, Distribute or Publicly Perform
  the Work either by itself or as part of any Adaptations or Collections, You
@@ -334,9 +332,9 @@ License: CC-BY-SA-3.0
  this Section, to the fullest extent permitted by the applicable national law,
  to enable You to reasonably exercise Your right under Section 3(b) of this
  License (right to make Adaptations) but not otherwise.
-
+ .
  5. Representations, Warranties and Disclaimer
- 
+ .
  UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
  THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
  CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING,
@@ -345,22 +343,22 @@ License: CC-BY-SA-3.0
  DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT
  DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED
  WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
- 
+ .
  6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW,
  IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY
  SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT
  OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF
  THE POSSIBILITY OF SUCH DAMAGES.
- 
+ .
  7. Termination
- 
+ .
  This License and the rights granted hereunder will terminate automatically
  upon any breach by You of the terms of this License. Individuals or entities
  who have received Adaptations or Collections from You under this License,
  however, will not have their licenses terminated provided such individuals or
  entities remain in full compliance with those licenses. Sections 1, 2, 5, 6,
  7, and 8 will survive any termination of this License.
-
+ .
  Subject to the above terms and conditions, the license granted here is
  perpetual (for the duration of the applicable copyright in the Work).
  Notwithstanding the above, Licensor reserves the right to release the Work
@@ -369,34 +367,34 @@ License: CC-BY-SA-3.0
  License (or any other license that has been, or is required to be, granted
  under the terms of this License), and this License will continue in full force
  and effect unless terminated as stated above.
-
+ .
  8. Miscellaneous
- 
+ .
  Each time You Distribute or Publicly Perform the Work or a Collection, the
  Licensor offers to the recipient a license to the Work on the same terms and
  conditions as the license granted to You under this License.
-
+ .
  Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to
  the recipient a license to the original Work on the same terms and conditions
  as the license granted to You under this License.
-
+ .
  If any provision of this License is invalid or unenforceable under applicable
  law, it shall not affect the validity or enforceability of the remainder of
  the terms of this License, and without further action by the parties to this
  agreement, such provision shall be reformed to the minimum extent necessary to
  make such provision valid and enforceable.
-
+ .
  No term or provision of this License shall be deemed waived and no breach
  consented to unless such waiver or consent shall be in writing and signed by
  the party to be charged with such waiver or consent.
-
+ .
  This License constitutes the entire agreement between the parties with respect
  to the Work licensed here. There are no understandings, agreements or
  representations with respect to the Work not specified here. Licensor shall
  not be bound by any additional provisions that may appear in any communication
  from You. This License may not be modified without the mutual written
  agreement of the Licensor and You.
-
+ .
  The rights granted under, and the subject matter referenced, in this License
  were drafted utilizing the terminology of the Berne Convention for the
  Protection of Literary and Artistic Works (as amended on September 28, 1979),
@@ -410,10 +408,9 @@ License: CC-BY-SA-3.0
  not granted under this License, such additional rights are deemed to be
  included in the License; this License is not intended to restrict the license
  of any rights under applicable law.
-
-
+ .
  Creative Commons Notice
- 
+ .
  Creative Commons is not a party to this License, and makes no warranty
  whatsoever in connection with the Work. Creative Commons will not be liable to
  You or any party on any legal theory for any damages whatsoever, including
@@ -421,7 +418,7 @@ License: CC-BY-SA-3.0
  arising in connection to this license. Notwithstanding the foregoing two (2)
  sentences, if Creative Commons has expressly identified itself as the Licensor
  hereunder, it shall have all rights and obligations of Licensor.
- 
+ .
  Except for the limited purpose of indicating to the public that the Work is
  licensed under the CCPL, Creative Commons does not authorize the use by either
  party of the trademark "Creative Commons" or any related trademark or logo of
@@ -430,5 +427,5 @@ License: CC-BY-SA-3.0
  trademark usage guidelines, as may be published on its website or otherwise
  made available upon request from time to time. For the avoidance of doubt,
  this trademark restriction does not form part of this License.
- 
+ .
  Creative Commons may be contacted at http://creativecommons.org/.