[pkg-java] r3888 - trunk/pja/debian

[avdyk at alioth.debian.org]

Author: avdyk
Date: 2007-07-20 10:28:07 +0000 (Fri, 20 Jul 2007)
New Revision: 3888

Modified:
   trunk/pja/debian/build.xml
   trunk/pja/debian/changelog
   trunk/pja/debian/control
   trunk/pja/debian/rules
Log:
pja (2.5-5) unstable; urgency=low

  * Standards-Verision updated to 3.7.2
  * removed dependency on libservlet2.3-java
  * removed Takashi Okamoto from uploaders (closes: #374118)
  * debian/rules: removed ant-launcher

 -- Arnaud Vandyck <avdyk at debian.org>  Fri, 20 Jul 2007 12:27:26 +0200

Modified: trunk/pja/debian/build.xml
===================================================================
--- trunk/pja/debian/build.xml	2007-07-20 09:24:34 UTC (rev 3887)
+++ trunk/pja/debian/build.xml	2007-07-20 10:28:07 UTC (rev 3888)
@@ -7,7 +7,7 @@
   <property name="doc" value="${dist}/doc"/>
   <property name="pja" value="${build}/pja"/>
   <property name="pjatools" value="${build}/pjatools"/>
-  <property name="servlet.jar" value="/usr/share/java/servlet.jar"/>
+  <!-- property name="servlet.jar" value="/usr/share/java/servlet.jar"/ -->
 
   <target name="prepare">
     <mkdir dir="${build}"/>
@@ -24,16 +24,19 @@
 
   <target name="compile" depends="prepare">
     <javac srcdir="${basedir}" destdir="${pja}"
+           source="1.4"
            includesfile="debian/pja.src"
-           nowarn="true" target="1.1">
+           nowarn="true">
+      <!--
       <classpath>
         <pathelement location="${servlet.jar}"/>
       </classpath>
+      -->
     </javac>
 
     <javac srcdir="${basedir}" destdir="${pjatools}"
            includesfile="debian/pjatools.src"
-           nowarn="true" target="1.1">
+           nowarn="true">
       <classpath>
         <pathelement location="${servlet.jar}"/>
         <pathelement path="${pja}"/>

Modified: trunk/pja/debian/changelog
===================================================================
--- trunk/pja/debian/changelog	2007-07-20 09:24:34 UTC (rev 3887)
+++ trunk/pja/debian/changelog	2007-07-20 10:28:07 UTC (rev 3888)
@@ -1,3 +1,12 @@
+pja (2.5-5) unstable; urgency=low
+
+  * Standards-Verision updated to 3.7.2
+  * removed dependency on libservlet2.3-java
+  * removed Takashi Okamoto from uploaders (closes: #374118)
+  * debian/rules: removed ant-launcher
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Fri, 20 Jul 2007 12:27:26 +0200
+
 pja (2.5-4) unstable; urgency=low
 
   * ant transition

Modified: trunk/pja/debian/control
===================================================================
--- trunk/pja/debian/control	2007-07-20 09:24:34 UTC (rev 3887)
+++ trunk/pja/debian/control	2007-07-20 10:28:07 UTC (rev 3888)
@@ -2,13 +2,14 @@
 Section: contrib/libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Takashi Okamoto <tora at debian.org>, Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), cdbs, ant, j2sdk1.4, jikes, libservlet2.4-java
-Standards-Version: 3.6.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>
+Build-Depends: debhelper (>= 4.0.0), cdbs
+Build-Depends-Indep: ant, sun-java6-jdk | ibm-j2sdk1.6, libservlet2.4-java
+Standards-Version: 3.7.2
 
 Package: libpja-java
 Architecture: all
-Depends: kaffe (>= 1.0.7) | java1-runtime | java2-runtime, libservlet2.3-java | libservlet2.4-java
+Depends: sun-java6-jre | java2-runtime, libservlet2.3-java | libservlet2.4-java
 Description: 100% Pure Java AWT Toolkit which works without X Server.
  PJA (Pure Java AWT) is 100% Pure Java and doesn't use any native
  graphics resource of the system on which the Java Virtual Machine
@@ -17,6 +18,7 @@
  chart and a graphical counter dynamically under non-X environment.
 
 Package: libpja-java-doc
+Section: contrib/doc
 Architecture: all
 Suggests: libpja-java
 Description: Documentation for libpja-java

Modified: trunk/pja/debian/rules
===================================================================
--- trunk/pja/debian/rules	2007-07-20 09:24:34 UTC (rev 3887)
+++ trunk/pja/debian/rules	2007-07-20 10:28:07 UTC (rev 3888)
@@ -6,12 +6,9 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-export JITC_PROCESSOR_TYPE=6
-
-JAVA_HOME_DIRS := /usr/local/IBMJava2-ppc-142 /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown /usr/lib/kaffe
+JAVA_HOME_DIRS := /usr/lib/jvm/java-6-sun /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar servlet-api-2.4.jar
-DEB_ANT_COMPILER := jikes
+DEB_JARS := servlet-api-2.4.jar
 DEB_ANT_PROPERTYFILE := debian/build.properties
 DEB_ANT_BUILDFILE := debian/build.xml