CVS bsh/debian

[Wolfgang B??r]

Update of /cvsroot/pkg-java/bsh/debian
In directory haydn:/tmp/cvs-serv31313/debian

Modified Files:
	_bsh bsh-doc.docs changelog control copyright rules 
Added Files:
	ant.properties bsh-doc.doc-base.1 bsh-doc.doc-base.2 
Log Message:
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


--- /cvsroot/pkg-java/bsh/debian/_bsh	2005/08/14 15:35:42	1.1
+++ /cvsroot/pkg-java/bsh/debian/_bsh	2005/10/24 18:30:32	1.2
@@ -6,7 +6,7 @@
   shift 2
 fi
 
-CLASSPATH="${CLASSPATH:-.}:/usr/share/java/bsh.jar"
+CLASSPATH="${CLASSPATH:-.}:/usr/share/java/jline.jar:/usr/share/java/bsh.jar"
 export CLASSPATH
 
-exec /usr/bin/java bsh.Interpreter "$@"
+exec /usr/bin/java jline.ConsoleRunner bsh.Interpreter "$@"
--- /cvsroot/pkg-java/bsh/debian/bsh-doc.docs	2005/08/14 15:35:42	1.1
+++ /cvsroot/pkg-java/bsh/debian/bsh-doc.docs	2005/10/24 18:30:32	1.2
@@ -1,4 +1,4 @@
 docs/faq/*.html
 docs/manual/html
 docs/manual/images 
-javadoc
+api
--- /cvsroot/pkg-java/bsh/debian/changelog	2005/08/14 15:35:42	1.2
+++ /cvsroot/pkg-java/bsh/debian/changelog	2005/10/24 18:30:32	1.3
@@ -1,3 +1,15 @@
+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 <WBaer at gmx.de>  Thu, 13 Oct 2005 16:34:14 +0200
+
 bsh (2.0b4-1) unstable; urgency=low
 
   * New upstream release (closes: #261393, 321633)
--- /cvsroot/pkg-java/bsh/debian/control	2005/08/14 15:35:42	1.2
+++ /cvsroot/pkg-java/bsh/debian/control	2005/10/24 18:30:32	1.3
@@ -9,7 +9,7 @@
 Package: bsh
 Section: devel
 Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime
+Depends: kaffe | java1-runtime | java2-runtime, libjline-java
 Suggests: libservlet2.3-java, bsh-doc
 Enhances: libbsf-java
 Recommends: xlibs
--- /cvsroot/pkg-java/bsh/debian/copyright	2005/08/14 15:35:42	1.2
+++ /cvsroot/pkg-java/bsh/debian/copyright	2005/10/24 18:30:32	1.3
@@ -19,9 +19,8 @@
 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.
+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'.
--- /cvsroot/pkg-java/bsh/debian/rules	2005/08/14 15:35:42	1.2
+++ /cvsroot/pkg-java/bsh/debian/rules	2005/10/24 18:30:32	1.3
@@ -18,9 +18,7 @@
 	# 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