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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-11-04 15:28:15 +0000 (Mon, 04 Nov 2013)
New Revision: 17412

Modified:
   trunk/bsh/debian/changelog
   trunk/bsh/debian/control
   trunk/bsh/debian/rules
Log:
Removed the bsh-gcj package



Modified: trunk/bsh/debian/changelog
===================================================================
--- trunk/bsh/debian/changelog	2013-11-04 15:00:15 UTC (rev 17411)
+++ trunk/bsh/debian/changelog	2013-11-04 15:28:15 UTC (rev 17412)
@@ -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

Modified: trunk/bsh/debian/control
===================================================================
--- trunk/bsh/debian/control	2013-11-04 15:00:15 UTC (rev 17411)
+++ trunk/bsh/debian/control	2013-11-04 15:28:15 UTC (rev 17412)
@@ -8,7 +8,6 @@
                debhelper (>= 9),
                default-jdk,
                default-jdk-doc,
-               gcj-native-helper,
                javacc,
                javahelper (>= 0.32~),
                libbsf-java,
@@ -27,7 +26,6 @@
          ${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 @@
  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

Modified: trunk/bsh/debian/rules
===================================================================
--- trunk/bsh/debian/rules	2013-11-04 15:00:15 UTC (rev 17411)
+++ trunk/bsh/debian/rules	2013-11-04 15:28:15 UTC (rev 17412)
@@ -9,18 +9,8 @@
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := servlet-api-2.5 bsf javacc
 DEB_ANT_BUILD_TARGET := javadoc jarall test
+ANT_OPTS              = -Dcompile.debug=true
 
-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 \
@@ -36,11 +26,6 @@
 	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-pom:
 	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/org/beanshell/bsh/$(VERSION)/bsh-$(VERSION).pom
-