--- bsh-2.0b4.orig/xxx +++ bsh-2.0b4/xxx @@ -0,0 +1,76 @@ +diff -pruN 2.0b4-8/debian/changelog 2.0b4-8ubuntu3/debian/changelog +--- 2.0b4-8/debian/changelog 2008-10-07 15:48:20.000000000 +0100 ++++ 2.0b4-8ubuntu3/debian/changelog 2008-10-07 15:48:20.000000000 +0100 +@@ -1,3 +1,30 @@ ++bsh (2.0b4-8ubuntu3) intrepid; urgency=low ++ ++ * bsh: Suggest libservlet2.4-java instead of libservlet2.3-java, ++ suggest default-jre | java-runtime instead of libgcj8-1-awt. ++ LP: #257402. ++ ++ -- Matthias Klose Mon, 08 Sep 2008 14:56:14 +0000 ++ ++bsh (2.0b4-8ubuntu2) intrepid; urgency=low ++ ++ * debian/control ++ - Replace build dependency libservlet2.3-java with libservlet2.4-java. ++ - Remove unneeded build dependency lynx. ++ - Replace suggests libservlet2.3-java with libservlet2.4-java. ++ - Remove libgcj8-1-awt from recommends to suggests. ++ * debian/rules ++ - Add appropriate jar file name for servlet api 2.4. ++ ++ -- Onkar Shinde Wed, 13 Aug 2008 00:43:22 +0530 ++ ++bsh (2.0b4-8ubuntu1) intrepid; urgency=low ++ ++ * Depend on default-jre-headless. ++ * Set Ubuntu maintainer address. ++ ++ -- Matthias Klose Thu, 31 Jul 2008 10:46:33 +0000 ++ + bsh (2.0b4-8) unstable; urgency=low + + * Build-Depends on default-jdk-builddep. Closes: #477849 +diff -pruN 2.0b4-8/debian/control 2.0b4-8ubuntu3/debian/control +--- 2.0b4-8/debian/control 2008-10-07 15:48:20.000000000 +0100 ++++ 2.0b4-8ubuntu3/debian/control 2008-10-07 15:48:20.000000000 +0100 +@@ -1,9 +1,10 @@ + Source: bsh + Section: devel + Priority: optional +-Maintainer: Debian Java Maintainers ++Maintainer: Ubuntu Core developers ++XSBC-Original-Maintainer: Debian Java Maintainers + Uploaders: Arnaud Vandyck , Michael Koch +-Build-Depends: debhelper (>= 4.2.30), cdbs, default-jdk-builddep, ant, libservlet2.3-java, libbsf-java, javacc, lynx ++Build-Depends: debhelper (>= 4.2.30), cdbs, default-jdk-builddep, ant, libservlet2.4-java, libbsf-java, javacc + Standards-Version: 3.7.3 + Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/bsh + Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/bsh +@@ -12,10 +13,10 @@ Homepage: http://www.beanshell.org/ + Package: bsh + Section: devel + Architecture: all +-Depends: java-gcj-compat | java1-runtime | java2-runtime, libjline-java +-Suggests: libservlet2.3-java, bsh-doc ++Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libjline-java ++Suggests: libservlet2.4-java, bsh-doc, default-jre | java1-runtime | java2-runtime + Enhances: libbsf-java +-Recommends: bsh-gcj, libgcj8-1-awt ++Recommends: bsh-gcj + Description: Java scripting environment (BeanShell) Version 2 + BeanShell is a small, free, embeddable, Java source interpreter with object + scripting language features, written in Java. BeanShell executes standard Java +diff -pruN 2.0b4-8/debian/rules 2.0b4-8ubuntu3/debian/rules +--- 2.0b4-8/debian/rules 2008-10-07 15:48:20.000000000 +0100 ++++ 2.0b4-8ubuntu3/debian/rules 2008-10-07 15:48:20.000000000 +0100 +@@ -10,7 +10,7 @@ include /usr/share/cdbs/1/rules/simple-p + JAVA_HOME := /usr/lib/jvm/default-java + ANT_HOME := /usr/share/ant + +-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar servlet-2.3 bsf javacc ++DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar servlet-api-2.4 bsf javacc + DEB_ANT_BUILD_TARGET := javadoc jarall test + + clean:: --- bsh-2.0b4.orig/debian/ant.properties +++ bsh-2.0b4/debian/ant.properties @@ -0,0 +1 @@ +javadoc-dir=api --- bsh-2.0b4.orig/debian/compat +++ bsh-2.0b4/debian/compat @@ -0,0 +1 @@ +6 --- bsh-2.0b4.orig/debian/bsh.poms +++ bsh-2.0b4/debian/bsh.poms @@ -0,0 +1 @@ +debian/pom.xml --no-parent --- bsh-2.0b4.orig/debian/watch +++ bsh-2.0b4/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=downloadurlmangle=s/zip/jar/ \ + http://www.beanshell.org/developer.html bsh-(\d.*)-src\.zip debian uupdate --- bsh-2.0b4.orig/debian/control +++ bsh-2.0b4/debian/control @@ -0,0 +1,53 @@ +Source: bsh +Section: java +Priority: optional +Maintainer: Debian Java Maintainers +Uploaders: Arnaud Vandyck , Michael Koch +Build-Depends: debhelper (>= 6), cdbs, default-jdk-builddep, ant, libservlet2.4-java, libbsf-java, javacc, maven-repo-helper +Standards-Version: 3.8.1 +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/bsh +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/bsh +Homepage: http://www.beanshell.org/ + +Package: bsh +Section: java +Architecture: all +Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless, libjline-java +Suggests: libservlet2.4-java, bsh-doc, default-jre | java1-runtime | java2-runtime, bsh-gcj +Enhances: libbsf-java +Description: Java scripting environment (BeanShell) Version 2 + BeanShell is a small, free, embeddable, Java source interpreter with object + scripting language features, written in Java. BeanShell executes standard Java + statements and expressions, in addition to obvious scripting commands and + syntax. BeanShell supports scripted objects as simple method closures like + those in Perl and JavaScript(tm). + . + You can use BeanShell interactively for Java experimentation and debugging or + as a simple scripting engine for you applications. In short: BeanShell is a + dynamically interpreted Java, plus some useful stuff. + +Package: bsh-gcj +Section: java +Architecture: any +Depends: bsh (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} +Description: Java scripting environment (BeanShell) Version 2 (native code) + BeanShell is a small, free, embeddable, Java source interpreter with object + scripting language features, written in Java. BeanShell executes standard Java + statements and expressions, in addition to obvious scripting commands and + syntax. BeanShell supports scripted objects as simple method closures like + those in Perl and JavaScript(tm). + . + You can use BeanShell interactively for Java experimentation and debugging or + as a simple scripting engine for you applications. In short: BeanShell is a + dynamically interpreted Java, plus some useful stuff. + . + This package contains the natively compiled code for use by gij. + +Package: bsh-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: bsh +Description: Documentation for bsh + The documentation includes the javadoc API for bsh version 2 as well as + the faq and manual in html-format. --- bsh-2.0b4.orig/debian/bsh-doc.docs +++ bsh-2.0b4/debian/bsh-doc.docs @@ -0,0 +1,4 @@ +docs/faq/*.html +docs/manual/html +docs/manual/images +api --- bsh-2.0b4.orig/debian/pom.xml +++ bsh-2.0b4/debian/pom.xml @@ -0,0 +1,28 @@ + + + + + 4.0.0 + + org.beanshell + beanshell + 2.0b4 + + bsh + BeanShell + BeanShell + + + + + + + + + + + + + + + --- bsh-2.0b4.orig/debian/copyright +++ bsh-2.0b4/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Wolfgang Baer on +Wed, 18 May 2005 12:06:43 +0200 based on the packaging of the former +upstream version. + +It was downloaded from + +Upstream Author: Pat Niemeyer + +Copyright: (c) 2005-2008 Pat Niemeyer + +License: + +This package is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; version 2.1 dated February 1999. + +This package is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. +You should have received a copy of the GNU Lesser General Public License +along with this package; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. --- bsh-2.0b4.orig/debian/README.Debian +++ bsh-2.0b4/debian/README.Debian @@ -0,0 +1,11 @@ +BeanShell for Debian GNU/Linux +------------------------------ + +To start BeanShell, type bsh for the command-line version, or xbsh for the +windowed version. If you have a non-free java version installed and chosen +via the alternatives system xbsh will start the Swing GUI shell workbench, +otherwise the AWT version will be used instead. + +xbsh (AWT version) will work with kaffe, sablevm and jamvm. + +Wolfgang Baer Fri, 5 Aug 2005 20:11:00 +0200 --- bsh-2.0b4.orig/debian/xbsh.1 +++ bsh-2.0b4/debian/xbsh.1 @@ -0,0 +1,41 @@ +.TH XBSH 1 +.SH NAME +xbsh \- BeanShell: A Java scripting environment (windowed version). +.SH SYNOPSIS +.B xbsh +.RB [\| \-classpath +.IR path \|] +.RI [\| file \|] +.br +.SH "DESCRIPTION +BeanShell is a small, embeddable, Java source interpreter with object scripting +language features, written in Java. BeanShell executes standard Java statements +and expressions, in addition to obvious scripting commands and syntax. You can +also script objects as simple method closures like those in Perl and +JavaScript(tm). + +.B xbsh +starts the windowed version of BeanShell. +.SH OPTIONS +The program +.B xbsh +optionally takes a +.B \-classpath +option which sets the value of the +.B CLASSPATH +environment variable to the specified path before starting the BeanShell. This +option is mainly provided for compatibility with JDE (Java Development +Environment for Emacs). + +In addition, a file to be executed may be given as argument to +.BR xbsh . +.SH "SEE ALSO" +.B bsh +- the command-line version of BeanShell. + +More documentation on BeanShell can be found in +.I /usr/share/doc/bsh-doc/ +if the bsh-doc package is installed. +.SH AUTHOR +This manual page was written by Ruud de Rooij +for the Debian GNU/Linux system (but may be used by others). --- bsh-2.0b4.orig/debian/bsh-doc.doc-base.1 +++ bsh-2.0b4/debian/bsh-doc.doc-base.1 @@ -0,0 +1,9 @@ +Document: bsh-doc1 +Title: Manual for BeanShell +Author: Pat Niemeyer +Abstract: This is the manual of the Java scripting environment BeanShell. +Section: Programming/Java + +Format: HTML +Index: /usr/share/doc/bsh-doc/html/index.html +Files: /usr/share/doc/bsh-doc/html/*.html --- bsh-2.0b4.orig/debian/bsh.menu +++ bsh-2.0b4/debian/bsh.menu @@ -0,0 +1,4 @@ +?package(bsh):needs="text" section="Applications/Programming" \ + title="BeanShell (text)" command="/usr/bin/bsh" +?package(bsh):needs="X11" section="Applications/Programming" \ + title="BeanShell (windowed)" command="/usr/bin/xbsh" --- bsh-2.0b4.orig/debian/bsh.1 +++ bsh-2.0b4/debian/bsh.1 @@ -0,0 +1,42 @@ +.TH BSH 1 +.SH NAME +bsh \- BeanShell: A Java scripting environment (command-line version). +.SH SYNOPSIS +.B bsh +.RB [\| \-classpath +.IR path \|] +.RI [\| file \|] +.br + +.SH "DESCRIPTION +BeanShell is a small, embeddable, Java source interpreter with object scripting +language features, written in Java. BeanShell executes standard Java statements +and expressions, in addition to obvious scripting commands and syntax. You can +also script objects as simple method closures like those in Perl and +JavaScript(tm). + +.B bsh +starts the command-line version of BeanShell. +.SH OPTIONS +The program +.B bsh +optionally takes a +.B \-classpath +option which sets the value of the +.B CLASSPATH +environment variable to the specified path before starting the BeanShell. This +option is mainly provided for compatibility with JDE (Java Development +Environment for Emacs). + +In addition, a file to be executed may be given as argument to +.BR bsh . +.SH "SEE ALSO" +.B xbsh +- the windowed version of BeanShell. + +More documentation on BeanShell can be found in +.I /usr/share/doc/bsh-doc/ +if the bsh-doc package is installed. +.SH AUTHOR +This manual page was written by Ruud de Rooij +for the Debian GNU/Linux system (but may be used by others). --- bsh-2.0b4.orig/debian/bsh.dirs +++ bsh-2.0b4/debian/bsh.dirs @@ -0,0 +1,2 @@ +usr/share/java +usr/bin --- bsh-2.0b4.orig/debian/_bsh +++ bsh-2.0b4/debian/_bsh @@ -0,0 +1,12 @@ +#!/bin/sh + +if [ "$1" = "-classpath" ] +then + CLASSPATH="$2" + shift 2 +fi + +CLASSPATH="${CLASSPATH:-.}:/usr/share/java/jline.jar:/usr/share/java/bsh.jar" +export CLASSPATH + +exec /usr/bin/java jline.ConsoleRunner bsh.Interpreter "$@" --- bsh-2.0b4.orig/debian/xbsh +++ bsh-2.0b4/debian/xbsh @@ -0,0 +1,12 @@ +#!/bin/sh + +if [ "$1" = "-classpath" ] +then + CLASSPATH="$2" + shift 2 +fi + +CLASSPATH="${CLASSPATH:-.}:/usr/share/java/bsh.jar" +export CLASSPATH + +exec /usr/bin/java bsh.Console "$@" --- bsh-2.0b4.orig/debian/rules +++ bsh-2.0b4/debian/rules @@ -0,0 +1,51 @@ +#!/usr/bin/make -f +# debian/rules file for bsh (uses cdbs) + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := servlet-api-2.4 bsf javacc +DEB_ANT_BUILD_TARGET := javadoc jarall test + +include /usr/share/gcj/debian_defaults +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) + with_gcj_native := yes +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + export ANT_OPTS=-Dcompile.debug=true -Dcompile.optimize=false +else + export ANT_OPTS=-Dcompile.debug=true -Dcompile.optimize=true +endif + +clean:: + # remove tests which also fail with SUN JDK 1.4 + rm -f tests/test-scripts/accessibility.bsh \ + tests/test-scripts/class13.bsh \ + tests/test-scripts/class3.bsh \ + tests/test-scripts/classinterf1.bsh \ + tests/test-scripts/strings.bsh + -rm -rf debian/tmp + +install/$(PACKAGE):: + mh_installpoms -p$(PACKAGE) + mh_installjar -p$(PACKAGE) -l debian/pom.xml dist/$(PACKAGE)-$(VERSION).jar + install -m 755 debian/_bsh debian/bsh/usr/bin/bsh + install -m 755 debian/xbsh debian/bsh/usr/bin/ + +ifeq ($(with_gcj_native),yes) +install/bsh-gcj:: install/bsh + dh_nativejava -pbsh-gcj +endif + +get-orig-source: + -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack + +get-orig-pom: + wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/org/beanshell/bsh/$(VERSION)/bsh-$(VERSION).pom + + --- bsh-2.0b4.orig/debian/bsh-doc.doc-base.2 +++ bsh-2.0b4/debian/bsh-doc.doc-base.2 @@ -0,0 +1,9 @@ +Document: bsh-doc2 +Title: Javadoc API for BeanShell +Author: Pat Niemeyer +Abstract: The javadoc API of the Java scripting environment BeanShell. +Section: Programming + +Format: HTML +Index: /usr/share/doc/bsh-doc/api/index.html +Files: /usr/share/doc/bsh-doc/api/* --- bsh-2.0b4.orig/debian/changelog +++ bsh-2.0b4/debian/changelog @@ -0,0 +1,222 @@ +bsh (2.0b4-10ubuntu1) karmic; urgency=low + + * Merge with Debian. + * Suggest bsh-gcj instead of recommending it; should be reverted after + the karmic release. + + -- Matthias Klose Sun, 18 Oct 2009 17:28:39 +0200 + +bsh (2.0b4-10) unstable; urgency=low + + * Upload to unstable. + + -- Torsten Werner Sun, 09 Aug 2009 10:28:52 +0200 + +bsh (2.0b4-9) experimental; urgency=low + + * Change section to java, bump up Standards-Version to 3.8.1 + * Add support for -classpath option on xbsh script (closes: #504784) + * rules: add optional support for gcj and optimisation + * Add the Maven POM to the package, + * Add a Build-Depends dependency on maven-repo-helper + * Use mh_installpom and mh_installjar to install the POM and the jar to the + Maven repository + + -- Ludovic Claude Sat, 09 May 2009 20:38:06 +0100 + +bsh (2.0b4-8ubuntu3) intrepid; urgency=low + + * bsh: Suggest libservlet2.4-java instead of libservlet2.3-java, + suggest default-jre | java-runtime instead of libgcj8-1-awt. + LP: #257402. + + -- Matthias Klose Mon, 08 Sep 2008 14:56:14 +0000 + +bsh (2.0b4-8ubuntu2) intrepid; urgency=low + + * debian/control + - Replace build dependency libservlet2.3-java with libservlet2.4-java. + - Remove unneeded build dependency lynx. + - Replace suggests libservlet2.3-java with libservlet2.4-java. + - Remove libgcj8-1-awt from recommends to suggests. + * debian/rules + - Add appropriate jar file name for servlet api 2.4. + + -- Onkar Shinde Wed, 13 Aug 2008 00:43:22 +0530 + +bsh (2.0b4-8ubuntu1) intrepid; urgency=low + + * Depend on default-jre-headless. + * Set Ubuntu maintainer address. + + -- Matthias Klose Thu, 31 Jul 2008 10:46:33 +0000 + +bsh (2.0b4-8) unstable; urgency=low + + * Build-Depends on default-jdk-builddep. Closes: #477849 + * Clarified debian/copyright. + * Put bsh-doc.doc-base.1 into Programming/Java section. + * Added Homepage, Vcs-Svn and Vcs-Browser fields. + * Updated Standards-Version to 3.7.3. + * Added watch file. + + -- Michael Koch Sun, 27 Apr 2008 20:12:21 -0100 + +bsh (2.0b4-7) unstable; urgency=low + + * Fixed menu file to follow new policy. + * Recommend libgcj-8-1-awt instead of libgcj-7-1-awt. + + -- Michael Koch Thu, 01 Nov 2007 07:32:43 +0100 + +bsh (2.0b4-6) unstable; urgency=low + + * bsh: Removed Recommends on xlibs. Closes: #372852. + * bsh: Recommend libgcj7-1-awt. Closes: #401461. + + -- Michael Koch Tue, 26 Jun 2007 09:16:37 +0200 + +bsh (2.0b4-5) unstable; urgency=low + + * Build a bsh-gcj package. + * Move Build-Depends-Indep to Build-Depends. + * Added myself to Uploaders and removed Wolfgang. + + -- Michael Koch Sun, 10 Jun 2007 14:30:58 -0100 + +bsh (2.0b4-4) unstable; urgency=low + + * depends on java-gcj-compat (closes: #370411) + * updated Standards Version to 3.7.2, nothing to do. + * build with java-gcj-compat, kaffe removed from build-dep. + + -- Arnaud Vandyck Tue, 6 Jun 2006 09:41:10 +0000 + +bsh (2.0b4-3) unstable; urgency=low + + * kaffe compiler transition + + -- Wolfgang Baer Mon, 16 Jan 2006 14:01:07 +0100 + +bsh (2.0b4-2) unstable; urgency=low + + * With the recent packaging of jline we are now able to provide a pure java + commandline history function for bsh and therefore we can close our oldest + bug (closes: #80572, #305529) + + Added libjline-java to depends + + Modified startup script to make use of jline + * Register documentation with doc-base + * Updated FSF address in debian/copyright + + -- Wolfgang Baer Thu, 13 Oct 2005 16:34:14 +0200 + +bsh (2.0b4-1) unstable; urgency=low + + * New upstream release (closes: #261393, 321633) + * Move to main - as libbsf-java moved to main + * Build with kaffe / jikes - no more non-free JDK needed (closes: #306597) + * Changed build system to cdbs + * Patches: + + Enable build of bsf adapter (01_EnableBsfAdapter_buildXml.patch) + + Use AWTConsole if gnu classpath derived vm (02_GNUvms_workaround.patch) + + target=1.3 to support JDK 1.3 (03_target13_buildXml.patch) + * Added new documentation package and added javadoc + * Added libbsf-java as Enhances (provides bsf adapter) and build-depends + * Enabled junit tests - removed tests which also fail with SUN JDK + * Changed libant1.6-java build-dep to ant (now in main) + * Splitted bsh manpage into one for each version (bsh and xbsh) + * Standards-Version 3.6.2 (no changes) + * Added myself to uploaders + + * Upload sponsored by Petter Reinholdtsen + + -- Wolfgang Baer Fri, 5 Aug 2005 20:11:00 +0200 + +bsh (1.3.0-3) unstable; urgency=low + + * debian/rules: apply a patch from Grzegorz B. Prokopski to change the + directory for the compiler (closes: #300497). + * debian/control: added lynx to the build-dep-indep. + + -- Arnaud Vandyck Wed, 23 Mar 2005 14:17:26 +0100 + +bsh (1.3.0-2) unstable; urgency=low + + * debian/bsh.1: changed the location of the 'more documentation' + location. Thanks to Alex Malinovich (closes: #226955). + + -- Arnaud Vandyck Sat, 10 Jan 2004 01:00:13 +0100 + +bsh (1.3.0-1) unstable; urgency=low + + * New upstream release (closes: #192186). + * New maintainer (closes: #224860). + * debian/control: + - Build-Depends-Indep: changed the debhelper version depends, added + javacc (now in Debian), added j2sdk1.3. + - Standards-Version: 3.6.1 (but did not change anything). + - Description: removed the leading `A', added Homepage. + * debian/rule: + - removed the JAVACC_DIR variable and changed the location of jjtree + and javacc + * debian/xbsh: + - added minimal and maximal size of the virtual machine. + + -- Arnaud Vandyck Sun, 28 Dec 2003 01:42:13 +0100 + +bsh (1.2b6-2) unstable; urgency=low + + * Orphan the package. + + -- Tollef Fog Heen Tue, 23 Dec 2003 02:04:34 +0100 + +bsh (1.2b6-1) unstable; urgency=low + + * New upstream version (closes: #159673) + + -- Tollef Fog Heen Mon, 9 Sep 2002 22:52:59 +0200 + +bsh (1.1alpha5-1) unstable; urgency=low + + * New maintainer (closes: #90307) + * New upstream version + * Build with j2sdk1.3 available from blackdown. I think it still works + with older jre's. (It does, according to the docs.) + * add bsh/classpath/*.class into the jar file + * Updated standards-version to 3.5.2 + + -- Tollef Fog Heen Mon, 16 Apr 2001 22:34:58 +0200 + +bsh (1.0-beta-2) unstable; urgency=low + + * Forgot to include bsh/commands/*.bsh into jar file. + + -- Ruud de Rooij Fri, 5 Nov 1999 22:28:59 +0100 + +bsh (1.0-beta-1) unstable; urgency=low + + * New upstream release. + * Move from non-free to contrib, since BeanShell is now LGPL but depends + on JavaCC for compilation. + * Updated debian/control, debian/copyright and debian/rules. + + -- Ruud de Rooij Fri, 5 Nov 1999 21:17:35 +0100 + +bsh (0.96-3) unstable; urgency=low + + * Standards-Version: 3.0.1. + + -- Ruud de Rooij Tue, 7 Sep 1999 18:42:09 +0200 + +bsh (0.96-2) unstable; urgency=low + + * Removed `free' from the package description. + + -- Ruud de Rooij Mon, 16 Aug 1999 20:18:45 +0200 + +bsh (0.96-1) unstable; urgency=low + + * Initial Release. + + -- Ruud de Rooij Sun, 11 Jul 1999 12:41:22 +0200 + --- bsh-2.0b4.orig/debian/bsh.manpages +++ bsh-2.0b4/debian/bsh.manpages @@ -0,0 +1,2 @@ +debian/bsh.1 +debian/xbsh.1 --- bsh-2.0b4.orig/debian/patches/02_GNUvms_workaround.patch +++ bsh-2.0b4/debian/patches/02_GNUvms_workaround.patch @@ -0,0 +1,45 @@ +--- src/bsh/Console.java.orig 2003-08-29 17:11:14.000000000 +0200 ++++ src/bsh/Console.java 2005-02-22 23:20:35.422962248 +0100 +@@ -35,6 +35,7 @@ + package bsh; + + import bsh.util.*; ++import java.util.Properties; + + /** + Console startup class. +@@ -47,18 +48,25 @@ + System.out.println("Can't find the BeanShell utilities..."); + + if ( Capabilities.haveSwing() ) +- { +- bsh.util.Util.startSplashScreen(); +- try { +- new Interpreter().eval("desktop()"); +- } catch ( EvalError e ) { +- System.err.println("Couldn't start desktop: "+e); ++ { ++ ++ // Test if gnu classpath vm ++ Properties props = System.getProperties(); ++ if(props.getProperty("gnu.classpath.version") == null) { // ok sun vm ++ ++ bsh.util.Util.startSplashScreen(); ++ try { ++ new Interpreter().eval("desktop()"); ++ } catch ( EvalError e ) { ++ System.err.println("Couldn't start desktop: "+e); ++ } ++ } ++ else { // gnu classpath derived vm ++ AWTConsole.main( args ); + } + } else { + System.err.println( +- "Can't find javax.swing package: " +- +" An AWT based Console is available but not built by default."); +- //AWTConsole.main( args ); ++ "Can't find javax.swing package ! "); + } + } + } --- bsh-2.0b4.orig/debian/patches/03_target13_buildXml.patch +++ bsh-2.0b4/debian/patches/03_target13_buildXml.patch @@ -0,0 +1,11 @@ +--- build.xml.orig 2005-08-08 20:13:21.000000000 +0200 ++++ build.xml 2005-08-08 20:21:33.000000000 +0200 +@@ -159,7 +159,7 @@ + optimize="on" + debug="off" + includes="**/*.java" +- excludes="${excludes},**/bak/**" ++ excludes="${excludes},**/bak/**" target="1.3" + > + + --- bsh-2.0b4.orig/debian/patches/01_EnableBsfAdapter_buildXml.patch +++ bsh-2.0b4/debian/patches/01_EnableBsfAdapter_buildXml.patch @@ -0,0 +1,15 @@ +--- build.xml.orig 2005-08-08 19:56:01.000000000 +0200 ++++ build.xml 2005-08-06 21:16:21.000000000 +0200 +@@ -54,10 +54,10 @@ + --> + + ++ + +- ++ --> +