[DRE-commits] [SCM] ruby-text.git branch, master, updated. upstream/0.2.0-5-g010876b

[Olivier Sallou]

The following commit has been merged in the master branch:
commit 010876b114d0a0a4fbb24783fc33317326fb3808
Author: Olivier Sallou <olivier.sallou at irisa.fr>
Date:   Tue Oct 4 14:03:31 2011 +0200

    fix copyright pedantic warnings

diff --git a/debian/control b/debian/control
index fe7675e..af2bfee 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ruby-text
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders:  Olivier Sallou <olivier.sallou at irisa.fr>
+Uploaders: Olivier Sallou <olivier.sallou at irisa.fr>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.10~)
 Standards-Version: 3.9.2
@@ -15,8 +15,8 @@ Package: ruby-text
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Description: Collection of text algorithms
+Description: Collection of text algorithms for Ruby
  A collection of text algorithms: Levenshtein, Soundex,
-  Metaphone, Double Metaphone, Figlet, Porter Stemming
+ Metaphone, Double Metaphone, Figlet, Porter Stemming.
  Library can be used to extend String and compare strings
  with errors or other algos.
diff --git a/debian/copyright b/debian/copyright
index ee7e9b2..bebfea2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,8 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: text
 Source: http://github.com/threedaymonk/text
 
-Files: *
-Copyright: 2009 Paul Battley
-           2009 Michael Neumann
-           2009 Tim Fletcher
-License: GPL-2+
+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
@@ -19,36 +15,17 @@ License: GPL-2+
  PURPOSE.  See the GNU General Public License for more
  details.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
+Files: *
+Copyright: 2009 Paul Battley
+           2009 Michael Neumann
+           2009 Tim Fletcher
+License: GPL-2
+
 Files: debian/*
 Copyright: 2011  <olivier.sallou at irisa.fr>
-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 (at your option) any later
- version.
- .
- This program 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 this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+License: GPL-2
 

-- 
ruby-text.git