On Wed, Nov 14, 2007 at 10:20:12PM +0100, Jaap Keuter wrote:
> So even though I'm not happy with this stuff it seems to be needed to
> keep *stupid* people of our lists.
I obviously think so too, but that doesn't mean we shouldn't add some
<not legally binding>explanations</not legally bindingg> around our
additions. Also, the disambuguities and errors that Ulf pointed out
should be fixed. It seems to me that there is still need for discussion,
so I've attached a proposed change to the COPYING file instead of just
checking it in.
Feedback welcome.
ciao
Joerg
--
Joerg Mayer <jmayer@xxxxxxxxx>
We are stuck with technology when what we really want is just stuff that
works. Some say that should read Microsoft instead of technology.
Index: COPYING
===================================================================
--- COPYING (revision 23441)
+++ COPYING (working copy)
@@ -1,26 +1,40 @@
-Wireshark is distributed under the GNU GPL. There are no restrictions
-on its use. There are significant restrictions on its distribution.
+This file consists of two parts:
+Part I: Consists of some remarks regarding the license given in
+Part II: The actual license that coveres Wireshark.
+
+When in doubt: Part II is the legally binding part, Part I is just
+there to make it easier for people that are not familiar with the
+GPLv2.
+
+
+------------------------------------------------------------------------
+Part I:
+
+Wireshark is distributed under the GNU GPLv2. There are no restrictions
+on its use. There are restrictions on its distribution in source or
+binary form.
+
Most parts of Wireshark are covered by a "GPL version 2 or later" LICENSE.
Some files are covered by different licenses that are compatible with
the GPLv2.
+
As a notable exception the pidl utility at tools/pidl is covered by a
"GPL version 3 or later" LICENSE. Note that only the tool itself
is covered by this license, not the source code generated by it. The
-pidl authors do not consider that code a derived work of pidl.
+pidl authors do not consider generated code a derived work of pidl.
-Parts of Wireshark can be built and distributed as libraries. These
+Parts of Wireshark can be built and distributed as libraries. These
parts are still covered by the GPL, and NOT by the Lesser General Public
License or any other license.
-If you create a combined work using all or part of Wireshark, then your
-combined work must be released under a license compatible with the GPL.
+If integrate all or part of Wireshark into your own application, then that
+application must be released under a license compatible with the GPL.
-...and don't get us started on trademarks.
-
The full text of the GNU GPL follows.
------------------------------------------------------------------------
+Part II:
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
