CVS mysql-connector-java/debian/patches

[Wolfgang B??r]

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

Modified Files:
	01_BuildXml.patch 
Log Message:
mysql-connector-java (3.1.10-1) unstable; urgency=low

  * New upstream release
  * libant1.6-java to ant transition
  * Standards-Version 3.6.2 (no changes)
  * Removed documentation as its explicitly marked as NOT GNU licensedmysql-connector-java (3.1.10-1) unstable; urgency=low


--- /cvsroot/pkg-java/mysql-connector-java/debian/patches/01_BuildXml.patch	2005/04/04 20:07:32	1.1
+++ /cvsroot/pkg-java/mysql-connector-java/debian/patches/01_BuildXml.patch	2005/09/23 08:42:37	1.2
@@ -1,30 +1,49 @@
---- build.xml.orig	2005-04-03 19:36:27.000000000 +0200
-+++ build.xml	2005-04-02 23:43:39.000000000 +0200
-@@ -34,8 +34,8 @@
- 	<property name="extra.version" value=""/>
- 	<property name="fullProdName" value="${prodName}-${version}${extra.version}"/>
+--- 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>
+ 		
+ 	<path id="project.build.classpath">
+-		<fileset dir="${buildDir}/${fullProdName}/lib-nodist">
++		<!--<fileset dir="${buildDir}/${fullProdName}/lib-nodist">
+ 			<include name="**/*.jar"/>
+-		</fileset>
++		</fileset>-->
  
--	<property name="buildDir" value="../build-mysql-jdbc"/>
--	<property name="distDir" value="../dist-mysql-jdbc"/>
-+	<property name="buildDir" value="build-mysql-jdbc"/>
-+	<property name="distDir" value="dist-mysql-jdbc"/>
- 	<property name="junit.results" value="${buildDir}/junit"/>
- 	<property name="debug.enable" value="on" />
- 
-@@ -576,7 +576,7 @@
- 	<!-- Compiles the driver itself -->
+ 		<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="compile-driver" depends="init">
--		<javac srcdir="${buildDir}/${fullProdName}" destdir="${buildDir}/${fullProdName}" deprecation="off" debug="${debug.enable}" excludes="testsuite/**">
-+		<javac srcdir="${buildDir}/${fullProdName}" destdir="${buildDir}/${fullProdName}" deprecation="off" debug="${debug.enable}" excludes="testsuite/**" target="1.3">
+ 	<target name="dist-trace" depends="init, compile-driver-trace">
+@@ -653,7 +653,7 @@
+ 			debug="${debug.enable}" 
+ 			excludes="testsuite/**, 
+ 			   com/mysql/jdbc/integration/**,
+-			   com/mysql/jdbc/log/Log4JLogger.java">
++			   com/mysql/jdbc/log/Log4JLogger.java" target="1.3">
  			<classpath refid="project.build.classpath" />
  		</javac>
- 
-@@ -586,6 +586,7 @@
- 
- 	<target name="compile-testsuite" depends="init, compile-driver">
- 		<javac srcdir="${buildDir}/${fullProdName}" destdir="${buildDir}/${fullProdName}" deprecation="off" debug="${debug.enable}">
-+                        <exclude name="**/AppletRegressionTest.java"/>
+ 	</target>
+@@ -716,7 +716,7 @@
+ 				destdir="${buildDir}/${fullProdName}" 
+ 				deprecation="off" 
+ 				debug="${debug.enable}" 
+-				includes="com/mysql/jdbc/log/Log4JLogger.java">
++				includes="com/mysql/jdbc/log/Log4JLogger.java" target="1.3">
+ 			<classpath refid="project.build.classpath" />
+ 		</javac>
+ 	</target>
+@@ -731,6 +731,7 @@
+ 			debug="${debug.enable}"
+ 			includes="testsuite/**">
  			<classpath refid="project.build.classpath"/>
++                        <exclude name="**/AppletRegressionTest.java"/>
  		</javac>
  	</target>
+