[pkg-java] r14763 - trunk/libservlet2.4-java/debian

[Torsten Werner]

Author: twerner
Date: 2011-09-08 16:13:41 +0000 (Thu, 08 Sep 2011)
New Revision: 14763

Modified:
   trunk/libservlet2.4-java/debian/changelog
   trunk/libservlet2.4-java/debian/control
   trunk/libservlet2.4-java/debian/rules
Log:
Drop libservlet2.4-java-gcj package.

Modified: trunk/libservlet2.4-java/debian/changelog
===================================================================
--- trunk/libservlet2.4-java/debian/changelog	2011-09-08 16:03:47 UTC (rev 14762)
+++ trunk/libservlet2.4-java/debian/changelog	2011-09-08 16:13:41 UTC (rev 14763)
@@ -16,8 +16,9 @@
   * Update debian/watch to point to svn tree and implement download through
     debian/orig-tar.sh.
   * Refresh patches.
+  * Drop libservlet2.4-java-gcj package.
 
- -- Torsten Werner <twerner at debian.org>  Thu, 08 Sep 2011 17:49:27 +0200
+ -- Torsten Werner <twerner at debian.org>  Thu, 08 Sep 2011 18:09:30 +0200
 
 libservlet2.4-java (5.0.30-12) unstable; urgency=low
 

Modified: trunk/libservlet2.4-java/debian/control
===================================================================
--- trunk/libservlet2.4-java/debian/control	2011-09-08 16:03:47 UTC (rev 14762)
+++ trunk/libservlet2.4-java/debian/control	2011-09-08 16:13:41 UTC (rev 14763)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>,
  Niels Thykier <niels at thykier.net>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, gcj-native-helper, ant1.7, maven-repo-helper
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant1.7, maven-repo-helper
 Build-Depends-Indep: default-jdk-doc
 Standards-Version: 3.9.0
 Homepage: http://jakarta.apache.org/tomcat/index.html
@@ -14,7 +14,6 @@
 Package: libservlet2.4-java
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libservlet2.4-java-gcj
 Description: Servlet 2.4 and JSP 2.0 Java library
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
@@ -24,17 +23,6 @@
  The official Servlet 2.4 and JSP 2.0 specifications can be found at
  http://java.sun.com/products/servlet/ and http://java.sun.com/products/jsp/.
 
-Package: libservlet2.4-java-gcj
-Architecture: any
-Depends: libservlet2.4-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: Servlet 2.4 and JSP 2.0 Java classes and documentation
- Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
- specifications from Sun Microsystems, and provides a "pure Java" HTTP web
- server environment for Java code to run. Tomcat 5.5 is the reference
- implementation for the Java Servlet 2.4 and JavaServer Pages 2.0 technologies.
- .
- This package contains the natively compiled code for use by gij.
-
 Package: libservlet2.4-java-doc
 Architecture: all
 Section: doc

Modified: trunk/libservlet2.4-java/debian/rules
===================================================================
--- trunk/libservlet2.4-java/debian/rules	2011-09-08 16:03:47 UTC (rev 14762)
+++ trunk/libservlet2.4-java/debian/rules	2011-09-08 16:13:41 UTC (rev 14763)
@@ -11,14 +11,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-include /usr/share/gcj/debian_defaults
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
-  with_gcj_native := yes
-endif
-
 JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_BUILDFILE := debian/build.xml
 ANT_OPTS = -Dant.build.javac.source=1.4
 
@@ -40,11 +33,6 @@
 	mv tmp/dist-jsp/examples/examples.war tmp/dist-jsp/examples/examples-jsp.war
 	mv tmp/dist-servlet-api/examples/examples.war tmp/dist-servlet-api/examples/examples-servlet.war
 
-ifeq ($(with_gcj_native),yes)
-install/libservlet2.4-java-gcj:: install/libservlet2.4-java
-	dh_nativejava -plibservlet2.4-java-gcj
-endif
-
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download