[DRE-commits] [unicorn] 02/04: update debian/copyright to reflect upstream's license change

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository unicorn.

commit 92759f66838f904d642336ca738bf4ca4bdc74ed
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Thu Nov 7 12:09:02 2013 +0300

    update debian/copyright to reflect upstream's license change
---
 debian/copyright |   24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 6e5bdae..9e81673 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,9 +4,9 @@ Source: http://unicorn.bogomips.org/
 
 Files: *
 Copyright: 2009-2013 \Unicorn project <mongrel-unicorn at rubyforge.org>
-License: Ruby or GPL-2 or GPL-3
+License: Ruby or GPL-2+
 
-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
@@ -28,24 +28,6 @@ License: GPL-2
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-License: GPL-3
- 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 3 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 program.  If not, see <http://www.gnu.org/licenses/>.
- .
- 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-3'.
-
 License: Ruby
  1. You may make and give away verbatim copies of the source form of the
      software without restriction, provided that you duplicate all of the
@@ -104,4 +86,4 @@ License: Ruby
 Files: debian/*
 Copyright: These files ain't copyrighted
 License: public-domain
- These files are in Public Domain..
+ These files are in Public Domain.

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