CVS mysql-connector-java/debian/patches

[Wolfgang B??r]

Update of /cvsroot/pkg-java/mysql-connector-java/debian/patches
In directory haydn:/tmp/cvs-serv23297/debian/patches

Modified Files:
	01_BuildXml.patch 
Log Message:
Forgotten update to 3.1.11-1 release

  * New upstream release (closes: #338399)
  * Removed Takashi from uploaders
  * Removed setting of DEB_ANT_COMPILER variable as already preset in kaffe
  * Updated build.xml patch once more to changed upstream build behaviour


--- /cvsroot/pkg-java/mysql-connector-java/debian/patches/01_BuildXml.patch	2005/09/23 08:42:37	1.2
+++ /cvsroot/pkg-java/mysql-connector-java/debian/patches/01_BuildXml.patch	2006/01/05 11:52:11	1.3
@@ -1,27 +1,33 @@
---- build.xml.orig	2005-09-11 16:12:26.000000000 +0200
-+++ build.xml	2005-09-11 16:04:37.000000000 +0200
-@@ -57,9 +57,9 @@
- 	</path>
- 		
+--- build.xml.orig	2005-11-29 14:32:47.000000000 +0100
++++ build.xml	2005-11-29 14:32:33.000000000 +0100
+@@ -55,23 +55,15 @@
+ 		</classpath>
+ 	</taskdef>
+ 
+-	<path id="built.driver.only.classpath">
++	<!--<path id="built.driver.only.classpath">
+ 		<pathelement location="${buildDir}/${fullProdName}" />
+-	</path>
++	</path>-->
+ 
  	<path id="project.build.classpath">
 -		<fileset dir="${buildDir}/${fullProdName}/lib-nodist">
-+		<!--<fileset dir="${buildDir}/${fullProdName}/lib-nodist">
- 			<include name="**/*.jar"/>
+-			<include name="**/*.jar"/>
+-		</fileset>
+-
+-		<fileset dir="${buildDir}/${fullProdName}/lib">
+-			<include name="**/*.jar"/>
 -		</fileset>
-+		</fileset>-->
+-
+ 		<pathelement location="${buildDir}/${fullProdName}" />
+ 	</path>
  
- 		<fileset dir="${buildDir}/${fullProdName}/lib">
- 			<include name="**/*.jar"/>
-@@ -253,7 +253,7 @@
- 			includes="**/*.class,**/*.properties*,COPYING,README" 
- 			excludes="testsuite/**" 
- 			index="true" 
--			manifest="${buildDir}/MANIFEST.MF"/>
-+			manifest="${buildDir}/META-INF/MANIFEST.MF"/>
- 	</target>
+-	<target name="init" depends="-init-copy, -init-no-crypto">
++	<target name="init" depends="-init-copy">
+ 		<!-- Check that files needed to generate documentation are in place -->
  
- 	<target name="dist-trace" depends="init, compile-driver-trace">
-@@ -653,7 +653,7 @@
+ 		<available file="${com.mysql.jdbc.docs.sourceDir}" property="com.mysql.jdbc.docs.sourcesPresent" />
+@@ -487,7 +479,7 @@
  			debug="${debug.enable}" 
  			excludes="testsuite/**, 
  			   com/mysql/jdbc/integration/**,
@@ -30,7 +36,7 @@
  			<classpath refid="project.build.classpath" />
  		</javac>
  	</target>
-@@ -716,7 +716,7 @@
+@@ -553,7 +545,7 @@
  				destdir="${buildDir}/${fullProdName}" 
  				deprecation="off" 
  				debug="${debug.enable}" 
@@ -39,11 +45,12 @@
  			<classpath refid="project.build.classpath" />
  		</javac>
  	</target>
-@@ -731,6 +731,7 @@
+@@ -567,7 +559,7 @@
+ 			deprecation="off" 
  			debug="${debug.enable}"
- 			includes="testsuite/**">
+ 			includes="testsuite/**"
+-			excludes="testsuite/requiresNonRedists/**">
++			excludes="testsuite/requiresNonRedists/** **/AppletRegressionTest.java">
  			<classpath refid="project.build.classpath"/>
-+                        <exclude name="**/AppletRegressionTest.java"/>
  		</javac>
  	</target>
-