r58202 - in /trunk/jifty/debian: changelog copyright

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Fri May 21 19:12:20 2010
New Revision: 58202

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=58202
Log:
debian/copyright: update DEP5-style formatting.

Modified:
    trunk/jifty/debian/changelog
    trunk/jifty/debian/copyright

Modified: trunk/jifty/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/changelog?rev=58202&op=diff
==============================================================================
--- trunk/jifty/debian/changelog (original)
+++ trunk/jifty/debian/changelog Fri May 21 19:12:20 2010
@@ -5,6 +5,7 @@
   * Convert to source format 3.0 (quilt). Remove quilt framework.
   * Add /me to Uploaders.
   * Set Standards-Version to 3.8.4; remove version from perl build dependency.
+  * debian/copyright: update DEP5-style formatting.
 
  -- gregor herrmann <gregoa at debian.org>  Fri, 21 May 2010 21:05:17 +0200
 

Modified: trunk/jifty/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/copyright?rev=58202&op=diff
==============================================================================
--- trunk/jifty/debian/copyright (original)
+++ trunk/jifty/debian/copyright Fri May 21 19:12:20 2010
@@ -1,23 +1,22 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Jesse Vincent, Alex Vandiver and David Glasser.
-Upstream-Source: http://search.cpan.org/dist/Jifty/
-Upstream-Name: Jifty
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Jesse Vincent, Alex Vandiver and David Glasser.
+Source: http://search.cpan.org/dist/Jifty/
+Name: Jifty
 
 Files: *
 Copyright: Copyright 2005-2009 Best Practical Solutions, LLC. 
-License: GPL-1+ | Artistic
+License: Artistic or GPL-1+
  Jifty is distributed under the same terms as Perl itself.
 
 Files: inc/*
 Copyright: Copyright 2002 - 2008 by Brian Ingerson, Audrey Tang and Adam Kennedy.
-License: GPL-1+ | Artistic
+License: Artistic or GPL-1+
  This program is free software; you can redistribute it and/or modify it under
  the same terms as Perl itself.
 
 Files: */share/web/static/js/key_bindings.js
 Copyright: Copyright 2004-2006, Best Practical Solutions, LLC
-License: GPL-1+ | Artistic
+License: Artistic or GPL-1+
  This Library is licensed to you under the same terms as Perl 5.x
 
 Files: */share/web/static/js/facebox.js
@@ -85,7 +84,7 @@
 
 Files: */share/web/static/js/jquery-1.2.1.js  	 
 Copyright: Copyright (c) 2007 John Resig (jquery.com) 	 
-License: GPL | MIT 	 
+License: GPL or MIT 	 
  Dual licensed under the MIT and GPL licenses. See MIT license below. 	 
   	 
 Files: */share/web/static/js/jsan/DOM/Events.js 	 
@@ -96,7 +95,7 @@
 
 Files: */share/web/static/js/jsan/Upgrade.js
 Copyright: Copyright (c) 2005 Adam Kennedy. All rights reserved.
-License:  GPL-1+ | Artistic
+License:  Artistic or GPL-1+
  This program is free software; you can redistribute it and/or modify
  it under the the terms of the Perl dual GPL/Artistic license.
 
@@ -130,18 +129,18 @@
 
 Files: */Jifty/Plugin/*
 Copyright: Copyright 2005-2009 Best Practical Solutions, LLC. 
-License: GPL-1+ | Artistic
+License: Artistic or GPL-1+
  Jifty is distributed under the same terms as Perl itself.
 
 Files: examples/Yada/share/web/static/js/Asynapse/REST.js
 Copyright: Copyright (c) 2007, Kang-min Liu <gugod at gugod.org>
-License: GPL-1+ | Artistic
+License: Artistic or GPL-1+
  This module is free software; you can redistribute it and/or
  modify it under the same terms as Perl itself.
 
 Files: */Jifty/Plugin/CSSQuery*
 Copyright: Copyright 2007 Handlino, Inc.
-License: GPL-1+ | Artistic
+License: Artistic or GPL-1+
  It is available for modication and distribution under the same terms as Perl itself.
 
 Files: */static/js/cssquery*
@@ -177,18 +176,21 @@
 
 Files: debian/*
 Copyright: 2008, 2009, AGOSTINI Yves <agostini at univ-metz.fr>
-License: Artistic | GPL-1+
+ 2009, 2010, gregor herrmann <gregoa at debian.org>
+License: Artistic or GPL-1+
 
 License: Artistic
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Artistic License, which comes with Perl.
-    On Debian GNU/Linux systems, the complete text of the Artistic License
-    can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
 
 License: GPL-1+
-    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 1, or (at your option)
-    any later version.
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL'
+ 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 1, or (at your option)
+ any later version.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'