[DRE-commits] [SCM] ruby-treetop.git branch, master, updated. upstream/1.4.10-9-g7290aab

[Carl Worth]

The following commit has been merged in the master branch:
commit 4a41c00c044507415c0e83e4b19892a7daddfb2d
Author: Carl Worth <cworth at debian.org>
Date:   Tue Feb 28 15:18:57 2012 -0800

    copyright: Add the correct license information and a pointer to upstream source
    
    It's not too surprising that gem2deb inserts a FIXME for the licensing
    of the software, but it's a bit disconcerting that it puts in text for
    an actual license (rather than *just* the FIXME). Fix gem2deb's guess
    of GPL-2+ by using the actual license (that of Expat) from the file
    LICENSE.

diff --git a/debian/copyright b/debian/copyright
index 8651eca..caab25d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,31 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: treetop
-Source: FIXME <http://example.com/>
+Source: http://treetop.rubyforge.org/
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-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.
- .
- 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'.
+Copyright: 2007 Nathan Sobo
+License: Expat
 
 Files: debian/*
 Copyright: 2012  <cworth at debian.org>
-License:
- [LICENSE TEXT]
+License: Expat
+
+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.
+

-- 
ruby-treetop.git