[pkg-java] r13090 - in trunk/bsh/debian: . patches

[Niels Thykier]

Author: nthykier
Date: 2010-11-21 19:09:32 +0000 (Sun, 21 Nov 2010)
New Revision: 13090

Added:
   trunk/bsh/debian/patches/04_fix_typo.patch
Modified:
   trunk/bsh/debian/changelog
   trunk/bsh/debian/patches/01_EnableBsfAdapter_buildXml.patch
   trunk/bsh/debian/patches/02_GNUvms_workaround.patch
   trunk/bsh/debian/patches/03_target13_buildXml.patch
   trunk/bsh/debian/patches/series
Log:
Added patch descriptions and fixed a typo in the source.

Modified: trunk/bsh/debian/changelog
===================================================================
--- trunk/bsh/debian/changelog	2010-11-21 19:08:39 UTC (rev 13089)
+++ trunk/bsh/debian/changelog	2010-11-21 19:09:32 UTC (rev 13090)
@@ -5,7 +5,9 @@
   * Replaced B-D on default-jdk-builddep with gcj-native-helper and
     default-jdk.
   * Bumped Standards-Versions 3.9.1 - no changes required.
-  * Updated README.Debian to better reflect the current times.g
+  * Updated README.Debian to better reflect the current times.
+  * Added descriptions to the patches.
+  * Added patch to fix a typo in the upstream code.
 
  -- Niels Thykier <niels at thykier.net>  Tue, 29 Jun 2010 23:59:48 +0200
 

Modified: trunk/bsh/debian/patches/01_EnableBsfAdapter_buildXml.patch
===================================================================
--- trunk/bsh/debian/patches/01_EnableBsfAdapter_buildXml.patch	2010-11-21 19:08:39 UTC (rev 13089)
+++ trunk/bsh/debian/patches/01_EnableBsfAdapter_buildXml.patch	2010-11-21 19:09:32 UTC (rev 13090)
@@ -1,3 +1,6 @@
+Description: Build without the BSF adapter.
+Author: Wolfgang Baer <WBaer at gmx.de>
+
 --- bsh~/build.xml	2005-08-08 19:56:01.000000000 +0200
 +++ bsh/build.xml	2005-08-06 21:16:21.000000000 +0200
 @@ -54,10 +54,10 @@

Modified: trunk/bsh/debian/patches/02_GNUvms_workaround.patch
===================================================================
--- trunk/bsh/debian/patches/02_GNUvms_workaround.patch	2010-11-21 19:08:39 UTC (rev 13089)
+++ trunk/bsh/debian/patches/02_GNUvms_workaround.patch	2010-11-21 19:09:32 UTC (rev 13090)
@@ -1,3 +1,7 @@
+Description: Insert a work around for GNU JVMs to use an AWT based GUI instead
+ of swing.
+Author: Wolfgang Baer <WBaer at gmx.de>
+
 --- bsh~/src/bsh/Console.java	2003-08-29 17:11:14.000000000 +0200
 +++ bsh/src/bsh/Console.java	2005-02-22 23:20:35.422962248 +0100
 @@ -35,6 +35,7 @@

Modified: trunk/bsh/debian/patches/03_target13_buildXml.patch
===================================================================
--- trunk/bsh/debian/patches/03_target13_buildXml.patch	2010-11-21 19:08:39 UTC (rev 13089)
+++ trunk/bsh/debian/patches/03_target13_buildXml.patch	2010-11-21 19:09:32 UTC (rev 13090)
@@ -1,3 +1,6 @@
+Description: Compile 1.3 java code.
+Author: Wolfgang Baer <WBaer at gmx.de>
+
 --- bsh~/build.xml	2005-08-08 20:13:21.000000000 +0200
 +++ bsh/build.xml	2005-08-08 20:21:33.000000000 +0200
 @@ -159,7 +159,7 @@

Added: trunk/bsh/debian/patches/04_fix_typo.patch
===================================================================
--- trunk/bsh/debian/patches/04_fix_typo.patch	                        (rev 0)
+++ trunk/bsh/debian/patches/04_fix_typo.patch	2010-11-21 19:09:32 UTC (rev 13090)
@@ -0,0 +1,14 @@
+Description: Fixes a typo.
+Author: Niels Thykier <niels at thykier.net>
+
+--- a/src/bsh/BshClassManager.java	2010-11-21 19:59:08.597086821 +0100
++++ b/src/bsh/BshClassManager.java	2010-11-21 20:01:06.128078201 +0100
+@@ -493,7 +493,7 @@
+ 		if ( cur != null )
+ 			throw new InterpreterError("Defining class problem: "+className 
+ 				+": BeanShell cannot yet simultaneously define two or more "
+-				+"dependant classes of the same name.  Attempt to define: "
++				+"dependent classes of the same name.  Attempt to define: "
+ 				+ className +" while defining: "+cur 
+ 			);
+ 		definingClasses.put( className, NOVALUE );

Modified: trunk/bsh/debian/patches/series
===================================================================
--- trunk/bsh/debian/patches/series	2010-11-21 19:08:39 UTC (rev 13089)
+++ trunk/bsh/debian/patches/series	2010-11-21 19:09:32 UTC (rev 13090)
@@ -1,3 +1,4 @@
 01_EnableBsfAdapter_buildXml.patch
 02_GNUvms_workaround.patch
 03_target13_buildXml.patch
+04_fix_typo.patch