CVS bsh/debian
Wolfgang B??r
wbaer-guest at haydn.debian.org
Sun Aug 14 15:35:43 UTC 2005
Update of /cvsroot/pkg-java/bsh/debian
In directory haydn:/tmp/cvs-serv11264/bsh/debian
Modified Files:
README.Debian bsh.1 changelog control copyright rules xbsh
Added Files:
_bsh bsh-doc.docs bsh.dirs bsh.manpages bsh.menu compat xbsh.1
Removed Files:
bsh bsh.html dirs menu
Log Message:
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)
--- /cvsroot/pkg-java/bsh/debian/README.Debian 2004/01/18 22:13:04 1.1.1.1
+++ /cvsroot/pkg-java/bsh/debian/README.Debian 2005/08/14 15:35:42 1.2
@@ -2,14 +2,10 @@
------------------------------
To start BeanShell, type bsh for the command-line version, or xbsh for the
-windowed version. To use the Swing interface, make sure that the Swing
-libraries are included in your CLASSPATH environment variable before starting
-xbsh.
+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.
-BeanShell has not been tested with Java virtual machines other than JDK 1.3.
-Please report any feedback (both positive and negative) on using BeanShell with
-"alternative" Java virtual machines.
+xbsh (AWT version) will work with kaffe, sablevm and jamvm.
-To compile this package for Debian, certain JDK1.3 features have been disabled.
-
-Ruud de Rooij <ruud at debian.org> Fri, 5 Nov 1999 19:48:54 +0100
+Wolfgang Baer <WBaer at gmx.de> Fri, 5 Aug 2005 20:11:00 +0200
--- /cvsroot/pkg-java/bsh/debian/bsh.1 2004/01/18 22:13:04 1.1.1.1
+++ /cvsroot/pkg-java/bsh/debian/bsh.1 2005/08/14 15:35:42 1.2
@@ -1,13 +1,13 @@
.TH BSH 1
.SH NAME
-bsh \- BeanShell: A Java scripting environment.
+bsh \- BeanShell: A Java scripting environment (command-line version).
.SH SYNOPSIS
.B bsh
.RB [\| \-classpath
.IR path \|]
.RI [\| file \|]
.br
-.B xbsh
+
.SH "DESCRIPTION
BeanShell is a small, embeddable, Java source interpreter with object scripting
language features, written in Java. BeanShell executes standard Java statements
@@ -16,9 +16,7 @@
JavaScript(tm).
.B bsh
-starts the command-line version of BeanShell, whereas
-.B xbsh
-starts the windowed version.
+starts the command-line version of BeanShell.
.SH OPTIONS
The program
.B bsh
@@ -33,8 +31,12 @@
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/
+.I /usr/share/doc/bsh-doc/
+if the bsh-doc package is installed.
.SH AUTHOR
This manual page was written by Ruud de Rooij <ruud at debian.org>
for the Debian GNU/Linux system (but may be used by others).
--- /cvsroot/pkg-java/bsh/debian/changelog 2004/01/18 22:13:05 1.1.1.1
+++ /cvsroot/pkg-java/bsh/debian/changelog 2005/08/14 15:35:42 1.2
@@ -1,3 +1,33 @@
+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 <WBaer at gmx.de> 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 <avdyk at debian.org> 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'
@@ -77,3 +107,4 @@
* Initial Release.
-- Ruud de Rooij <ruud at debian.org> Sun, 11 Jul 1999 12:41:22 +0200
+
--- /cvsroot/pkg-java/bsh/debian/control 2004/01/18 22:13:05 1.1.1.1
+++ /cvsroot/pkg-java/bsh/debian/control 2005/08/14 15:35:42 1.2
@@ -1,17 +1,19 @@
Source: bsh
-Section: contrib/devel
+Section: devel
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), j2sdk1.3 | kaffe (>= 1.1.1) | java-compiler, libservlet2.3-java, javacc
-Standards-Version: 3.6.1
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-1), ant, libservlet2.3-java, libbsf-java, javacc, lynx
+Standards-Version: 3.6.2
Package: bsh
+Section: devel
Architecture: all
-Depends: java-common, jdk1.1 | java-virtual-machine
-Suggests: libservlet2.3-java
+Depends: kaffe | java1-runtime | java2-runtime
+Suggests: libservlet2.3-java, bsh-doc
+Enhances: libbsf-java
Recommends: xlibs
-Description: Java scripting environment
+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
@@ -23,3 +25,11 @@
dynamically interpreted Java, plus some useful stuff.
.
Homepage: http://www.beanshell.org/
+
+Package: bsh-doc
+Section: doc
+Architecture: all
+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.
--- /cvsroot/pkg-java/bsh/debian/copyright 2004/01/18 22:13:05 1.1.1.1
+++ /cvsroot/pkg-java/bsh/debian/copyright 2005/08/14 15:35:42 1.2
@@ -1,45 +1,27 @@
-This is the Debian GNU/Linux prepackaged version of BeanShell (bsh), a Java
-scripting environment. BeanShell was written by Pat Niemeyer.
+This package was debianized by Wolfgang Baer <WBaer at gmx.de> on
+Wed, 18 May 2005 12:06:43 +0200 based on the packaging of the former
+upstream version.
-This package was put together by Ruud de Rooij <ruud at debian.org> from source
-obtained from:
+It was downloaded from <www.beanshell.org>
-http://www.beanshell.org/
+Copyright:
-BeanShell is Copyright (C) Pat Niemeyer:
-
-/*****************************************************************************
- * *
- * This file is part of the BeanShell Java Scripting distribution. *
- * Documentation and updates may be found at http://www.beanshell.org/ *
- * *
- * Sun Public License Notice: *
- * *
- * The contents of this file are subject to the Sun Public License Version *
- * 1.0 (the "License"); you may not use this file except in compliance with *
- * the License. A copy of the License is available at http://www.sun.com *
- * *
- * The Original Code is BeanShell. The Initial Developer of the Original *
- * Code is Pat Niemeyer. Portions created by Pat Niemeyer are Copyright *
- * (C) 2000. All Rights Reserved. *
- * *
- * GNU Public License Notice: *
- * *
- * Alternatively, the contents of this file may be used under the terms of *
- * the GNU Lesser General Public License (the "LGPL"), in which case the *
- * provisions of LGPL are applicable instead of those above. If you wish to *
- * allow use of your version of this file only under the terms of the LGPL *
- * and not to allow others to use your version of this file under the SPL, *
- * indicate your decision by deleting the provisions above and replace *
- * them with the notice and other provisions required by the LGPL. If you *
- * do not delete the provisions above, a recipient may use your version of *
- * this file under either the SPL or the LGPL. *
- * *
- * Patrick Niemeyer (pat at pat.net) *
- * Author of Learning Java, O'Reilly & Associates *
- * http://www.pat.net/~pat/ *
- * *
- *****************************************************************************/
+Upstream Author: Pat Niemeyer <pat at pat.net>
-On Debian systems, the complete text of the GNU Library General
-Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+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., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
--- /cvsroot/pkg-java/bsh/debian/rules 2004/01/18 22:13:05 1.1.1.1
+++ /cvsroot/pkg-java/bsh/debian/rules 2005/08/14 15:35:42 1.2
@@ -1,61 +1,28 @@
#!/usr/bin/make -f
+# debian/rules file for bsh (uses cdbs)
-CLASSPATH=.:/usr/share/java/servlet-2.3.jar
+export UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
-JJTREE=/usr/bin/jjtree
-JAVACC=/usr/bin/javacc
-JAVAC=/usr/bin/javac
-
-build: build-stamp
-build-stamp:
- dh_testdir
- mkdir tmp
- cp -R BeanShell/src/bsh BeanShell/src/Manifest* tmp
-# rm tmp/bsh/XThis.java
- cd tmp/bsh && $(JJTREE) bsh.jjt
- cd tmp/bsh && $(JAVACC) bsh.jj
- cd tmp/bsh && CLASSPATH=$(CLASSPATH) $(JAVAC) \
- */*.java *.java
- cd tmp && jar cfm ../bsh.jar Manifest.console bsh/util/*.class \
- bsh/util/lib/* bsh/commands/*.class bsh/commands/*.bsh \
- bsh/*.class bsh/classpath/*.class
- touch build-stamp
- lynx -dump -nolist BeanShell/src/Changes.html > Changes
-
-clean:
- dh_testdir
- dh_testroot
- rm -rf tmp bsh.jar
- rm -f build-stamp install-stamp > Changes
- dh_clean
-
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- install -m 755 debian/bsh debian/xbsh debian/tmp/usr/bin/
- install -m 644 bsh.jar debian/tmp/usr/share/java/bsh.jar
- touch install-stamp
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs BeanShell/src/README.txt debian/bsh.html
- dh_installexamples
- dh_installmenu
- dh_installmanpages
- dh_installchangelogs BeanShell/src/Changes.html
- dh_link usr/share/man/man1/bsh.1.gz usr/share/man/man1/xbsh.1.gz
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+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
+
+JAVA_HOME := /usr/lib/kaffe
+ANT_HOME := /usr/share/ant
+
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar servlet-2.3 bsf javacc
+DEB_ANT_COMPILER := jikes
+DEB_ANT_BUILD_TARGET := javadoc jarall test
+
+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
+ # remove the serialized object from failed test (until fixed)
+ rm -f tests/test-scripts/classser.ser
+
+install/bsh::
+ install -m 644 dist/bsh-$(UPSTREAM_VERSION).jar debian/bsh/usr/share/java/bsh-$(UPSTREAM_VERSION).jar
+ ln -s bsh-$(UPSTREAM_VERSION).jar debian/bsh/usr/share/java/bsh.jar
+ install -m 755 debian/_bsh debian/bsh/usr/bin/bsh
+ install -m 755 debian/xbsh debian/bsh/usr/bin/
--- /cvsroot/pkg-java/bsh/debian/xbsh 2004/01/18 22:13:05 1.1.1.1
+++ /cvsroot/pkg-java/bsh/debian/xbsh 2005/08/14 15:35:42 1.2
@@ -1,4 +1,6 @@
#!/bin/sh
+
CLASSPATH="${CLASSPATH:-.}:/usr/share/java/bsh.jar"
export CLASSPATH
-exec java -Xms128m -Xmx256m bsh.Console "$@"
+
+exec /usr/bin/java bsh.Console "$@"
More information about the pkg-java-commits
mailing list