[DRE-commits] [SCM] ruby-diff-lcs.git branch, master, updated. upstream/1.1.3-27-g7ceffbf

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit d93217fbdd985b21ee22077c7b1cc4b5ea68907f
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue May 7 16:22:38 2013 +0200

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

diff --git a/debian/copyright b/debian/copyright
index 903e9f7..85e0050 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,31 +1,48 @@
-This package was debianized by Sebastien Delafond <seb at debian.org> on
-Sun, 11 May 2008 10:38:20 -0700
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: diff-lcs
+Source: https://github.com/halostatue/diff-lcs
+
+Files: *
+Copyright: 2004-2013 Austin Ziegler
+License: Artistic or Expat or GPL-2
+
+Files: debian/*
+Copyright: 2011 Lucas Nussbaum <lucas at debian.org>
+           2013 Cédric Boutillier <boutil at debian.org>
+License: Artistic or Expat or GPL-2
+
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian systems, the complete text of the Artistic License can be
+ found in '/usr/share/common-licenses/Artistic'.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+
+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; version 2 dated June, 1991.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in '/usr/share/common-licenses/GPL-2'.
 
-It was downloaded from <URL:http://raa.ruby-lang.org/project/diff-lcs>
-
-Upstream author: Austin Ziegler
-
-Copyright:
-
-  Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
-  adapted from:
-    Algorithm::Diff (Perl) by Ned Konz <perl at bike-nomad.com>
-    Smalltalk by Mario I. Wolczko <mario at wolczko.com>
-  implements McIlroy-Hunt diff algorithm
-
-  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
-  the Free Software Foundation; version 2 dated June, 1991.
-
-  This package 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 complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.

-- 
ruby-diff-lcs.git