[pkg-java] r10633 - trunk/mysql-connector-java/debian

Sat Sep 26 09:29:51 UTC 2009

Author: mkoch
Date: 2009-09-26 09:28:00 +0000 (Sat, 26 Sep 2009)
New Revision: 10633

Modified:
   trunk/mysql-connector-java/debian/changelog
   trunk/mysql-connector-java/debian/control
   trunk/mysql-connector-java/debian/rules
Log:
* Build-Depends on cdbs.
* Build-Depends-Indep on openjdk-6-jdk for JDBC 4.
* Add Depends ${misc:Depends} to libmysql-java.


Modified: trunk/mysql-connector-java/debian/changelog
===================================================================

--- trunk/mysql-connector-java/debian/changelog	2009-09-26 06:51:42 UTC (rev 10632)
+++ trunk/mysql-connector-java/debian/changelog	2009-09-26 09:28:00 UTC (rev 10633)
@@ -1,17 +1,20 @@
-mysql-connector-java (5.1.10+dfsg-1) UNRELEASED; urgency=low
+mysql-connector-java (5.1.10+dfsg-1) unstable; urgency=low
 
   * New upstream release.
+  * Build-Depends on cdbs.
   * Made java-gcj-compat-dev a Build-Depends instead of
     a Build-Depends-Indep.
+  * Build-Depends-Indep on openjdk-6-jdk for JDBC 4.
   * Build-Depends on debhelper >= 7.
   * Moved package to section 'java'.
   * Let package Depends on default-jre-headless and alternatives.
+  * Add Depends ${misc:Depends} to libmysql-java.
   * Fixed watch file to use a decent FTP mirror.
   * Added automatic orig tarball creation on upstream updates.
   * Updated Standards-Version to 3.8.3.
   * In debian/rules always use JAVA_HOME when possible.
 
- -- Michael Koch <konqueror at gmx.de>  Fri, 25 Sep 2009 21:10:44 +0200
+ -- Michael Koch <konqueror at gmx.de>  Sat, 26 Sep 2009 11:22:43 +0200
 
 mysql-connector-java (5.1.6+dfsg-1) unstable; urgency=low
 

Modified: trunk/mysql-connector-java/debian/control
===================================================================
--- trunk/mysql-connector-java/debian/control	2009-09-26 06:51:42 UTC (rev 10632)
+++ trunk/mysql-connector-java/debian/control	2009-09-26 09:28:00 UTC (rev 10633)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), ant, java-gcj-compat-dev, ant-optional
-Build-Depends-Indep: liblog4j1.2-java, libcommons-logging-java, junit
+Build-Depends: debhelper (>= 7), cdbs, ant, java-gcj-compat-dev, ant-optional
+Build-Depends-Indep: openjdk-6-jdk, liblog4j1.2-java, libcommons-logging-java, junit, ant-contrib
 Standards-Version: 3.8.3
 Homepage: http://www.mysql.com/products/connector/j/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/mysql-connector-java
@@ -12,7 +12,7 @@
 
 Package: libmysql-java
 Architecture: all
-Depends: default-jre-headless | java2-runtime-headless
+Depends: default-jre-headless | java2-runtime-headless, ${misc:Depends}
 Suggests: liblog4j1.2-java, libcommons-logging-java
 Description: Java database (JDBC) driver for MySQL
  MySQL Connector/J is a JDBC-3.0 Type 4 driver, which means that it is

Modified: trunk/mysql-connector-java/debian/rules
===================================================================
--- trunk/mysql-connector-java/debian/rules	2009-09-26 06:51:42 UTC (rev 10632)
+++ trunk/mysql-connector-java/debian/rules	2009-09-26 09:28:00 UTC (rev 10633)
@@ -1,66 +1,23 @@
 #!/usr/bin/make -f
 
-JAVA_HOME	:= /usr/lib/jvm/java-gcj
-DEB_JARS_BASE	:= /usr/share/java
-JAVACMD	 	:= $(JAVA_HOME)/bin/java
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_JARS 	:= ant ant-launcher ant-junit commons-logging log4j-1.2 junit
-DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
-		if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
-		if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
-		if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
-		if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
-		done; \
-		if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
+VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/Version: //' | cut -f1 -d- | cut -f1 -d+)
 
+JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA6_HOME := /usr/lib/jvm/java-6-openjdk
 
-ANT_INVOKE	:= $(JAVACMD) -classpath $(DEB_CLASSPATH) \
-		org.apache.tools.ant.Main $(ANT_ARGS)
+DEB_JARS := ant ant-launcher ant-junit commons-logging log4j-1.2 junit ant-contrib
+DEB_ANT_ARGS := -Dcom.mysql.jdbc.java6.javac=$(JAVA6_HOME)/bin/javac -Dcom.mysql.jdbc.java6.rtjar=$(JAVA6_HOME)/jre/lib/rt.jar
 
-PKGNAME		:= libmysql-java
-LIBNAME		:= mysql-connector-java
-INSTALL_DIR	:= $(CURDIR)/debian/$(PKGNAME)
-JAVALIB_DIR	:= $(INSTALL_DIR)/usr/share/java
-VERSION         := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/Version: //' | cut -f1 -d- | cut -f1 -d+)
+install/libmysql-java::
+	dh_install -plibmysql-java build/mysql-connector-java-$(VERSION)/mysql-connector-java-$(VERSION)-bin.jar usr/share/java/mysql-connector-java-$(VERSION).jar
+	dh_link -plibmysql-java usr/share/java/mysql-connector-java-$(VERSION).jar usr/share/java/mysql-connector-java.jar
+	dh_link -plibmysql-java usr/share/java/mysql-connector-java-$(VERSION).jar usr/share/java/mysql-$(VERSION).jar
+	dh_link -plibmysql-java usr/share/java/mysql-$(VERSION).jar usr/share/java/mysql.jar
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-	$(ANT_INVOKE) dist -Dcom.mysql.jdbc.java6.javac=$(JAVA_HOME)/bin/javac -Dcom.mysql.jdbc.java6.rtjar=$(JAVA_HOME)/lib/rt.jar
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	$(ANT_INVOKE) clean
+clean::
 	rm -rf dist
 	rm -f build-stamp
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_install
-	install -m 644 build/$(LIBNAME)-$(VERSION)/$(LIBNAME)-$(VERSION)-bin.jar $(JAVALIB_DIR)/$(LIBNAME)-$(VERSION).jar
-	ln -s $(LIBNAME)-$(VERSION).jar $(JAVALIB_DIR)/$(LIBNAME).jar
-	ln -s $(LIBNAME)-$(VERSION).jar $(JAVALIB_DIR)/mysql-$(VERSION).jar
-	ln -s mysql-$(VERSION).jar $(JAVALIB_DIR)/mysql.jar
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install


