[pkg-java] r8819 - trunk/bsh/debian

Thu Jul 2 23:31:50 UTC 2009

Author: ludovicc-guest
Date: 2009-07-02 23:31:50 +0000 (Thu, 02 Jul 2009)
New Revision: 8819

Added:
   trunk/bsh/debian/bsh.poms
   trunk/bsh/debian/pom.xml
Modified:
   trunk/bsh/debian/changelog
   trunk/bsh/debian/control
   trunk/bsh/debian/rules
   trunk/bsh/debian/watch
   trunk/bsh/debian/xbsh
Log:
* New version

Added: trunk/bsh/debian/bsh.poms
===================================================================

--- trunk/bsh/debian/bsh.poms	                        (rev 0)
+++ trunk/bsh/debian/bsh.poms	2009-07-02 23:31:50 UTC (rev 8819)
@@ -0,0 +1 @@
+debian/pom.xml --no-parent

Modified: trunk/bsh/debian/changelog
===================================================================
--- trunk/bsh/debian/changelog	2009-07-02 23:19:20 UTC (rev 8818)
+++ trunk/bsh/debian/changelog	2009-07-02 23:31:50 UTC (rev 8819)
@@ -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.claude at 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 <doko at 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 <onkarshinde at 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 <doko at debian.org>  Thu, 31 Jul 2008 10:46:33 +0000
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 31 Jul 2008 10:46:33 +0000
 
 bsh (2.0b4-8) unstable; urgency=low
 

Modified: trunk/bsh/debian/control
===================================================================
--- trunk/bsh/debian/control	2009-07-02 23:19:20 UTC (rev 8818)
+++ trunk/bsh/debian/control	2009-07-02 23:31:50 UTC (rev 8819)
@@ -1,21 +1,21 @@
 Source: bsh
-Section: devel
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at 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 @@
  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 @@
 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.

Added: trunk/bsh/debian/pom.xml
===================================================================
--- trunk/bsh/debian/pom.xml	                        (rev 0)
+++ trunk/bsh/debian/pom.xml	2009-07-02 23:31:50 UTC (rev 8819)
@@ -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>

Modified: trunk/bsh/debian/rules
===================================================================
--- trunk/bsh/debian/rules	2009-07-02 23:19:20 UTC (rev 8818)
+++ trunk/bsh/debian/rules	2009-07-02 23:31:50 UTC (rev 8819)
@@ -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 @@
 				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
+
+

Modified: trunk/bsh/debian/watch
===================================================================
--- trunk/bsh/debian/watch	2009-07-02 23:19:20 UTC (rev 8818)
+++ trunk/bsh/debian/watch	2009-07-02 23:31:50 UTC (rev 8819)
@@ -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

Modified: trunk/bsh/debian/xbsh
===================================================================
--- trunk/bsh/debian/xbsh	2009-07-02 23:19:20 UTC (rev 8818)
+++ trunk/bsh/debian/xbsh	2009-07-02 23:31:50 UTC (rev 8819)
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+if [ "$1" = "-classpath" ]
+then
+  CLASSPATH="$2"
+  shift 2
+fi
+
 CLASSPATH="${CLASSPATH:-.}:/usr/share/java/bsh.jar"
 export CLASSPATH
 


