The deal.II Readme

From: wolf Date: Tue, 20 Feb 2001 14:53:39 +0000 (+0000) Subject: Take over changes from main branch. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00b7fe599d04ba38cf954ec382a37f5c5c133ef7;p=dealii-svn.git Take over changes from main branch. git-svn-id: https://svn.dealii.org/branches/Branch-3-1@3986 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/doc/license.html b/deal.II/doc/license.html index 70eba0d845..3f80b116b5 100644 --- a/deal.II/doc/license.html +++ b/deal.II/doc/license.html @@ -5,7 +5,7 @@ The deal.II Readme - + @@ -23,51 +23,38 @@

- deal.II is distributed under the Q Public License - (or "QPL"), which qualifies as an Open Source - license. It is thus appropriate for people wishing to write + deal.II is distributed under the license below. + It is based on the Q Public License (or "QPL"), which qualifies as + an Open + Source license. It differs in two points in section Granted + Rights, defining non-commercial use. The + deal.II license is more restrictive in the sense + that even generation of data by applications based on + deal.II for commercial purposes requires a + commercial license. + It is appropriate for people wishing to write software under the Open Source model where all source code to the software is made available to all users and can be freely modified - and redistributed. The QPL was originally developed by + and redistributed. QPL was originally developed by Troll Tech for their Qt program library, but has since gained some support by other library authors as well.

- The QPL prohibits development of proprietary software. If you intend - to develop commercial software based on deal.II, - we are willing to negotiate a suitable agreement. Feel free to - contact us in this case. + The deal.II Public License prohibits development + of proprietary software and generation of proprietary data. If you + intend to develop commercial software based on + deal.II or plan to generate data for commercial + use by programs based on deal.II, we are willing + to negotiate a suitable agreement. Feel free to contact us in this + case.

- For more information on the QPL, please see also the following - links: -
- - - Annotated version - - Plain text version - - Announcement - - Comments -

- - -

- In addition to the terms imposed by the QPL, we have one restriction - on the use of the library:

Every publication presenting numerical results obtained with - the help of deal.II shall state the name of - the library and its principle authors (at present Wolfgang - Bangerth and Guido Kanschat), as well as cite at least one of - the papers by these authors on deal.II. This +
This is the usual, fair way of giving credits to contributors to a scientific result, and using a complex programming environment like deal.II should be considered a @@ -80,7 +67,7 @@ authors of deal.II and deal.II authors generally refer to the principle authors of the library. These are presently Wolfgang - Bangerth and Guido Kanschat. + Bangerth, Ralf Hartmann and Guido Kanschat.
@@ -88,12 +75,12 @@

-THE Q PUBLIC LICENSE +The deal.II Public License version 1.0

-Copyright (C) 1999 Troll Tech AS, Norway. +Copyright (C) 2001 The deal.II Authors
Everyone is permitted to copy and @@ -116,18 +103,19 @@ and development of free software which uses the Software. Granted Rights
-1. You are granted the non-exclusive rights set forth in this license +
1. You are granted the non-exclusive rights set forth in this license provided you agree to and comply with any and all conditions in this license. Whole or partial distribution of the Software, or software items that link with the Software, in any form signifies acceptance of this license.
  -2. You may copy and distribute the Software in unmodified form provided +
2. You may copy and distribute the Software in unmodified form provided that the entire package, including - but not restricted to - copyright, trademark notices and disclaimers, as released by the initial developer of the Software, is distributed.
  -3. You may make modifications to the Software and distribute your +
3. You may make modifications to the Software and distribute your modifications, in a form that is separate from the Software, such as patches. The following restrictions apply to modifications:
  @@ -143,7 +131,7 @@ available under these terms in addition to any other license(s) of the initial developer.
  
  -4. You may distribute machine-executable forms of the Software or +
4. You may distribute machine-executable forms of the Software or machine-executable forms of modified versions of the Software, provided that you meet these restrictions:
  @@ -161,31 +149,46 @@ machine-executable forms are available under the terms of this license.
  
  -5. You may use the original or modified versions of the Software to +
5. You may use the original or modified versions of the Software to compile, link and run application programs legally developed by you -or by others. +or by others for non-profit purposes only.
  -6. You may develop application programs, reusable components and other +
6. You may develop application programs, reusable components and other software items that link with the original or modified versions of the Software. These items, when distributed, are subject to the following requirements:
  
  -a. You must ensure that all recipients of machine-executable forms of +a. All forms of these items, including machine-executable and +machine-readable or human-readable source code, must be distributed +without any charge beyond the costs of data transfer. +
  +b. You must ensure that all recipients of machine-executable forms of these items are also able to receive and use the complete machine-readable source code to the items without any charge beyond the costs of data transfer.
  -b. You must explicitly license all recipients of your items to use +c. You must explicitly license all recipients of your items to use and re-distribute original and modified versions of the items in both machine-executable and source code forms. The recipients must be able to do so without any charges whatsoever, and they must be able to re-distribute to anyone they choose.
  -c. If the items are not available to the general public, and the +d. If the items are not available to the general public, and the initial developer of the Software requests a copy of the items, then you must supply one. +
  +
  + +
7. Publications presenting applications or results obtained with the + help of the software are allowed, provided that they state the + name of the software and its principle authors (at present + Wolfgang Bangerth, Ralf Hartmann and Guido Kanschat), as well + as cite at least one of the papers by these authors on + deal.II. These publications should be + announced on the deal.II mailing list. +
Limitations of Liability
diff --git a/deal.II/doc/news/2000/3.0.0-vs-3.1.0.html b/deal.II/doc/news/2000/3.0.0-vs-3.1.0.html index 1e48070b64..4c3905344e 100644 --- a/deal.II/doc/news/2000/3.0.0-vs-3.1.0.html +++ b/deal.II/doc/news/2000/3.0.0-vs-3.1.0.html @@ -271,6 +271,12 @@ documentation, etc.
(GK 2000/04/12)
+
+ Changed: License is now deal.II Public + License, restricting commercial use more explicitely. +
+ (WB/RH/GK) +
diff --git a/deal.II/doc/toc.html b/deal.II/doc/toc.html index ec5e460dac..374d07cc87 100644 --- a/deal.II/doc/toc.html +++ b/deal.II/doc/toc.html @@ -149,14 +149,15 @@
deal.II was originally designed and written by - Wolfgang - Bangerth, starting in early 1998; he is still maintaining and - managing the library, contributing code, and writing - documentation. - Guido - Kanschat helped with advice in the early - implementation stages on questions of the design of object-oriented - finite element software and later joined into the coding. + Wolfgang Bangerth, starting in early 1998; he is + still maintaining and managing the library, contributing code, and + writing documentation. Guido Kanschat helped with advice in the early + implementation stages on questions of the design of + object-oriented finite element software and later joined into the + coding. Ralf Hartmann is the third author of the library.

@@ -165,11 +166,6 @@
John Burnell: Configuration on Microsoft Windows systems. -
Ralf Hartmann: - SolutionTransfer class; - discontinuous finite elements; - SolverSelector class. -
Stefan Nauber: postscript output.

-THE Q PUBLIC LICENSE +The deal.II Public License version 1.0 -Copyright (C) 1999 Troll Tech AS, Norway. +Copyright (C) 2001 The deal.II Authors Everyone is permitted to copy and @@ -116,18 +103,19 @@ and development of free software which uses the Software. Granted Rights

Limitations of Liability

-THE Q PUBLIC LICENSE +The deal.II Public License version 1.0

-Copyright (C) 1999 Troll Tech AS, Norway. +Copyright (C) 2001 The deal.II Authors
Everyone is permitted to copy and @@ -116,18 +103,19 @@ and development of free software which uses the Software. Granted Rights