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

mkoch at alioth.debian.org mkoch at alioth.debian.org
Thu Oct 4 20:06:19 UTC 2007 

Author: mkoch
Date: 2007-10-04 20:06:19 +0000 (Thu, 04 Oct 2007)
New Revision: 4305

Removed:
   trunk/pja/debian/libpja-java.links
Modified:
   trunk/pja/debian/build.xml
   trunk/pja/debian/changelog
   trunk/pja/debian/compat
   trunk/pja/debian/control
   trunk/pja/debian/rules
Log:
* Added myself to Uploaders.
* Removed jikes from Build-Depends.
* Moved debhelper and cdbs to Build-Depends.
* Put libpja-java-doc into doc section.
* Fixed synopsis by removing the full stop at the end.
* Updated debhelper level to 5.


Modified: trunk/pja/debian/build.xml
===================================================================
--- trunk/pja/debian/build.xml	2007-10-03 21:34:19 UTC (rev 4304)
+++ trunk/pja/debian/build.xml	2007-10-04 20:06:19 UTC (rev 4305)
@@ -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,19 +24,16 @@
 
   <target name="compile" depends="prepare">
     <javac srcdir="${basedir}" destdir="${pja}"
-           source="1.4"
            includesfile="debian/pja.src"
-           nowarn="true">
-      <!--
+           nowarn="true" target="1.1">
       <classpath>
         <pathelement location="${servlet.jar}"/>
       </classpath>
-      -->
     </javac>
 
     <javac srcdir="${basedir}" destdir="${pjatools}"
            includesfile="debian/pjatools.src"
-           nowarn="true">
+           nowarn="true" target="1.1">
       <classpath>
         <pathelement location="${servlet.jar}"/>
         <pathelement path="${pja}"/>

Modified: trunk/pja/debian/changelog
===================================================================
--- trunk/pja/debian/changelog	2007-10-03 21:34:19 UTC (rev 4304)
+++ trunk/pja/debian/changelog	2007-10-04 20:06:19 UTC (rev 4305)
@@ -1,12 +1,21 @@
 pja (2.5-5) unstable; urgency=low
 
+  [ Arnaud Vandyck ]
   * 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
+  [ Michael Koch ]
+  * Added myself to Uploaders.
+  * Removed jikes from Build-Depends.
+  * Moved debhelper and cdbs to Build-Depends.
+  * Put libpja-java-doc into doc section.
+  * Fixed synopsis by removing the full stop at the end.
+  * Updated debhelper level to 5.
 
+ -- Michael Koch <konqueror at gmx.de>  Thu, 04 Oct 2007 21:19:52 +0200
+
 pja (2.5-4) unstable; urgency=low
 
   * ant transition

Modified: trunk/pja/debian/compat
===================================================================
--- trunk/pja/debian/compat	2007-10-03 21:34:19 UTC (rev 4304)
+++ trunk/pja/debian/compat	2007-10-04 20:06:19 UTC (rev 4305)
@@ -1 +1 @@
-4
+5

Modified: trunk/pja/debian/control
===================================================================
--- trunk/pja/debian/control	2007-10-03 21:34:19 UTC (rev 4304)
+++ trunk/pja/debian/control	2007-10-04 20:06:19 UTC (rev 4305)
@@ -2,15 +2,15 @@
 Section: contrib/libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-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
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 5), cdbs
+Build-Depends-Indep: ant, j2sdk1.4, libservlet2.4-java
 Standards-Version: 3.7.2
 
 Package: libpja-java
 Architecture: all
-Depends: sun-java6-jre | java2-runtime, libservlet2.3-java | libservlet2.4-java
-Description: 100% Pure Java AWT Toolkit which works without X Server.
+Depends: kaffe (>= 1.0.7) | java1-runtime | 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
  runs. Default AWT needs X Server but PJA doesn't. PJA is useful for
@@ -18,8 +18,8 @@
  chart and a graphical counter dynamically under non-X environment.
 
 Package: libpja-java-doc
+Architecture: all
 Section: contrib/doc
-Architecture: all
 Suggests: libpja-java
 Description: Documentation for libpja-java
  Documentation and examples for libpja-java which is 100% Pure Java

Deleted: trunk/pja/debian/libpja-java.links
===================================================================
--- trunk/pja/debian/libpja-java.links	2007-10-03 21:34:19 UTC (rev 4304)
+++ trunk/pja/debian/libpja-java.links	2007-10-04 20:06:19 UTC (rev 4305)
@@ -1,2 +0,0 @@
-usr/share/java/pja-2.3.1.jar usr/share/java/pja.jar
-usr/share/java/pjatools-2.3.1.jar usr/share/java/pjatools.jar

Modified: trunk/pja/debian/rules
===================================================================
--- trunk/pja/debian/rules	2007-10-03 21:34:19 UTC (rev 4304)
+++ trunk/pja/debian/rules	2007-10-04 20:06:19 UTC (rev 4305)
@@ -6,9 +6,11 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME_DIRS := /usr/lib/jvm/java-6-sun /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-gcj
+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
 ANT_HOME := /usr/share/ant
-DEB_JARS := servlet-api-2.4.jar
+DEB_JARS := servlet-api-2.4
 DEB_ANT_PROPERTYFILE := debian/build.properties
 DEB_ANT_BUILDFILE := debian/build.xml

More information about the pkg-java-commits mailing list