Update debian/copyright with information about tests/all.tcl and

tclconfig/tcl.m4. Thanks to Ondrej Certik for noting it during a
package review.

diff --git a/debian/changelog b/debian/changelog
index affa1aba72706d562e34955f98ae99b9860273c2..dbad475c64e97986a724ad982dc1423382017294 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mysqltcl (3.05-2) UNRELEASED; urgency=low
+
+  * Update debian/copyright with information about tests/all.tcl and
+    tclconfig/tcl.m4. Thanks to Ondrej Certik for noting it during a
+    package review.
+
+ -- Sven Hoexter <sven@timegate.de>  Sat, 27 Dec 2008 17:16:52 +0100
+
 mysqltcl (3.05-1) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/copyright b/debian/copyright
index ca70674428b5dbd09f107e59c211621df2001d59..88a3a780887922c7f482a955242be093aff4c8be 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,8 @@ Upstream Authors: Tobias Ritzau <tobri@ida.liu.se>, Artur Trzewik <mail@xdobry.d
 
 Copyright:
 
+Most of the sourcecode falls under the following license:
+
 /*
  * Copyright (c) 1994, 1995 Hakan Soderstrom and Tom Poindexter
  * 
@@ -28,3 +30,54 @@ Copyright:
  * OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN
  * CONNECTON WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
+
+
+The following files have a different license:
+tests/all.tcl
+tclconfig/tcl.m4
+
+ Copyright (c) 1998-2000 by Scriptics Corporation.
+ Copyright (c) 1999-2000 Ajuba Solutions.
+ Copyright (c) 2002-2005 ActiveState Corporation
+
+This software is copyrighted by the Regents of the University of
+California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
+Corporation and other parties.  The following terms apply to all files
+associated with the software unless explicitly disclaimed in
+individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license.