r53624 - in /trunk/libdevel-nytprof-perl/debian: changelog copyright

Fri Mar 5 12:43:28 UTC 2010

Author: gregoa
Date: Fri Mar  5 12:43:21 2010
New Revision: 53624

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53624
Log:
debian/copyright: update formatting, add info about third-party files.

Modified:
    trunk/libdevel-nytprof-perl/debian/changelog
    trunk/libdevel-nytprof-perl/debian/copyright

Modified: trunk/libdevel-nytprof-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/debian/changelog?rev=53624&op=diff
==============================================================================

--- trunk/libdevel-nytprof-perl/debian/changelog (original)
+++ trunk/libdevel-nytprof-perl/debian/changelog Fri Mar  5 12:43:21 2010
@@ -5,6 +5,7 @@
       (closes: #528432)
   * Refresh patch manpage-section.patch.
   * Convert to source format 3.0 (quilt).
+  * debian/copyright: update formatting, add info about third-party files.
 
  -- gregor herrmann <gregoa at debian.org>  Fri, 05 Mar 2010 13:18:26 +0100
 

Modified: trunk/libdevel-nytprof-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/debian/copyright?rev=53624&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/debian/copyright (original)
+++ trunk/libdevel-nytprof-perl/debian/copyright Fri Mar  5 12:43:21 2010
@@ -1,39 +1,95 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Adam Kaplan <akaplan at cpan.org>, Tim Bunce <timb at cpan.org>
-Upstream-Source: http://search.cpan.org/dist/Devel-NYTProf/
-Upstream-Name: Devel-NYTProf
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Adam Kaplan <akaplan at cpan.org>, Tim Bunce <timb at cpan.org>
+Source: http://search.cpan.org/dist/Devel-NYTProf/
+Name: Devel-NYTProf
 
 Files: *
 Copyright: 2008-2009, Tim Bunce <timb at cpan.org>
  2008, Adam J. Kaplan <akaplan at cpan.org>
  2008, The New York Times Company
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: ppport.h
 Copyright: 2004-2009, Marcus Holland-Moritz <mhx-cpan at gmx.net>
  2001, Paul Marquess <pmqs at cpan.org> (Version 2.x)
  1999, Kenneth Albanowski <kjahds at kjahds.com> (Version 1.x)
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
+
+Files: lib/Devel/NYTProf/js/jquery-min.js
+Copyright: 2008, John Resig (jquery.com)
+License: MIT or GPL-2
+
+Files: lib/Devel/NYTProf/js/jit/jit.js
+Copyright: 2008-2009, Nicolas Garcia Belmonte
+License: BSD-3
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of the organization nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY Nicolas Garcia Belmonte ``AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL Nicolas Garcia Belmonte BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
- 2008-2009, gregor herrmann <gregoa at debian.org>
+Copyright: 2008, 2009, 2010, gregor herrmann <gregoa at debian.org>
  2008, Jose Luis Rivas <ghostbar38 at gmail.com>
-License: Artistic | GPL-1+
+ 2009, Jonathan Yu <jawnsy at cpan.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'
+
+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; version 2.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General Public
+ License, version 2 can be found in `/usr/share/common-licenses/GPL-2'
+
+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
+ 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.


