Merge branch 'owen' into felix

diff --git a/LICENCE b/LICENCE
new file mode 100644 (file)
index 0000000..9ee4d5f
--- /dev/null
+++ b/LICENCE
@@ -0,0 +1,38 @@
+jpctb is Free Software.
+
+The Linux wrapper script is copyright (C) 2009 Ian Jackson
+
+com.tedpearson.* Java source code is copyright (C) 2009 Ted Pearson
+and Owen Dunn
+
+All other components are copyright (C) 2009 Owen Dunn.
+
+All of the above are distributed under the terms of the following
+licence:
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is fur-
+# nished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+# NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIA-
+# BILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# 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

diff --git a/jpctb b/jpctb
index c55f90cbb5c6df97094c5f1062034c404070825c..fbc732adef64a539151dd88b22de17f9094fb7ad 100755 (executable)
--- a/jpctb
+++ b/jpctb
@@ -159,7 +159,7 @@ rm -rf -- "$jtmp"
 mkdir -- "$jtmp" "$extdir" "$linkfarm"
 cp "$srcjardir"/PCTB*.jar "$extdir"
 
-lndir -silent "$javadir" "$linkfarm"
+cp -Rs "$javadir"/. "$linkfarm"/.
 
 #---------- edit the linkfarm to have our jvm wrapper ----------
 

diff --git a/src/winsetup.nsi b/src/winsetup.nsi
index 333e0425befda8a574613782500adf6e85477558..86da9420043da80a72d81b75d28f235d59cceedd 100644 (file)
--- a/src/winsetup.nsi
+++ b/src/winsetup.nsi
@@ -51,7 +51,7 @@ IfFileExists $YPPDIR\java 0 NoYPPJ15
 Abort "YPP currently using internal Java 1.5.  You will need to uninstall Puzzle Pirates and then reinstall it before rerunning this installer."
 NoYPPJ15:
 IfFileExists $YPPDIR\java_vm 0 NOYPPJ16
-Abort "YPP currently using internal Java 1.5.  You will need to uninstall Puzzle Pirates and then reinstall it before rerunning this installer."
+Abort "YPP currently using internal Java 1.6.  You will need to uninstall Puzzle Pirates and then reinstall it before rerunning this installer."
 NoYPPJ16:
 DetailPrint "Found YPP in $YPPDIR"
 FunctionEnd