This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository bsh.
commit fdb32842fdda12b590d74186448b5201919ab736
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Mon Nov 4 15:28:15 2013 +0000
Removed the bsh-gcj package
---
debian/changelog | 1 +
debian/control | 18 ------------------
debian/rules | 18 +-----------------
3 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2436f27..19c64dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
bsh (2.0b4-15) UNRELEASED; urgency=low
+ * Removed the bsh-gcj package
* debian/control:
- Removed Michael Koch from the uploaders (Closes: #653998)
- Use canonical URLs for the Vcs-* fields
diff --git a/debian/control b/debian/control
index 8cfb384..3fb14d9 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: ant,
debhelper (>= 9),
default-jdk,
default-jdk-doc,
- gcj-native-helper,
javacc,
javahelper (>= 0.32~),
libbsf-java,
@@ -27,7 +26,6 @@ Depends: default-jre-headless | java1-runtime-headless |
java2-runtime-headless,
${misc:Depends}
Suggests: bsh-doc, default-jre | java1-runtime | java2-runtime,
libservlet2.5-java
Enhances: libbsf-java
-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
@@ -39,22 +37,6 @@ Description: Java scripting environment (BeanShell) Version 2
as a simple scripting engine for you applications. In short: BeanShell is a
dynamically interpreted Java, plus some useful stuff.
-Package: bsh-gcj
-Architecture: any
-Depends: bsh (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: Java scripting environment (BeanShell) Version 2 (native code)
- 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
- syntax. BeanShell supports scripted objects as simple method closures like
- those in Perl and JavaScript(tm).
- .
- You can use BeanShell interactively for Java experimentation and debugging or
- as a simple scripting engine for you applications. In short: BeanShell is a
- dynamically interpreted Java, plus some useful stuff.
- .
- This package contains the natively compiled code for use by gij.
-
Package: bsh-doc
Section: doc
Architecture: all
diff --git a/debian/rules b/debian/rules
index 1182c0c..d8a19a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,17 +9,7 @@ VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := servlet-api-2.5 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
+ANT_OPTS = -Dcompile.debug=true
clean::
# remove tests which also fail with SUN JDK 1.4
@@ -36,11 +26,6 @@ install/$(PACKAGE)::
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
-
install/bsh-src:: binary-install/bsh-doc
mkdir -p debian/bsh-src/usr/src/bsh-src
tar --exclude debian --exclude classes --exclude dist --exclude api \
@@ -54,4 +39,3 @@ get-orig-source:
get-orig-pom:
wget -O debian/pom.xml
http://repository.sonatype.org/service/local/repositories/central/content/org/beanshell/bsh/$(VERSION)/bsh-$(VERSION).pom
-
--
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
