[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.3+dfsg1-2.1-39-ge9e136f
José Manuel Santamar?==?UTF-8?Q?ía Lema
panfaust at gmail.com
Wed May 30 16:31:03 UTC 2012
The following commit has been merged in the master branch:
commit 300204b83349f7a74e1ab92989f08feea27383c7
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Wed May 30 17:57:42 2012 +0200
Misc changes to copyright file:
- remove various duplicated mentions about SHA/MD5 Javascript routines.
- remove "DocBk XML" part, since looks like the file(s) involved aren't
there anymore.
- extend information about works from the GNU C Library.
- mention the files involved in each license statement from other projects.
diff --git a/debian/changelog b/debian/changelog
index 07fde0a..f720139 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,11 @@ virtuoso-opensource (6.1.5+dfsg2-1~pre1) UNRELEASED; urgency=low
* Changes in debian/copyright:
- remove pcre information since it's removed with the repackaging.
- remove the "Virtuoso may be linked against..." statements.
+ - remove various duplicated mentions about SHA/MD5 Javascript routines.
+ - remove "DocBk XML" part, since looks like the file(s) involved aren't
+ there anymore.
+ - extend information about works from the GNU C Library.
+ - mention the files involved in each license statement from other projects.
* Add debian/not-installed.
* Install README.UPGRADE.
* Add pt_BR debconf translation (Closes: #649152).
diff --git a/debian/copyright b/debian/copyright
index aa00bd6..ce4395d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -65,6 +65,7 @@ Additional copyrights:
are listed in CREDITS and reproduced below.
OpenSSL
+ (parts of various Virtuoso source code files are taken from OpenSSL)
<http://www.openssl.org/>
This product includes software developed by the OpenSSL Project for use
@@ -135,6 +136,7 @@ Additional copyrights:
Tidy - HTML parser and pretty printer
+ (files under libsrc/Tidy)
<http://www.w3.org/People/Raggett/tidy/>
This product includes Tidy developed by the World Wide Web Consortium.
@@ -178,23 +180,16 @@ Additional copyrights:
OAT
+ (files under binsrc/oat)
<http://sourceforge.net/projects/oat/>
Virtuoso uses the OpenLink AJAX Toolkit (OAT) in the Data Space
application suite, distributable under the terms of the GNU Public
License v2: <http://www.gnu.org/copyleft/gpl.html>
-
-
- SHA1 Javascript
-
- Virtuoso uses a Javsscript implementation of the Secure Hash Algorithm
- (SHA1) as defined in FIPS PUB 180-1, written by Paul Johnston
-
- SHA1 is distributable under the terms of the BSD license
- <http://pajhome.org.uk/crypt/md5>
-
+
sysexits.h
+ (located in binsrc/maildrop/)
Copyright (c) 1987, 1993
The Regents of the University of California. All rights reserved.
@@ -228,6 +223,7 @@ Additional copyrights:
RedLand
+ (files under binsrc/redland/)
Copyright (C) 2000-2008, Openlink Software, http://www.openlinksw.com/
@@ -247,8 +243,9 @@ Additional copyrights:
Apache JSP 2.0
+ (files binsrc/tutorial/hosting/ho_s_17/*.jsp)
- Copyright 2004 The Apache Software Foundation
+ 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.
@@ -264,6 +261,7 @@ Additional copyrights:
Code Syntax Highlighter (with updated FSF address)
+ (file binsrc/yacutia/syntax/shCore.js)
Copyright (C) 2004 Dream Projections Inc.
@@ -283,6 +281,7 @@ Additional copyrights:
iODBC driver manager (with updated FSF address)
+ (files under libsrc/odbcsdk/include/)
Copyright (C) 1999-2005 by OpenLink Software <iodbc at openlinksw.com>
All Rights Reserved.
@@ -349,6 +348,7 @@ Additional copyrights:
UUID library
+ (files libsrc/util/uuid.h, libsrc/util/uuidP.h and libsrc/util/uuid.c)
Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
@@ -382,12 +382,13 @@ Additional copyrights:
CKEditor
+ (files under appsrc/ODS-Framework/ckeditor/)
Software License Agreement
==========================
CKEditor - The text editor for Internet - http://ckeditor.com
- Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
Licensed under the terms of any of the following licenses at your
choice:
@@ -434,6 +435,7 @@ Additional copyrights:
Ajax Engine
+ (file appsrc/ODS-Gallery/www-root/js/ajax.js)
Software License Agreement (BSD License)
@@ -469,6 +471,10 @@ Additional copyrights:
WebFX
+ (files:
+ - appsrc/ODS-Gallery/www-root/js/timer.js
+ - appsrc/ODS-Gallery/www-root/js/slider.js
+ - appsrc/ODS-Gallery/www-root/js/range.js)
Copyright (c) 1999 - 2005 Erik Arvidsson
@@ -589,6 +595,7 @@ Additional copyrights:
Berlin SPARQL Benchmark
+ (files under binsrc/tests/bsbm/src/)
Copyright (C) 2000-2008 Hewlett-Packard Development Company, LP
Copyright (C) 2008 Andreas Schultz
@@ -607,7 +614,8 @@ Additional copyrights:
along with this program. If not, see <http://www.gnu.org/licenses/>.
- JavaScript RSA MD5
+ JavaScript RSA MD5 and SHA routines
+ (files binsrc/oat/toolkit/crypto.js and binsrc/yacutia/md5.js)
A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
Digest Algorithm, as defined in RFC 1321.
@@ -663,6 +671,7 @@ Additional copyrights:
mm_menu
+ (files appsrc/ODS-Framework/mm_menu.js and binsrc/yacutia/mm_menu.js)
mm_menu 20MAR2002 Version 6.0
Andy Finnell, March 2002
@@ -675,36 +684,10 @@ Additional copyrights:
Netscape grants you a royalty free license to use or modify this
software provided that this copyright notice appears on all copies.
This software is provided "AS IS," without a warranty of any kind.
-
- DocBk XML
-
- DocBk XML V3.1.7 DTD
- Copyright (C) 1998, 1999 Norman Walsh
- http://nwalsh.com/docbook/xml/
-
- You may distribute this DTD under the same terms as DocBook.
-
- Please direct all questions and comments about this DTD to
- Norman Walsh, <ndw at nwalsh.com>.
-
- This DTD is based on the DocBook V3.1 DTD from OASIS:
-
- [DocBook is] Copyright 1992, 1993, 1994, 1995, 1996, 1998,
- 1999 HaL Computer Systems, Inc., O'Reilly & Associates, Inc.,
- ArborText, Inc., Fujitsu Software Corporation, and the
- Organization for the Advancement of Structured Information
- Standards (OASIS).
-
- Permission to use, copy, modify and distribute the DocBook
- DTD and its accompanying documentation for any purpose and
- without fee is hereby granted in perpetuity, provided that
- the above copyright notice and this paragraph appear in all
- copies. The copyright holders make no representation about
- the suitability of the DTD for any purpose. It is provided
- "as is" without expressed or implied warranty.
-
+
MD5 in Java JDK Beta-2 (with updated FSF address)
+ (file libsrc/JDBCDriverType4/openlink/util/MD5.java)
MD5 in Java JDK Beta-2
written Santeri Paavolainen, Helsinki Finland 1996
@@ -739,8 +722,16 @@ Additional copyrights:
Reentrent string tokenizer - Generic version (with updated FSF address)
-
- Copyright (C) 1991, 1996 Free Software Foundation, Inc.
+ and other works from the GNU C Library:
+ (files:
+ - libsrc/util/strtok_r.c
+ - libsrc/langfunc/latin1ctype.h
+ - libsrc/langfunc/latin1ctype.c
+ - libsrc/util/getopt1.c
+ - libsrc/util/getopt.c
+ - libsrc/util/fnmatch.c)
+
+ Copyright (C) 1987-1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -760,6 +751,7 @@ Additional copyrights:
OpenLayers Map Viewer Library
+ (file binsrc/oat/toolkit/OpenLayers.js)
Copyright 2005-2008 MetaCarta, Inc., released under the Clear BSD license.
Please see http://svn.openlayers.org/trunk/openlayers/license.txt
@@ -797,13 +789,6 @@ Additional copyrights:
permissions and limitations under the License.
- MD5 and SHA routines, Johnston
-
- MD5 and SHA routines, along with their supplemental sub-routines are
- Copyright (C) Paul Johnston 1999 - 2002.
- Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
- Distributed under the BSD License
-
The Debian packaging is:
--
Git repository for pkg-virtuoso
More information about the Pkg-virtuoso-commits
mailing list