chiark
/
gitweb
/
~mdw
/
adns
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f81acc5
)
licence waiver section improved
author
ian
<ian>
Sat, 8 Apr 2006 13:16:34 +0000
(13:16 +0000)
committer
ian
<ian>
Sat, 8 Apr 2006 13:16:34 +0000
(13:16 +0000)
GPL-vs-LGPL
patch
|
blob
|
blame
|
history
LICENCE.WAIVERS
patch
|
blob
|
blame
|
history
diff --git
a/GPL-vs-LGPL
b/GPL-vs-LGPL
index e5345b135ddf22870808d6c01cc8f42b7de42ba7..90efd72fc1565a43ef6bfd4e80623c2c9f603eba 100644
(file)
--- a/
GPL-vs-LGPL
+++ b/
GPL-vs-LGPL
@@
-106,7
+106,11
@@
Instead, you will need to negotiate a separate proprietary licence for
adns.
The List Price for a proprietary but LGPL-compatible application which
adns.
The List Price for a proprietary but LGPL-compatible application which
-uses adns is EUR150,000 per program per 10,000 users or part thereof.
+uses adns is EUR150,000 per program per 10,000 users or part thereof,
+of which I will donate 25% to a Free Software organisation of my
+choice (as recognition for the contributions and help I have received
+from the Free Software communicy).
+
Discounts may be available, particularly if I approve of your product.
So, if you are serious about proprietary software, and paying for the
software that you use, please contact me to negotiate a good deal.
Discounts may be available, particularly if I approve of your product.
So, if you are serious about proprietary software, and paying for the
software that you use, please contact me to negotiate a good deal.
diff --git
a/LICENCE.WAIVERS
b/LICENCE.WAIVERS
index 5e7ee6826e793a198105c5a283748d28b66e7d75..e0db3edb9556b9466b024937e092573976cb7bcf 100644
(file)
--- a/
LICENCE.WAIVERS
+++ b/
LICENCE.WAIVERS
@@
-13,7
+13,7
@@
IMPORTANT NOTES
`fanftest', `adnslogres' and `adnsheloex' are (partially) copyright
Tony Finch and to that extent are not covered by the waivers. I
believe - but do not warrant - that the rest of adns is (at the
`fanftest', `adnslogres' and `adnsheloex' are (partially) copyright
Tony Finch and to that extent are not covered by the waivers. I
believe - but do not warrant - that the rest of adns is (at the
- time of writing, 1
6th of March 2005) entirely my work
, but please
+ time of writing, 1
9th of November 2005) entirely mine
, but please
check the copyright notices on the individual files.
* These waivers apply only in the specified circumstances.
check the copyright notices on the individual files.
* These waivers apply only in the specified circumstances.
@@
-23,7
+23,7
@@
IMPORTANT NOTES
to the one with the LICENCE.WAIVERS file. But they do not
necessarily apply to future versions of adns.
to the one with the LICENCE.WAIVERS file. But they do not
necessarily apply to future versions of adns.
- - iwj,
4th May 2004
+ - iwj,
19th November 2005
Affero GPL
Affero GPL