This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository bsh.
commit e6e11147ce278eb7f7813550b50018ca4f8f42db Author: Niels Thykier <[email protected]> Date: Sun Nov 21 19:09:32 2010 +0000 Added patch descriptions and fixed a typo in the source. --- debian/changelog | 4 +++- debian/patches/01_EnableBsfAdapter_buildXml.patch | 3 +++ debian/patches/02_GNUvms_workaround.patch | 4 ++++ debian/patches/03_target13_buildXml.patch | 3 +++ debian/patches/04_fix_typo.patch | 14 ++++++++++++++ debian/patches/series | 1 + 6 files changed, 28 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ef90d95..0e9a33d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,9 @@ bsh (2.0b4-13) UNRELEASED; urgency=low * 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 <[email protected]> Tue, 29 Jun 2010 23:59:48 +0200 diff --git a/debian/patches/01_EnableBsfAdapter_buildXml.patch b/debian/patches/01_EnableBsfAdapter_buildXml.patch index a8a05a8..439df93 100644 --- a/debian/patches/01_EnableBsfAdapter_buildXml.patch +++ b/debian/patches/01_EnableBsfAdapter_buildXml.patch @@ -1,3 +1,6 @@ +Description: Build without the BSF adapter. +Author: Wolfgang Baer <[email protected]> + --- 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 @@ diff --git a/debian/patches/02_GNUvms_workaround.patch b/debian/patches/02_GNUvms_workaround.patch index 6ba4fb4..a412381 100644 --- a/debian/patches/02_GNUvms_workaround.patch +++ b/debian/patches/02_GNUvms_workaround.patch @@ -1,3 +1,7 @@ +Description: Insert a work around for GNU JVMs to use an AWT based GUI instead + of swing. +Author: Wolfgang Baer <[email protected]> + --- 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 @@ diff --git a/debian/patches/03_target13_buildXml.patch b/debian/patches/03_target13_buildXml.patch index fbd679e..862101b 100644 --- a/debian/patches/03_target13_buildXml.patch +++ b/debian/patches/03_target13_buildXml.patch @@ -1,3 +1,6 @@ +Description: Compile 1.3 java code. +Author: Wolfgang Baer <[email protected]> + --- 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 @@ diff --git a/debian/patches/04_fix_typo.patch b/debian/patches/04_fix_typo.patch new file mode 100644 index 0000000..6cd8b2b --- /dev/null +++ b/debian/patches/04_fix_typo.patch @@ -0,0 +1,14 @@ +Description: Fixes a typo. +Author: Niels Thykier <[email protected]> + +--- 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 ); diff --git a/debian/patches/series b/debian/patches/series index 67afd4a..4f08741 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 01_EnableBsfAdapter_buildXml.patch 02_GNUvms_workaround.patch 03_target13_buildXml.patch +04_fix_typo.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bsh.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
