[DRE-commits] [SCM] ruby-http-parser.rb.git branch, master, updated. upstream/0.5.3-21-gb0f8f0b

[Per Andersson]

The following commit has been merged in the master branch:
commit df25f44ef58ba3c2e6fab5112ea0b3327f7c4b85
Author: Per Andersson <avtobiff at gmail.com>
Date:   Mon Jun 17 02:00:06 2013 +0200

    Add debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 82beb6c..5e90c2d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,32 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: http_parser.rb
-Source: FIXME <http://example.com/>
+Source: http://github.com/tmm1/http_parser.rb
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2010-2013 Aman Gupta <aman at tmm1.net>
+           2009-2010 Marc-André Cournoyer <macournoyer at gmail.com>
+License: MIT
 
 Files: debian/*
-Copyright: 2013 Praveen Arimbrathodiyil <praveen at debian.org>
-License: GPL-2+ (FIXME)
-Comment: the Debian packaging is licensed under the same terms as the original package.
+Copyright: 2013 Praveen Arimbrathodiyil <praveen at debian.org>,
+           2013 Per Andersson <avtobiff at gmail.com>
+License: MIT
 
-License: GPL-2+ (FIXME)
- 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.
+License: MIT
+ 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:
  .
- 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.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
  .
- 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'.
+ 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.

-- 
ruby-http-parser.rb.git