[DRE-commits] [SCM] ruby-text.git branch, master, updated. upstream/1.0.3-20-g2df642a

Thu Jun 21 12:35:12 UTC 2012

The following commit has been merged in the master branch:
commit 4dada50fe36ff300c21ad7b66dd8f9571c070ea1
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Jun 21 14:34:00 2012 +0200

    update copyright file to DEP-5 copyright-format/1.0

diff --git a/debian/copyright b/debian/copyright
index 5ecb806..3436851 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,44 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: text
 Source: http://github.com/threedaymonk/text
 
+Files: *
+Copyright: 2009 Paul Battley
+           2009 Michael Neumann
+           2009 Tim Fletcher
+License: GPL-2 or Ruby
+
+Files: lib/text/porter_Stemming
+Copyright: 2003 Ray Pereda <raypereda at hotmail.com>
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without modification, are
+ permitted provided that the following conditions are met:
+ .
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+ .
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ The views and conclusions contained in the software and documentation are those of the
+ authors and should not be interpreted as representing official policies, either expressed
+ or implied, of copyright holder.
+
+Files: debian/*
+Copyright: 2011  <olivier.sallou at irisa.fr>
+License: GPL-2 or Ruby
+
 License: GPL-2
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -29,14 +66,14 @@ License: Ruby
  .
        a) place your modifications in the Public Domain or otherwise
           make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
+   modifications to Usenet or an equivalent medium, or by allowing
+   the author to include your modifications in the software.
  .
        b) use the modified software only within your corporation or
           organization.
  .
        c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
+   with standard executables, which must also be provided.
  .
        d) make other distribution arrangements with the author.
  .
@@ -44,11 +81,11 @@ License: Ruby
      form, provided that you do at least ONE of the following:
  .
        a) distribute the executables and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
+   together with instructions (in the manual page or equivalent)
+   on where to get the original distribution.
  .
        b) accompany the distribution with the machine-readable source of
-	  the software.
+   the software.
  .
        c) give non-standard executables non-standard names, with
           instructions on where to get the original software distribution.
@@ -74,40 +111,3 @@ License: Ruby
      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
      PURPOSE.
 
-Files: *
-Copyright: 2009 Paul Battley
-           2009 Michael Neumann
-           2009 Tim Fletcher
-License: GPL-2 or Ruby
-
-Files: lib/text/porter_Stemming
-Copyright: 2003 Ray Pereda <raypereda at hotmail.com>
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
- .
-   1. Redistributions of source code must retain the above copyright notice, this list of
-      conditions and the following disclaimer.
- .
-   2. Redistributions in binary form must reproduce the above copyright notice, this list
-      of conditions and the following disclaimer in the documentation and/or other materials
-      provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- .
- The views and conclusions contained in the software and documentation are those of the
- authors and should not be interpreted as representing official policies, either expressed
- or implied, of copyright holder.
-
-Files: debian/*
-Copyright: 2011  <olivier.sallou at irisa.fr>
-License: GPL-2 or Ruby
-

-- 
ruby-text.git

