[DRE-commits] [SCM] cucumber.git branch, master, updated. debian/1.0.2-1-2-gccf763b

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 321218e62d62a922786db8ef946b27ed74fb4484
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Mon Aug 15 11:52:11 2011 -0700

    Properly fill in debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 6034a74..07ef57f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,58 @@
-FIXME. fill-in with DEP5 copyright file. http://dep.debian.net/deps/dep5/
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: cucumber
-Source: FIXME (URL where source can be downloaded)
+Source: https://github.com/cucumber/cucumber
 
 Files: *
-Copyright: Copyright 1998 John Doe <jdoe at example.com>
-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
- version.
+Copyright: (c) 2008,2009,2010,2011 Aslak Hellesøy.
+License:
+ 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.
  .
- 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 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.
+
+Files: lib/cucumber/formatter/jquery-min.js
+Copyright:
+ Copyright 2010, John Resig
+ Copyright 2010, The Dojo Foundation
+License:
+ Dual licensed under the MIT or GPL Version 2 licenses.
+ http://jquery.org/license
  .
- 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
+ Includes Sizzle.js
+ http://sizzlejs.com/
+ Copyright 2010, The Dojo Foundation
+ Released under the MIT, BSD, and GPL Licenses.
+
+Files: legacy_features/html_formatter/a.html
+Copyright: 
+ Copyright 2010, John Resig
+ Copyright 2010, The Dojo Foundation
+License:
+ Dual licensed under the MIT or GPL Version 2 licenses.
+ http://jquery.org/license
  .
- 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'.
+ Includes Sizzle.js
+ http://sizzlejs.com/
+ Copyright 2010, The Dojo Foundation
+ Released under the MIT, BSD, and GPL Licenses.
+This is actually a HTML file which includes jQuery.
 
 Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
+Copyright: © 2011 Antonio Terceiro <terceiro at debian.org>
 License:
- [LICENSE TEXT]
+ The Debian packaging for cucumber is licensed under the same terms as cucumber
+ itself.

-- 
cucumber.git