[Pkg-mysql-commits] r2186 - mysql-5.5/branches/wheezy/debian

Sun Sep 2 09:05:54 UTC 2012

tags 682311 pending
thanks

Author: periapt
Date: 2012-09-02 09:05:54 +0000 (Sun, 02 Sep 2012)
New Revision: 2186

Modified:
   mysql-5.5/branches/wheezy/debian/changelog
   mysql-5.5/branches/wheezy/debian/copyright
Log:
* Updated debian/copyright after analysis from development version
  of license-reconcile (Closes: #682311)
  - 'Comments' field to corrected to 'Comment'
  - Missing paragraphs for '*', 'debian/*' and for the mysqlreport
    and innotop scripts
  - Removed duplicate entries from Files listings
  - Added clause for files licensed under BSD (4-clause)
  - Clarified 'BSD (3 clause) GPL-2' as being 'BSD (3 clause) or GPL-2'

Modified: mysql-5.5/branches/wheezy/debian/changelog
===================================================================

--- mysql-5.5/branches/wheezy/debian/changelog	2012-08-12 08:44:02 UTC (rev 2185)
+++ mysql-5.5/branches/wheezy/debian/changelog	2012-09-02 09:05:54 UTC (rev 2186)
@@ -1,3 +1,16 @@
+mysql-5.5 (5.5.24+dfsg-8) UNRELEASED; urgency=low
+
+  * Updated debian/copyright after analysis from development version
+    of license-reconcile (Closes: #682311)
+    - 'Comments' field to corrected to 'Comment'
+    - Missing paragraphs for '*', 'debian/*' and for the mysqlreport
+      and innotop scripts
+    - Removed duplicate entries from Files listings
+    - Added clause for files licensed under BSD (4-clause)
+    - Clarified 'BSD (3 clause) GPL-2' as being 'BSD (3 clause) or GPL-2'
+
+ -- Nicholas Bamber <nicholas at periapt.co.uk>  Sun, 02 Sep 2012 08:01:42 +0100
+
 mysql-5.5 (5.5.24+dfsg-7) unstable; urgency=low
 
   * Updated Turkish debconf translation (Closes: #683733)

Modified: mysql-5.5/branches/wheezy/debian/copyright
===================================================================
--- mysql-5.5/branches/wheezy/debian/copyright	2012-08-12 08:44:02 UTC (rev 2185)
+++ mysql-5.5/branches/wheezy/debian/copyright	2012-09-02 09:05:54 UTC (rev 2186)
@@ -2,14 +2,16 @@
 Upstream-Name: MySQL 5.5
 Upstream-Contact: http://bugs.mysql.com/
 Source: http://dev.mysql.com/downloads/mysql/5.5.html
-Comments:
+Comment:
  The file Docs/mysql.info is removed from the upstream source
  because it is incompatible with the Debian Free Software Guidelines.
  See debian/README.source for how this repacking was done.
  .
  Originally produced by a modified version of licensecheck2dep5
  from CDBS by Clint Byrum <clint at ubuntu.com>. Hand modified to reduce 
- redundancy in the output and add appropriate license text.
+ redundancy in the output and add appropriate license text. The file
+ has been rechecked against the source using the development version
+ of license-reconcile, see #686485.
  .
  Also, MySQL carries the "FOSS License Exception" specified in README
  .
@@ -124,6 +126,37 @@
  The above text is subject to this copyright notice:
  © 2010, Oracle and/or its affiliates.
 
+Files: *
+Copyright: 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+License: GPL-2
+
+Files: debian/*
+Copyright: 
+ 1997-1998, Scott Hanson <shanson at debian.org>
+ 1997, Christian Schwarz <schwarz at debian.org>
+ 1999-2007, 2009, Christian Hammers <ch at debian.org>
+ 2000-2001, Christopher C. Chimelis <chris at debian.org>
+ 2001, Matthew Wilcox <willy at debian.org>
+ 2005-2007, sean finney <seanius at debian.org>
+ 2006, Adam Conrad <adconrad at 0c3.net>
+ 2007-2011, Norbert Tretkowski <norbert at tretkowski.de>
+ 2007-2008, Monty Taylor <mordred at inaugust.com>
+ 2008, Devin Carraway <devin at debian.org>
+ 2008, Steffen Joeris <white at debian.org>
+ 2010, Xavier Oswald <xoswald at debian.org>
+ 2011, Clint Byrum <clint at ubuntu.com>
+ 2011, Ondřej Surý <ondrej at debian.org>
+ 2012, Nicholas Bamber <nicholas at periapt.co.uk>
+License: GPL-2+
+
+Files: debian/additions/mysqlreport*
+Copyright: 2006-2008, Daniel Nichter <public at codenode.com>
+License: GPL-2+
+
+Files: debian/additions/innotop/*
+Copyright: 2006, Baron Schwartz <baron at xaprb dot com>
+License: Artistic or GPL-2
+
 Files: cmd-line-utils/libedit/config.h
  dbug/example1.c
  dbug/example2.c
@@ -177,7 +210,6 @@
  libmysqld/*
  libservices/*
  mysql-test/include/have_perfschema.inc
- mysql-test/include/have_perfschema.inc
  mysql-test/lib/mtr_cases.pm
  mysql-test/lib/mtr_gcov.pl
  mysql-test/lib/mtr_gprof.pl
@@ -189,7 +221,6 @@
  mysql-test/lib/mtr_results.pm
  mysql-test/lib/mtr_stress.pl
  mysql-test/lib/mtr_unique.pm
- mysql-test/lib/My/ConfigFactory.pm
  mysql-test/lib/My/Config.pm
  mysql-test/lib/My/CoreDump.pm
  mysql-test/lib/My/File/*
@@ -198,7 +229,6 @@
  mysql-test/lib/My/Options.pm
  mysql-test/lib/My/Platform.pm
  mysql-test/lib/My/SafeProcess/Base.pm
- mysql-test/lib/My/SafeProcess.pm
  mysql-test/lib/My/SafeProcess/safe_kill_win.cc
  mysql-test/lib/My/SafeProcess/safe_process.cc
  mysql-test/lib/My/SafeProcess/safe_process.pl
@@ -219,14 +249,12 @@
  mysql-test/lib/v1/mtr_timer.pl
  mysql-test/lib/v1/mtr_unique.pl
  mysql-test/lib/v1/My/*
- mysql-test/lib/v1/My/*
  mysql-test/lib/v1/mysql-test-run.pl
  mysql-test/mysql-stress-test.pl
  mysql-test/mysql-test-run.pl
  mysql-test/std_data/*
  mysql-test/suite/perfschema/include/*
  mysql-test/suite/perfschema_stress/include/*
- mysql-test/suite/perfschema_stress/include/*
  mysys/*
  packaging/WiX/ca/*
  plugin/audit_null/*
@@ -269,6 +297,10 @@
 Copyright: 1989-1990,1992-1993 The Regents of the University of California.
 License: BSD (3 clause)
 
+Files: cmd-line-utils/libedit/chartype.* cmd-line-utils/libedit/eln.c
+Copyright: 2009, The NetBSD Foundation, Inc.
+License: BSD (4 clause)
+
 Files: cmd-line-utils/libedit/filecomplete.c
  cmd-line-utils/libedit/filecomplete.h
  cmd-line-utils/libedit/np/fgetln.c
@@ -308,18 +340,35 @@
  sql-bench/*
  storage/myisam/ftbench/ft-test-run.sh
  storage/myisam/mi_test_all.sh
- storage/ndb/test/run-test/atrt-analyze-result.sh
- storage/ndb/test/run-test/atrt-clear-result.sh
- storage/ndb/test/run-test/atrt-gather-result.sh
- storage/ndb/test/run-test/atrt-setup.sh
+ storage/ndb/test/run-test/atrt-*
  storage/ndb/test/run-test/make-config.sh
  storage/ndb/test/run-test/make-html-reports.sh
  storage/ndb/test/run-test/make-index.sh
  storage/ndb/test/run-test/ndb-autotest.sh
  strings/strxmov.c
  strings/strxnmov.c
+ strings/ctype-uca.c
+ strings/ctype-ucs2.c
+ strings/strend.c
+ strings/ctype-utf8.c
  support-files/MacOSX/postflight.sh
  support-files/MacOSX/preflight.sh
+ mysql-test/lib/My/SafeProcess.pm
+ mysql-test/lib/My/ConfigFactory.pm
+ mysql-test/lib/mtr_misc.pl
+ mysql-test/mysql-stress-test.pl
+ BUILD/*.sh
+ BUILD/compile-amd64-debug-max-no-ndb
+ BUILD/compile-solaris-amd64
+ BUILD/compile-amd64-valgrind-max
+ BUILD/compile-pentium64-max
+ BUILD/compile-pentium64
+ BUILD/compile-pentium-valgrind-max-no-ndb
+ scripts/mysqlhotcopy.sh
+ scripts/mysqld_multi.sh
+ mysql-test/lib/mtr_misc.pl
+ mysql-test/mysql-stress-test.pl
+ mysql-test/std_data/checkDBI_DBD-mysql.pl
 Copyright: 2000-2009 MySQL AB Sun Microsystems Inc
            2000-2007 MySQL AB
 License: LGPL
@@ -553,50 +602,7 @@
 Files: storage/ndb/test/include/getarg.h
 Copyright: 2003 MySQL AB
  1997-1999 Kungliga Tekniska Högskolan
-License: BSD (3 clause) 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 of the License.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- Copyright (c) 1997, 1999 Kungliga Tekniska Högskolan
- (Royal Institute of Technology, Stockholm, Sweden). 
- All rights reserved. 
- .
- 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 Institute 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 INSTITUTE 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 INSTITUTE 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. 
+License: BSD (3 clause) or GPL-2
 
 Files: storage/innobase/handler/ha_innodb.cc
 Copyright: 2008-2009 Google Inc
@@ -771,3 +777,32 @@
  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.
+
+License: BSD (4 clause)
+ 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. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+        This product includes software developed by the NetBSD
+        Foundation, Inc. and its contributors.
+ 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.


