r12570 - in /trunk/libfile-spec-perl/debian: changelog copyright

[dmn at users.alioth.debian.org]

Author: dmn
Date: Fri Jan 11 22:08:53 2008
New Revision: 12570

URL: http://svn.debian.org/wsvn/?sc=1&rev=12570
Log:
* copyright:
  + put general pattern (Files: *) in the start
  + add full license text for Cws* and add The Regents of the University of
    California as a copyright holder

Modified:
    trunk/libfile-spec-perl/debian/changelog
    trunk/libfile-spec-perl/debian/copyright

Modified: trunk/libfile-spec-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libfile-spec-perl/debian/changelog?rev=12570&op=diff
==============================================================================
--- trunk/libfile-spec-perl/debian/changelog (original)
+++ trunk/libfile-spec-perl/debian/changelog Fri Jan 11 22:08:53 2008
@@ -6,6 +6,10 @@
     + add CFLAGS optimization settings, depending on DEB_BUILD_OPTS
     + drop unused dh_link
   * control: add libmodule-build-perl to Build-Depends
+  * copyright:
+    + put general pattern (Files: *) in the start
+    + add full license text for Cws* and add The Regents of the University of
+      California as a copyright holder
 
   [ David Bremner ]
   * control: change priority of libpathtools-perl binary package to 

Modified: trunk/libfile-spec-perl/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libfile-spec-perl/debian/copyright?rev=12570&op=diff
==============================================================================
--- trunk/libfile-spec-perl/debian/copyright (original)
+++ trunk/libfile-spec-perl/debian/copyright Fri Jan 11 22:08:53 2008
@@ -5,30 +5,56 @@
 The upstream author is:
  Ken Williams <KWILLIAMS at cpan.org>
 
-Files: debian/*
-Copyright: © 2007 Debian Perl Group
-           © 2007 Bastian Blank <waldi at debian.org>
-License: other
- It is assumed that all Debian maintairers used a license compatible with
- upstream's.
-
-Files: Cwd*
-Copyright: © 2004 by the Perl 5 Porters.  All rights reserved.
-License: GPL-1+ | Artistic
- This program is free software; you can redistribute it and/or modify it under
- the same terms as Perl itself.
- .
- Portions of the C code in this library are copyright (c) 1994 by the Regents
- of the University of California.  All rights reserved.  The license on this
- code is compatible with the licensing of the rest of the distribution - please
- see the source code in Cwd.xs for the details.
-
 Files: *
 Copyright: © 2004 by the Perl 5 Porters.  All rights reserved.
 License: GPL-1+ | Artistic
  This program is free software; you can redistribute it and/or modify it
  under the same terms as Perl itself.
 
+Files: Cwd*
+Copyright: © 2004 by the Perl 5 Porters.  All rights reserved.
+Copyright: © 1994 by the Regents of the University of California. All rights reserved.
+License: GPL-1+ | Artistic, other
+ This program is free software; you can redistribute it and/or modify it under
+ the same terms as Perl itself.
+ .
+ Portions of the C code in this library are copyright (c) 1994 by the Regents
+ of the University of California.  All rights reserved.
+ .
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University 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 THE REGENTS AND CONTRIBUTORS ``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 THE REGENTS OR CONTRIBUTORS 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: © 2007,2008 Debian Perl Group <debian-perl at lists.debian.org>
+           © 2007 Bastian Blank <waldi at debian.org>
+License: other
+ It is assumed that all Debian maintairers used a license compatible with
+ upstream's.
+
 
 Perl is distributed under your choice of the GNU General Public License or
 the Artistic License.  On Debian GNU/Linux systems, the complete text of the