[DRE-commits] [ruby-htmlentities] 05/07: d/copyright updated, DEP5-compliant

[Caitlin Matos]

This is an automated email from the git hooks/post-receive script.

cm-guest pushed a commit to branch master
in repository ruby-htmlentities.

commit 5d6307d5b379e4359360a5a9f4e70e78107e73e6
Author: Caitlin Matos <caitlin.matos at zoho.com>
Date:   Mon Jul 28 12:25:35 2014 -0400

    d/copyright updated, DEP5-compliant
---
 debian/copyright | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index aad7351..05884cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,15 +3,17 @@ Upstream-Name: htmlentities
 Source: http://rubyforge.org/projects/htmlentities/
 
 Files: *
-Copyright: © 2005-2009 Paul Battley <pbattley at gmail.com>
-License: MIT
+Copyright: 2005-2014 Paul Battley <pbattley at gmail.com>
+License: Expat
 
 Files: debian/*
-Copyright: © 2008-2011 Jeremy Lainé <jeremy.laine at m4x.org>,
-	   © 2011 Gunnar Wolf <gwolf at debian.org>
+Copyright: 2014 Caitlin Matos <caitlin.matos at zoho.com>
+           2014 Jonas Genannt <jonas at brachium-system.net>
+           2011 Gunnar Wolf <gwolf at debian.org>
+           2008-2011 Jeremy Lainé <jeremy.laine at m4x.org>
 License: GPL-2+
 
-License: MIT
+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
@@ -31,23 +33,18 @@ License: MIT
  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; either
- version 2 of the License, or (at your option) any later
+ 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.
+ 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
+ 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'.
+ 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'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-htmlentities.git