From 13b7deafa8fd4385a10f481c5719252b2071d166 Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Sun, 29 May 2011 15:35:21 +0000 Subject: [PATCH] Clean up copyright file. * Remove the stanza for (c++/)scripts/projects/xmlwrapp/*, whose LICENSE file documents material absent from the ncbi-blast+ archive. * Adjust other upstream-related stanzas' Files speifications to prefix c++/ and cover include in addition to src as appropriate. --- debian/copyright | 51 +++++++++++------------------------------------- 1 file changed, 11 insertions(+), 40 deletions(-) diff --git a/debian/copyright b/debian/copyright index 91e65320..2e4844bf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: http://dep.debian.net/deps/dep5 Upstream-Name: ncbi-blast+ -Files: src/util/compress/zlib/* +Files: c++/*/util/compress/zlib/* Copyright: 1995-2004 Jean-loup Gailly and Mark Adler License: This software is provided 'as-is', without any express or implied @@ -20,7 +20,7 @@ License: misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. -Files: src/util/regexp/* +Files: c++/*/util/regexp/* Copyright: 1997-2009 University of Cambridge 2008-2009 Google Inc License: BSD @@ -54,7 +54,7 @@ License: BSD -Files: src/util/compress/bzip2/* +Files: c++/*/util/compress/bzip2/* Copyright: 1996-2002 Julian R Seward License: BSD Redistribution and use in source and binary forms, with or without @@ -87,13 +87,11 @@ License: BSD NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: src/build-system/config.guess -src/build-system/config.sub -src/util/regexp/missing +Files: c++/src/build-system/config.*s* c++/src/util/regexp/missing Copyright: 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc License: GPLv2 -Files: src/build-system/ax_jni_include_dir.m4 +Files: c++/src/build-system/ax_jni_include_dir.m4 Copyright: 2008 Don Anderson License: Copying and distribution of this file, with or without modification, are @@ -101,35 +99,8 @@ License: and this notice are preserved. This file is offered as-is, without any warranty. -Files: scripts/projects/xmlwrapp/* -Copyright: 2001-2003 Peter J Jones -License: BSD - 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 Author 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 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. - -Files: include/util/impl/floating_point_comparison.hpp + +Files: c++/include/util/impl/floating_point_comparison.hpp Copyright: 2001-2008 Gennadiy Rozental License: Boost software license Permission is hereby granted, free of charge, to any person or organization @@ -154,11 +125,11 @@ License: Boost software license ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Files: include/dbapi/driver/odbc/unix_odbc/sqlfront.h +Files: c++/include/dbapi/driver/odbc/unix_odbc/sqlfront.h Copyright: 1998-1999 Brian Bruns License: GPLv2 -Files: src/html/ncbi_menu_*.js +Files: c++/src/html/ncbi_menu_*.js Copyright: 1997-1999 Netscape Communications Corp. License: Netscape Netscape grants you a royalty free license to use or modify this @@ -166,7 +137,7 @@ License: Netscape This software is provided "AS IS," without a warranty of any kind. -Files: include/util/bitset/* +Files: c++/include/util/bitset/* Copyright: 2002-2003 Anatoliy Kuznetsov License: MIT Permission is hereby granted, free of charge, to any person @@ -187,7 +158,7 @@ License: MIT ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Files: * +Files: c++/* Copyright: NCBI License: PD PUBLIC DOMAIN NOTICE -- 2.30.2