r23854 - in /trunk/libfile-mmagic-xs-perl/debian: changelog copyright

Wed Aug 6 23:40:31 UTC 2008

Author: gregoa
Date: Wed Aug  6 23:40:29 2008
New Revision: 23854

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=23854
Log:
debian/copyright: clarify copyright/licensing terms of included
third-party code.

Modified:
    trunk/libfile-mmagic-xs-perl/debian/changelog
    trunk/libfile-mmagic-xs-perl/debian/copyright

Modified: trunk/libfile-mmagic-xs-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mmagic-xs-perl/debian/changelog?rev=23854&op=diff
==============================================================================

--- trunk/libfile-mmagic-xs-perl/debian/changelog (original)
+++ trunk/libfile-mmagic-xs-perl/debian/changelog Wed Aug  6 23:40:29 2008
@@ -1,3 +1,10 @@
+libfile-mmagic-xs-perl (0.09003-2) UNRELEASED; urgency=low
+
+  * debian/copyright: clarify copyright/licensing terms of included
+    third-party code.
+
+ -- gregor herrmann <gregoa at debian.org>  Wed, 06 Aug 2008 20:38:58 -0300
+
 libfile-mmagic-xs-perl (0.09003-1) unstable; urgency=low
 
   * Initial release (closes: #432508).

Modified: trunk/libfile-mmagic-xs-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mmagic-xs-perl/debian/copyright?rev=23854&op=diff
==============================================================================
--- trunk/libfile-mmagic-xs-perl/debian/copyright (original)
+++ trunk/libfile-mmagic-xs-perl/debian/copyright Wed Aug  6 23:40:29 2008
@@ -4,12 +4,88 @@
 
 Files: *
 Copyright: 2005-2007 Daisuke Maki <daisuke at endeworks.jp>
- Underlying software: Copyright 1999-2004 The Apache Software Foundation, 
-                      Copyright (c) 1996-1997 Cisco Systems, Inc., 
-                      Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.
 License: GPL-1+ | Artistic
  This program is free software; you can redistribute it and/or modify it
  under the same terms as Perl itself.
+ .
+ This is a complete port of the apache module mod_mime_magic.
+ This is based on httpd-2.0.52's mod_mime_magic.c -- portions of this
+ code was shamelessly borrowed from there. 
+ .
+ Copyright 1999-2004 The Apache Software Foundation
+ .
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ .
+      http://www.apache.org/licenses/LICENSE-2.0
+ .
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ .
+  mod_mime_magic: MIME type lookup via file magic numbers
+  Copyright (c) 1996-1997 Cisco Systems, Inc.
+ .
+  This software was submitted by Cisco Systems to the Apache Software Foundation in July
+  1997.  Future revisions and derivatives of this source code must
+  acknowledge Cisco Systems as the original contributor of this module.
+  All other licensing and usage conditions are those of the Apache Software Foundation.
+ .
+  Some of this code is derived from the free version of the file command
+  originally posted to comp.sources.unix.  Copyright info for that program
+  is included below as required.
+  ---------------------------------------------------------------------------
+  - Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.
+ .
+  This software is not subject to any license of the American Telephone and
+  Telegraph Company or of the Regents of the University of California.
+ .
+  Permission is granted to anyone to use this software for any purpose on any
+  computer system, and to alter it and redistribute it freely, subject to
+  the following restrictions:
+ .
+  1. The author is not responsible for the consequences of use of this
+  software, no matter how awful, even if they arise from flaws in it.
+ .
+  2.  origin of this software must not be misrepresented, either by
+  explicit claim or by omission.  Since few users ever read sources, credits
+  must appear in the documentation.
+ .
+  3. Altered versions must be plainly marked as such, and must not be
+  misrepresented as being the original software.  Since few users ever read
+  sources, credits must appear in the documentation.
+ .
+  4. This notice may not be removed or altered.
+  -------------------------------------------------------------------------
+ .
+  For compliance with Mr Darwin's terms: this has been very significantly
+  modified from the free "file" command.
+  - all-in-one file for compilation convenience when moving from one
+    version of Apache to the next.
+  - Memory allocation is done through the Apache API's apr_pool_t structure.
+  - All functions have had necessary Apache API request or server
+    structures passed to them where necessary to call other Apache API
+    routines.  (i.e. usually for logging, files, or memory allocation in
+    itself or a called function.)
+  - struct magic has been converted from an array to a single-ended linked
+    list because it only grows one record at a time, it's only accessed
+    sequentially, and the Apache API has no equivalent of realloc().
+  - Functions have been changed to get their parameters from the server
+    configuration instead of globals.  (It should be reentrant now but has
+    not been tested in a threaded environment.)
+  - Places where it used to print results to stdout now saves them in a
+    list where they're used to set the MIME type in the Apache request
+    record.
+  - Command-line flags have been removed since they will never be used here.
+ .
+  Ian Kluft <ikluft at cisco.com>
+  Engineering Information Framework
+  Central Engineering
+  Cisco Systems, Inc.
+  San Jose, CA, USA
 
 Files: MMagicST.[ch]
 Copyright: -
@@ -35,3 +111,5 @@
 the Artistic License.  On Debian GNU/Linux systems, the complete text of the
 GNU General Public License can be found in `/usr/share/common-licenses/GPL'
 and the Artistic Licence in `/usr/share/common-licenses/Artistic'.
+The Apache License, Version 2.0 can be found at
+`/usr/share/common-licenses/Apache-2.0'.


