[SCM] Debian packaging of jifty branch, master, updated. debian/1.10518+dfsg-1-5-gab1be0f

Tue Mar 6 19:12:21 UTC 2012

The following commit has been merged in the master branch:
commit ab1be0f0d609ef13f0cdb166de3b5a5e55b812ee
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Mar 6 19:48:13 2012 +0100

    copyright-format 1.0 syntax polishing
    
    Git-Dch: Ignore

diff --git a/debian/copyright b/debian/copyright
index 68f662a..ae0cd01 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Jifty
 Upstream-Contact: Jesse Vincent, Alex Vandiver and David Glasser.
 Source: http://search.cpan.org/dist/Jifty/
-Upstream-Name: Jifty
-X-Comment: the +dfsg version is produced by removing the non-free
+Comment: the +dfsg version is produced by removing the non-free
  share/web/static/js/json.js
 
 Files: *
@@ -31,7 +31,9 @@ Files: share/web/static/js/iutil.js
 Copyright: 2006, Stefan Petre
 License: MIT
 
-Files: */share/web/static/[css|js|images]/yui/* 
+Files: */share/web/static/css/yui/*
+ */share/web/static/js/yui/*
+ */share/web/static/images/yui/*
 Copyright: 2007, Yahoo! Inc.
 License: BSD-like
  This files are a selection of 8 js files with patch of yui v2.4.1
@@ -71,11 +73,11 @@ License: BSD-like
 
 Files: share/web/static/js/jquery-1.4.1.js
 Copyright: 2010, John Resig (jquery.com)
-License: GPL or MIT 	 
-  	 
+License: GPL-2 or MIT
+
 Files: t/TestApp-JiftyJS/share/web/static/js-test/lib/DOM/Events.js
 Copyright: 2005, Justin Constantino. All rights reserved. 	 
-License: LGPL 	 
+License: LGPL-2
 
 Files: share/web/static/js/rico.js
 Copyright: 2005, Sabre Airline Solutions
@@ -97,12 +99,12 @@ License: MIT or GPL-1+
 
 Files: share/plugins/Jifty/Plugin/Prototypism/web/static/js/prototypism/scriptaculous/*
 Copyright: 2005-2007 Thomas Fuchs 	 
-License: MIT 	 
+License: MIT
 
 Files: share/plugins/Jifty/Plugin/Prototypism/web/static/js/prototypism/scriptaculous/slider.js
 Copyright: 2005-2007 Marty Haught
  2005-2007, Thomas Fuchs 
-License: MIT 	 
+License: MIT
 
 Files: examples/Yada/share/web/static/js/Asynapse/REST.js
 Copyright: 2007, Kang-min Liu <gugod at gugod.org>
@@ -121,7 +123,7 @@ Copyright: 2007, Brian Dillard and Brad Neuberg
 License: other-BSD
  Brian Dillard | Project Lead | bdillard at pathf.com | http://blogs.pathf.com/agileajax/
  Brad Neuberg | Original Project Creator | http://codinginparadise.org
-
+ .
  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
@@ -129,10 +131,10 @@ License: other-BSD
  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
@@ -148,12 +150,20 @@ Copyright: 2008, 2009, AGOSTINI Yves <agostini at univ-metz.fr>
 License: Artistic or GPL-1+
 
 Files: debian/json.js
-License: Public Domain
+Copyright: Public domain
+License: public-domain
  NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
  .
  This is a reference implementation. You are free to copy, modify, or
  redistribute.
-X-Comment: This is a copy of http://www.json.org/json2.js .
+Comment: This is a copy of http://www.json.org/json2.js .
+
+License: Apache-2.0
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Apache License 2.0.
+ .
+ On Debian systems, the complete text of version 2 of the
+ Apache License can be found in `/usr/share/common-licenses/Apache-2.0'.
 
 License: Artistic
  This program is free software; you can redistribute it and/or modify
@@ -179,6 +189,14 @@ License: GPL-2
  On Debian systems, the complete text of version 2 of the GNU
  General Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
+License: LGPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; version 2.1.
+ .
+ On Debian systems, the complete text of version 2 of the GNU
+ Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+
 License: LGPL-2.1
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
@@ -188,14 +206,7 @@ License: LGPL-2.1
  On Debian systems, the complete text of version 2.1 of the GNU
  Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-License: Apache-2.0
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Apache License 2.0.
- .
- On Debian systems, the complete text of version 2 of the 
- Apache License can be found in `/usr/share/common-licenses/Apache-2.0'.
-
-License: MIT 	 
+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 	 

-- 
Debian packaging of jifty

