Author: doko Date: 2007-06-26 07:44:45 +0000 (Tue, 26 Jun 2007) New Revision: 3740
Modified: trunk/libservlet2.4-java/debian/changelog trunk/libservlet2.4-java/debian/control trunk/libservlet2.4-java/debian/rules Log: * Build a libservlet2.4-java-gcj package. Modified: trunk/libservlet2.4-java/debian/changelog =================================================================== --- trunk/libservlet2.4-java/debian/changelog 2007-06-26 07:30:47 UTC (rev 3739) +++ trunk/libservlet2.4-java/debian/changelog 2007-06-26 07:44:45 UTC (rev 3740) @@ -1,3 +1,9 @@ +libservlet2.4-java (5.0.30-5) UNRELEASED; urgency=low + + * Build a libservlet2.4-java-gcj package. + + -- Matthias Klose <[EMAIL PROTECTED]> Tue, 26 Jun 2007 09:33:22 +0200 + libservlet2.4-java (5.0.30-4) unstable; urgency=low * Use java-gcj-compat instead of kaffe. Modified: trunk/libservlet2.4-java/debian/control =================================================================== --- trunk/libservlet2.4-java/debian/control 2007-06-26 07:30:47 UTC (rev 3739) +++ trunk/libservlet2.4-java/debian/control 2007-06-26 07:44:45 UTC (rev 3740) @@ -8,10 +8,20 @@ Package: libservlet2.4-java Architecture: all -Depends: java-gcj-compat | java1-runtime | java2-runtime +Depends: gij | java-gcj-compat | java1-runtime | java2-runtime +Suggests: libservlet2.4-java-gcj Description: Servlet 2.4 and JSP 2.0 Java classes and documentation For more information about Java servlets please take a look at the Tomcat home page at http://jakarta.apache.org/tomcat/index.html. . 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 + For more information about Java servlets please take a look at the Tomcat + home page at http://jakarta.apache.org/tomcat/index.html. + . + This package contains the natively compiled code for use by gij. Modified: trunk/libservlet2.4-java/debian/rules =================================================================== --- trunk/libservlet2.4-java/debian/rules 2007-06-26 07:30:47 UTC (rev 3739) +++ trunk/libservlet2.4-java/debian/rules 2007-06-26 07:44:45 UTC (rev 3740) @@ -11,6 +11,11 @@ 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/java-gcj ANT_HOME := /usr/share/ant DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar @@ -42,3 +47,7 @@ # install -m 664 tmp/dist-jsp/docs/api debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/api-jsp # install -m 664 tmp/dist-servlet-api/docs/api debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/api-servlet +ifeq ($(with_gcj_native),yes) +install/libservlet2.4-java-gcj:: install/libservlet2.4-java + dh_nativejava -plibservlet2.4-java-gcj +endif _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
