This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository bsh.
commit f65b131c1bf18502d932a8e2ddbf55b480db28c3
Author: Ludovic Claude <ludovic.cla...@laposte.net>
Date: Thu Jul 2 23:31:50 2009 +0000
* New version
---
debian/bsh.poms | 1 +
debian/changelog | 37 +++++++++++++++++++++++++++++++++++--
debian/control | 19 ++++++++++---------
debian/pom.xml | 28 ++++++++++++++++++++++++++++
debian/rules | 37 ++++++++++++++++++++++++++++---------
debian/watch | 4 ++--
debian/xbsh | 6 ++++++
7 files changed, 110 insertions(+), 22 deletions(-)
diff --git a/debian/bsh.poms b/debian/bsh.poms
new file mode 100644
index 0000000..623bd24
--- /dev/null
+++ b/debian/bsh.poms
@@ -0,0 +1 @@
+debian/pom.xml --no-parent
diff --git a/debian/changelog b/debian/changelog
index 0a84e9f..983d9e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,41 @@
-bsh (2.0b4-9) UNRELEASED; urgency=low
+bsh (2.0b4-9) unstable; 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 <ludovic.cla...@laposte.net> 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 <d...@ubuntu.com> 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 <onkarshi...@ubuntu.com> 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 <d...@debian.org> Thu, 31 Jul 2008 10:46:33 +0000
+ -- Matthias Klose <d...@ubuntu.com> Thu, 31 Jul 2008 10:46:33 +0000
bsh (2.0b4-8) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 8d1eec3..7a77cff 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,21 @@
Source: bsh
-Section: devel
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Arnaud Vandyck <av...@debian.org>, Michael Koch <konque...@gmx.de>
-Build-Depends: debhelper (>= 4.2.30), cdbs, default-jdk-builddep, ant,
libservlet2.3-java, libbsf-java, javacc, lynx
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 4.2.30), 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: devel
+Section: java
Architecture: all
-Depends: default-jre-headless | java1-runtime-headless |
java2-runtime-headless, libjline-java
-Suggests: libservlet2.3-java, bsh-doc
+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
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
@@ -28,7 +28,7 @@ Description: Java scripting environment (BeanShell) Version 2
dynamically interpreted Java, plus some useful stuff.
Package: bsh-gcj
-Section: libs
+Section: java
Architecture: any
Depends: bsh (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: Java scripting environment (BeanShell) Version 2 (native code)
@@ -47,7 +47,8 @@ Description: Java scripting environment (BeanShell) Version 2
(native code)
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 documentation includes the javadoc API for bsh version 2 as well as
the faq and manual in html-format.
diff --git a/debian/pom.xml b/debian/pom.xml
new file mode 100644
index 0000000..9c184be
--- /dev/null
+++ b/debian/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns:xsi="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <!-- [MPG] POM Created by Mergere Pom Generator (beta). -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.beanshell</groupId>
+ <artifactId>beanshell</artifactId>
+ <version>2.0b4</version>
+ </parent>
+ <artifactId>bsh</artifactId>
+ <name>BeanShell</name>
+ <description>BeanShell</description>
+
+ <dependencies>
+ <!-- [MPG] UnconnectedImport: org.apache.bsf.BSFException -->
+ <!-- [MPG] UnconnectedImport: org.apache.bsf.BSFMeclaredBean -->
+ <!-- [MPG] UnconnectedImport: org.apache.bsf.util.BSFEngineImpl -->
+ <!-- [MPG] UnconnectedImport: org.apache.bsf.BSFManager -->
+ <!-- [MPG] UnconnectedImport: javax.servlet.http.HttpServlet -->
+ <!-- [MPG] UnconnectedImport: javax.servlet.http.HttpServletRequest -->
+ <!-- [MPG] UnconnectedImport: javax.servlet.http.HttpServletResponse -->
+ <!-- [MPG] UnconnectedImport: javax.servlet.ServletException -->
+ <!-- [MPG] UnconnectedImport: text.html -->
+ <!-- [MPG] UnconnectedImport: text.plain -->
+ </dependencies>
+
+</project>
diff --git a/debian/rules b/debian/rules
index 1f44dda..b52d41b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,27 @@
#!/usr/bin/make -f
# debian/rules file for bsh (uses cdbs)
-export UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( |
cut -f1 -d\) | cut -f1 -d\-)
-
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/jvm/default-java
-ANT_HOME := /usr/share/ant
-
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar servlet-2.3 bsf javacc
+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 \
@@ -20,13 +29,23 @@ clean::
tests/test-scripts/class3.bsh \
tests/test-scripts/classinterf1.bsh \
tests/test-scripts/strings.bsh
+ -rm -rf debian/tmp
-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/$(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
+
+get-orig-pom:
+ wget -O debian/pom.xml
http://repository.sonatype.org/service/local/repositories/central/content/org/beanshell/bsh/$(VERSION)/bsh-$(VERSION).pom
+
diff --git a/debian/watch b/debian/watch
index 206c751..08f03f2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-
version=3
-http://www.beanshell.org/download.html bsh-(\d.*)\.jar
+opts=downloadurlmangle=s/zip/jar/ \
+ http://www.beanshell.org/developer.html bsh-(\d.*)-src\.zip debian uupdate
diff --git a/debian/xbsh b/debian/xbsh
index 57d3926..a2c632f 100644
--- a/debian/xbsh
+++ b/debian/xbsh
@@ -1,5 +1,11 @@
#!/bin/sh
+if [ "$1" = "-classpath" ]
+then
+ CLASSPATH="$2"
+ shift 2
+fi
+
CLASSPATH="${CLASSPATH:-.}:/usr/share/java/bsh.jar"
export CLASSPATH
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/bsh.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
