[pkg-java] r4363 - in trunk/aspectwerkz2/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-10-12 18:52:08 +0000 (Fri, 12 Oct 2007)
New Revision: 4363

Added:
   trunk/aspectwerkz2/debian/patches/
   trunk/aspectwerkz2/debian/patches/01-build.patch
Modified:
   trunk/aspectwerkz2/debian/control
   trunk/aspectwerkz2/debian/rules
Log:
* add Build-Depends: libconcurrent-java
* set option encoding=iso8859-1 for javac


Modified: trunk/aspectwerkz2/debian/control
===================================================================
--- trunk/aspectwerkz2/debian/control	2007-10-12 18:35:43 UTC (rev 4362)
+++ trunk/aspectwerkz2/debian/control	2007-10-12 18:52:08 UTC (rev 4363)
@@ -3,11 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>= 4.2.30), java-gcj-compat-dev (>= 1.0.69-2), ant, cdbs, libasm-java, junit, libdom4j-java, libjrexx-java, libjarjar-java, libtrove-java, libqdox-java, libjavassist-java
+Build-Depends-Indep: debhelper (>= 4.2.30), java-gcj-compat-dev (>= 1.0.69-2), ant, cdbs,
+ libasm-java, junit, libdom4j-java, libjrexx-java, libjarjar-java,
+ libtrove-java, libqdox-java, libjavassist-java, libconcurrent-java
 Standards-Version: 3.7.2
 
 Package: libaspectwerkz2-java
-Section: libs
 Architecture: all
 Depends: java-gcj-compat | java2-runtime, libasm-java, libdom4j-java, libjrexx-java
 Description: AOP framework for Java

Added: trunk/aspectwerkz2/debian/patches/01-build.patch
===================================================================
--- trunk/aspectwerkz2/debian/patches/01-build.patch	                        (rev 0)
+++ trunk/aspectwerkz2/debian/patches/01-build.patch	2007-10-12 18:52:08 UTC (rev 4363)
@@ -0,0 +1,75 @@
+diff -Nur aspectwerkz2-2.0.dfsg.1/build.xml aspectwerkz2-2.0.dfsg.1.new/build.xml
+--- aspectwerkz2-2.0.dfsg.1/build.xml	2005-03-10 12:05:48.000000000 +0100
++++ aspectwerkz2-2.0.dfsg.1.new/build.xml	2007-10-12 20:46:55.000000000 +0200
+@@ -127,13 +127,15 @@
+     <target name="compile" depends="init">
+         <mkdir dir="${build.dir}"/>
+         <mkdir dir="${main.classes}"/>
+-        <javac destdir="${jdk14.classes}" debug="on" source="1.3" target="1.3">
++	<javac destdir="${jdk14.classes}" debug="on" source="1.3" target="1.3"
++	  encoding="iso8859-1">
+             <src path="${src.dir}/jdk14"/>
+             <classpath>
+                 <path refid="project.class.path"/>
+             </classpath>
+         </javac>
+-        <javac destdir="${main.classes}" debug="on" source="1.3" target="1.3">
++	<javac destdir="${main.classes}" debug="on" source="1.3" target="1.3"
++	  encoding="iso8859-1">
+             <src path="${src.dir}/main"/>
+             <classpath>
+                 <path path="${jdk14.classes}"/>
+@@ -148,7 +150,7 @@
+     <target name="compile:test" depends="init, compile">
+         <mkdir dir="${build.dir}"/>
+         <mkdir dir="${test.classes}"/>
+-        <javac destdir="${test.classes}" debug="on">
++        <javac destdir="${test.classes}" debug="on" encoding="iso8859-1">
+             <src path="${test.src.dir}"/>
+             <classpath>
+                 <path path="${jdk14.classes}"/>
+@@ -169,7 +171,7 @@
+     <!-- ============================================================== -->
+     <target name="compile:jdk15" depends="init" if="jdk15">
+         <echo message="** Found jdk15 specific compilation..."/>
+-        <javac destdir="${jdk15.classes}" deprecation="true" debug="true" optimize="false" source="1.5">
++        <javac destdir="${jdk15.classes}" deprecation="true" debug="true" optimize="false" source="1.5" encoding="iso8859-1">
+             <src>
+                 <pathelement location="src/jdk15/main">
+                 </pathelement>
+@@ -179,7 +181,7 @@
+                 <path refid="project.class.path"/>
+             </classpath>
+         </javac>
+-        <javac destdir="${samples.classes}" deprecation="true" debug="true" optimize="false">
++        <javac destdir="${samples.classes}" deprecation="true" debug="true" optimize="false" encoding="iso8859-1">
+             <src>
+                 <pathelement location="src/jdk15/samples">
+                 </pathelement>
+@@ -190,7 +192,7 @@
+                 <path refid="project.class.path"/>
+             </classpath>
+         </javac>
+-        <javac destdir="${test.classes}" deprecation="true" debug="true" optimize="false">
++        <javac destdir="${test.classes}" deprecation="true" debug="true" optimize="false" encoding="iso8859-1">
+             <src>
+                 <pathelement location="src/jdk15/test">
+                 </pathelement>
+@@ -208,7 +210,7 @@
+     <!-- =================================================== -->
+     <target name="compile:samples" depends="init">
+         <mkdir dir="${samples.classes}"/>
+-        <javac destdir="${samples.classes}" deprecation="true" debug="true" optimize="false" excludes="**/*.xml">
++        <javac destdir="${samples.classes}" deprecation="true" debug="true" optimize="false" excludes="**/*.xml" encoding="iso8859-1">
+             <src>
+                 <pathelement location="src/samples">
+                 </pathelement>
+@@ -227,7 +229,7 @@
+     <target name="compile:extensions" depends="init">
+         <mkdir dir="${extensions.classes}"/>
+         <javac destdir="${extensions.classes}" deprecation="true" debug="true" optimize="false" excludes="**/*.xml"
+-            source="1.3" target="1.3">
++            source="1.3" target="1.3" encoding="iso8859-1">
+             <src>
+                 <pathelement location="src/extensions">
+                 </pathelement>

Modified: trunk/aspectwerkz2/debian/rules
===================================================================
--- trunk/aspectwerkz2/debian/rules	2007-10-12 18:35:43 UTC (rev 4362)
+++ trunk/aspectwerkz2/debian/rules	2007-10-12 18:52:08 UTC (rev 4363)
@@ -10,7 +10,7 @@
 JAVA_HOME := /usr/lib/jvm/java-gcj/
 ANT_HOME := /usr/share/ant
 
-DEB_JARS := asm asm-attrs asm-util junit dom4j jrexx jarjar trove qdox javassist
+DEB_JARS := asm asm-attrs asm-util junit dom4j jrexx jarjar trove qdox javassist concurrent
 
 
 DEB_ANT_BUILD_TARGET := compile # javadocs