[bsh] 03/50: bsh (2.0b4-2) unstable; urgency=low

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository bsh.

commit 4ab077ed2efa041b308a15e401605ff300a526e7
Author: Wolfgang Bär <wbaer at gmx.de>
Date:   Mon Oct 24 18:30:32 2005 +0000

    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
---
 debian/_bsh               |  4 ++--
 debian/ant.properties     |  1 +
 debian/bsh-doc.doc-base.1 |  9 +++++++++
 debian/bsh-doc.doc-base.2 |  9 +++++++++
 debian/bsh-doc.docs       |  2 +-
 debian/changelog          | 12 ++++++++++++
 debian/control            |  2 +-
 debian/copyright          |  5 ++---
 debian/rules              |  4 +---
 9 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/debian/_bsh b/debian/_bsh
index 22a848f..f343741 100644
--- a/debian/_bsh
+++ b/debian/_bsh
@@ -6,7 +6,7 @@ then
   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 "$@"
diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 0000000..15c0bfc
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1 @@
+javadoc-dir=api
diff --git a/debian/bsh-doc.doc-base.1 b/debian/bsh-doc.doc-base.1
new file mode 100644
index 0000000..1e67b3f
--- /dev/null
+++ b/debian/bsh-doc.doc-base.1
@@ -0,0 +1,9 @@
+Document: bsh-doc1
+Title: Manual for BeanShell
+Author: Pat Niemeyer <pat at pat.net>
+Abstract: This is the manual of the Java scripting environment BeanShell.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/bsh-doc/html/index.html
+Files: /usr/share/doc/bsh-doc/html/*.html
diff --git a/debian/bsh-doc.doc-base.2 b/debian/bsh-doc.doc-base.2
new file mode 100644
index 0000000..d06046e
--- /dev/null
+++ b/debian/bsh-doc.doc-base.2
@@ -0,0 +1,9 @@
+Document: bsh-doc2
+Title: Javadoc API for BeanShell
+Author: Pat Niemeyer <pat at pat.net>
+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/*
diff --git a/debian/bsh-doc.docs b/debian/bsh-doc.docs
index 5d59678..001671a 100644
--- a/debian/bsh-doc.docs
+++ b/debian/bsh-doc.docs
@@ -1,4 +1,4 @@
 docs/faq/*.html
 docs/manual/html
 docs/manual/images 
-javadoc
+api
diff --git a/debian/changelog b/debian/changelog
index b30e873..def3f3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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)
diff --git a/debian/control b/debian/control
index f62850c..ca62717 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.6.2
 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
diff --git a/debian/copyright b/debian/copyright
index 21c27c5..79f514c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,9 +19,8 @@ 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.
+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'.
diff --git a/debian/rules b/debian/rules
index 545bc3c..a43d3d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,7 @@ 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bsh.git