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

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 614ca772ee96c2f897625494a3f1cb2658231170
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Jun 21 15:08:20 2012 +0200

    update copyright file to take into account jsquery

diff --git a/debian/copyright b/debian/copyright
index 1a9a736..2442c09 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,24 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: cucumber
 Source: https://github.com/cucumber/cucumber
 
 Files: *
 Copyright: (c) 2008,2009,2010,2011 Aslak Hellesøy.
-License:
+License: Expat
+
+Files: debian/*
+Copyright: © 2011 Antonio Terceiro <terceiro at debian.org>
+License: Expat
+
+Files: lib/cucumber/formatter/jquery-min.js legacy_features/html_formatter/a.html debian/jquery-1.4.2.js
+Copyright: 
+ Copyright 2010, John Resig
+ Copyright 2010, The Dojo Foundation
+License: Expat or GPL-2
+Comment: the two first files contain a minified version of the javascript library jquery,
+ which is shipped in debian/jquery-1.4.2.js
+
+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
@@ -24,39 +38,19 @@ License:
  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
+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.
  .
- Includes Sizzle.js
- http://sizzlejs.com/
- Copyright 2010, The Dojo Foundation
- Released under the MIT, BSD, and GPL Licenses.
-Comment:
- On Debian systems, the complete text of the GNU General Public License version
- 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-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
+ 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.
  .
- 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: © 2011 Antonio Terceiro <terceiro at debian.org>
-License:
- The Debian packaging for cucumber is licensed under the same terms as cucumber
- itself.
+ 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'.

-- 
cucumber.git