rename com.myjavatools.web to net.chiark.yarrg

[jarrg-ian.git] / LICENCE

diff --git a/LICENCE b/LICENCE
index 9ee4d5ffd8400f72168c7e9f7f3c750f7616016c..26dd23f02b36bef3f573941349036e506620920c 100644 (file)
--- a/LICENCE
+++ b/LICENCE
@@ -1,11 +1,23 @@
 jpctb is Free Software.
 
-The Linux wrapper script is copyright (C) 2009 Ian Jackson
+The Linux "jpctb" wrapper script is:
+  Copyright (C) 2009-2010 Ian Jackson
 
-com.tedpearson.* Java source code is copyright (C) 2009 Ted Pearson
-and Owen Dunn
+com.tedpearson.* Java source code is:
+  Copyright (C) 2009 Ted Pearson and Owen Dunn
+  Copyright (C) 2010 Owen Dunn and Ian Jackson
 
-All other components are copyright (C) 2009 Owen Dunn.
+net.chiark.yarrg.ClientHttpRequest.java is copyright Vlad Petryshev,
+Ted Pearson, and Owen Dunn and licensed under the Apache license
+version 2.0 (see src/net/chiark/yarrg/ClientHttpRequest.licence)
+
+Java Accessibility Utilities are (C) Sun Microsystems Inc. and
+distributed under the Java Accessibility Utilities Version 1.3 Binary
+Code License Agreement
+
+All other components are:
+  Copyright (C) 2009 Owen Dunn
+  Copyright (C) 2010 Owen Dunn and Ian Jackson
 
 All of the above are distributed under the terms of the following
 licence:
@@ -29,10 +41,3 @@ licence:
 # IN THE SOFTWARE.
 
 
-com.myjavatools.web.* Java source code is copyright Vlad Petryshev,
-Ted Pearson, and Owen Dunn and licensed under the Apache license
-version 2.0 (see http://www.myjavatools.com/license.txt)
-
-Java Accessibility Utilities are (C) Sun Microsystems Inc. and
-distributed under the Java Accessibility Utilities Version 1.3 Binary
-Code License Agreement