CVS mysql-connector-java/debian

Arnaud Vandyck avdyk@haydn.debian.org
Mon Apr 4 20:08:31 2005


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

Modified Files:
	README.Debian changelog control docs rules 
Added Files:
	README.Debian-source compat 
Log Message:
new upstream, soon to main...

--- /cvsroot/pkg-java/mysql-connector-java/debian/README.Debian	2003/07/12 15:29:19	1.1.1.1
+++ /cvsroot/pkg-java/mysql-connector-java/debian/README.Debian	2005/04/04 20:07:28	1.2
@@ -1,13 +1,21 @@
 MySQL JDBC Driver for Debian
 ----------
 
-Currenty, libmysql-java package provides only JDBC 2.0 driver.
-If you want to use JDBC 2.0 optional function, you have to download 
-JDBC 2.0 Optional Package Biary from SUN and set classpath for 
-jdbc2_0-stdext.jar.
+This package provides a JDBC 3.0 driver for the mysql database
+system and supports all MySQL versions up to 4.1 release.
 
-You can downlaod JDBC 2.0 Optional Package Biary here:
+This driver supports Java runtimes from JDK 1.2.x to 1.5.x
+as well as the free runtimes like kaffe, sablevm or jamvm.
 
-	http://java.sun.com/products/jdbc/download.html 
+This MySQL driver does not support JDK-1.1.x or JDK-1.0.x.
 
- -- Takashi Okamoto <tora@debian.org>, Sun, 10 Nov 2002 10:23:38 +0900
+Because of the implementation of java.sql.Savepoint this driver will 
+not run on non-free JDKs older than 1.4 unless the class verifier 
+is turned off (-Xverify:none), as the class verifier will try to load 
+the class definition for java.sql.Savepoint even though it is not accessed 
+by the driver unless you actually use savepoint functionality.
+
+This affects JDK 1.3.1 for example but NOT the free runtimes as they
+already implement java.sql.Savepoint.
+
+ -- Wolfgang Baer <WBaer@gmx.de>
--- /cvsroot/pkg-java/mysql-connector-java/debian/changelog	2003/07/12 15:29:19	1.1.1.1
+++ /cvsroot/pkg-java/mysql-connector-java/debian/changelog	2005/04/04 20:07:29	1.2
@@ -1,3 +1,32 @@
+mysql-connector-java (3.1.7-1) unstable; urgency=low
+
+  * New upstream release (closes: #282570,#293995)
+  * Now implements JDBC 3 specification - Updated README.Debian/Descriptions
+  * Built with free tools - but stay in contrib to get it into
+    sarge asap (old release does not support mysql 4.1 features)
+    Upload to main will follow afterwards
+  * Changed build system to cdbs: build depends now on kaffe, libant1.6-java, 
+    liblog4j1.2-java, junit; Added liblog4j1.2-java as Suggests
+  * No more build depends on jars under /usr/local (closes: #262291)
+  * Patched build.xml (01_BuildXml.patch):
+    - Changed build directory property to a directory inside source tree
+    - Excluded test from testsuite which build depends on 
+      sun internal stuff (AppletRegressionTest.java)
+    - Patched javac target to use target=1.3 so it is also usable with 
+      JDK 1.3, -Xverify:none needs to be passed to the vm (see README.Debian)
+  * Standards-Version: 3.6.1 - no changes required
+  * Changed maintainer to Debian Java Maintainers as
+    requested by Takashi Okamoto for comaintaining
+  * avdyk: added Wolfgang and myself to the uploaders
+  
+ -- Wolfgang Baer <WBaer@gmx.de>  Sat, 02 Apr 2005 20:30:09 +0200
+
+mysql-connector-java (3.0.9-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takashi Okamoto <tora@debian.org>  Tue, 30 Dec 2003 22:37:53 +0900
+
 mysql-connector-java (3.0.8-1) unstable; urgency=low
 
   * New upstream release
--- /cvsroot/pkg-java/mysql-connector-java/debian/control	2003/07/12 15:29:19	1.1.1.1
+++ /cvsroot/pkg-java/mysql-connector-java/debian/control	2005/04/04 20:07:29	1.2
@@ -1,15 +1,16 @@
 Source: mysql-connector-java
 Section: contrib/libs
 Priority: optional
-Maintainer: Takashi Okamoto <tora@debian.org>
-Build-Depends-Indep: debhelper (>> 3.0.0), j2sdk1.4 , ant (>=1.4)
-Standards-Version: 3.5.8
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: Takashi Okamoto <tora@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@gmx.de>
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.4.PRECVS12-1), libant1.6-java, liblog4j1.2-java, junit
+Standards-Version: 3.6.1
 
 Package: libmysql-java
 Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime
-Suggests: java-virtual-machine
+Depends: kaffe | java1-runtime | java2-runtime 
+Suggests: liblog4j1.2-java, java-virtual-machine
 Description: Java database (JDBC) driver for MySQL
  MySQL Connector is a Type-4 JDBC driver. It allows Java developers 
  to make connections to MySQL servers from both Java applications and
- applets. MySQL supports JDBC 2.0 API and JTA 1.0.
+ applets. MySQL supports JDBC 3.0 API.
--- /cvsroot/pkg-java/mysql-connector-java/debian/docs	2003/07/12 15:29:19	1.1.1.1
+++ /cvsroot/pkg-java/mysql-connector-java/debian/docs	2005/04/04 20:07:29	1.2
@@ -1 +1,3 @@
 README
+CHANGES
+docs/index.html
--- /cvsroot/pkg-java/mysql-connector-java/debian/rules	2003/07/12 15:29:19	1.1.1.1
+++ /cvsroot/pkg-java/mysql-connector-java/debian/rules	2005/04/04 20:07:29	1.2
@@ -1,94 +1,29 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# debian/rules file for mysql-connector-java (uses cdbs)
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/ant.mk
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
+UPSTREAM_VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
 
-VERSION=3.0.8
-
-jdk_dirs:=/usr/lib/j2se/1.4 /usr/lib/j2sdk1.4
-export JAVA_HOME=$(shell for jdir in $(jdk_dirs); do if [ -d "$$jdir" ]; then echo $$jdir; exit 0; fi; done)
-
-CLASSPATH=.:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:/usr/local/share/java/jdbc2_0-stdext.jar:/usr/local/share/java/jta.jar
-JAR=${JAVA_HOME}/bin/jar
-JAVAC=jikes
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	mkdir -p build	
-	cp -r com org build
-	rm -fr build/com/mysql/jdbc/jdbc1 
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-
-	# Add here commands to compile the package.
-
-
-	mkdir -p classes 
-	(cd build;\
-	$(JAVAC) -classpath $(CLASSPATH) \
-		-d ../classes `find  com org -name "*.java"`)
-	$(JAR) cvf mysql-${VERSION}.jar -C classes/ .
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf build-stamp configure-stamp build classes mysql-${VERSION}.jar
-
-	# Add here commands to clean up after the build process.
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	cp mysql-${VERSION}.jar debian/libmysql-java/usr/share/java
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf	
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-	dh_installcron
-	dh_installman
-	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs CHANGES
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-#	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+JAVA_HOME := /usr/lib/kaffe
+ANT_HOME := /usr/share/ant1.6
+
+# Additional JARs to add to the class path, either full path or just the
+# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar log4j-1.2 junit
+
+# Build compiler
+DEB_ANT_COMPILER := jikes
+
+# Ant targets to call
+DEB_ANT_BUILD_TARGET := dist
+
+clean::  # remove the build/dist directory as the build.xml is not patched at this moment
+	rm -rf build-mysql-jdbc dist-mysql-jdbc 
+
+install/libmysql-java::
+	install -m 644 build-mysql-jdbc/mysql-connector-java-$(UPSTREAM_VERSION)/mysql-connector-java-$(UPSTREAM_VERSION)-bin.jar debian/libmysql-java/usr/share/java/mysql-$(UPSTREAM_VERSION).jar
+	ln -s mysql-$(UPSTREAM_VERSION).jar debian/libmysql-java/usr/share/java/mysql.jar
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure