Fix copyright issue with shipped magic file

diff --git a/debian/changelog b/debian/changelog
index 729123faf71a39f249d6d03fa3c754943b6d1f0d..f4773fb6293260e23b544ef6809a75bd411fb629 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,8 @@ roundcube (0.1-1) UNRELEASED; urgency=low
   * Do not depend on a specific revision of cdbs.
   * Move po-debconf from Build-Depends-Indep to Build-Depends since it is
     needed for clean target.
-  * Correct path to /usr/share/file/magic, provided by libmagic1.
+  * Correct path to /usr/share/file/magic, provided by libmagic1. Provide
+    license information about this file in debian/copyright
 
  -- Vincent Bernat <bernat@luffy.cx>  Wed, 05 Mar 2008 20:49:03 +0100
 

diff --git a/debian/copyright b/debian/copyright
index e6a56202967e39ee790af7f193ecb018af62e33c..82c322eb9750f301b441bed0a995b728b9a88096 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,8 +17,41 @@ Some files are taken from other projects :
  - lib/{enriched,icl_commons,imap,mime,utf7}.inc from IlohaMail project, GPL license
  - lib/encoding/*.map from Unicode, Inc., with "BSD-lite" license
  - debian/patches/xss-fix.patch contains code from Squirrelmail, GPLv2
-
-All licenses can be found in the corresponding source file.
+ - lib/magic is an autogenerated file. We don't ship it and use the
+   one from libmagic1 instead. Here is the license:
+
+       Copyright (C) 1985-1995 Ian F. Darwin
+       Copyright (C) 1994-2008 Christos Zoulas <christos@zoulas.com>
+
+       This software is not subject to any export provision of the United
+       States Department of Commerce, and may be exported to any country or
+       planet.
+
+       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
+          immediately at the beginning of the file, without modification, 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.
+
+       THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+
+All other licenses can be found in the corresponding source file.
 
 The Debian packaging is (C) 2007, Vincent Bernat <bernat@luffy.cx> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.