[pkg-java] r14481 - in trunk/mysql-connector-java/debian: . patches

Torsten Werner twerner at alioth.debian.org
Thu Aug 25 09:14:00 UTC 2011 

Author: twerner
Date: 2011-08-25 09:13:59 +0000 (Thu, 25 Aug 2011)
New Revision: 14481

Added:
   trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch
Removed:
   trunk/mysql-connector-java/debian/docs
   trunk/mysql-connector-java/debian/patches/disable-tests.patch
Modified:
   trunk/mysql-connector-java/debian/changelog
   trunk/mysql-connector-java/debian/control
   trunk/mysql-connector-java/debian/orig-tar.exclude
   trunk/mysql-connector-java/debian/orig-tar.sh
   trunk/mysql-connector-java/debian/patches/series
   trunk/mysql-connector-java/debian/rules
   trunk/mysql-connector-java/debian/watch
Log:
* New upstream release. Switch from commons logging to slf4j.
* Clean up orig tarball even more. Remove c3p0*.zip and documentation without
  source format.

Modified: trunk/mysql-connector-java/debian/changelog
===================================================================
--- trunk/mysql-connector-java/debian/changelog	2011-08-25 08:39:04 UTC (rev 14480)
+++ trunk/mysql-connector-java/debian/changelog	2011-08-25 09:13:59 UTC (rev 14481)
@@ -1,4 +1,4 @@
-mysql-connector-java (5.1.10+dfsg-3) unstable; urgency=low
+mysql-connector-java (5.1.16-1) unstable; urgency=low
 
   UNRELEASED
   * Team upload.
@@ -8,6 +8,9 @@
     mysql-java. (Closes: #627746)
 
   [ Torsten Werner ]
+  * New upstream release. Switch from commons logging to slf4j.
+  * Clean up orig tarball even more. Remove c3p0*.zip and documentation without
+    source format.
   * Add target get-orig-source to debian/rules.
   * Remove Arnaud from Uploaders list.
   * Remove Java runtime from Depends.
@@ -15,7 +18,7 @@
   * Switch to debhelper level 7.
   * Update Standards-Version: 3.9.1.
 
- -- Torsten Werner <twerner at debian.org>  Thu, 25 Aug 2011 10:34:55 +0200
+ -- Torsten Werner <twerner at debian.org>  Thu, 25 Aug 2011 11:09:59 +0200
 
 mysql-connector-java (5.1.10+dfsg-2) unstable; urgency=low
 

Modified: trunk/mysql-connector-java/debian/control
===================================================================
--- trunk/mysql-connector-java/debian/control	2011-08-25 08:39:04 UTC (rev 14480)
+++ trunk/mysql-connector-java/debian/control	2011-08-25 09:13:59 UTC (rev 14481)
@@ -4,7 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
 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, maven-repo-helper
+Build-Depends-Indep: openjdk-6-jdk, junit, ant-contrib, maven-repo-helper,
+ libslf4j-java
 Standards-Version: 3.9.1
 Homepage: http://www.mysql.com/products/connector/j/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/mysql-connector-java

Deleted: trunk/mysql-connector-java/debian/docs
===================================================================
--- trunk/mysql-connector-java/debian/docs	2011-08-25 08:39:04 UTC (rev 14480)
+++ trunk/mysql-connector-java/debian/docs	2011-08-25 09:13:59 UTC (rev 14481)
@@ -1 +0,0 @@
-EXCEPTIONS-CONNECTOR-J

Modified: trunk/mysql-connector-java/debian/orig-tar.exclude
===================================================================
--- trunk/mysql-connector-java/debian/orig-tar.exclude	2011-08-25 08:39:04 UTC (rev 14480)
+++ trunk/mysql-connector-java/debian/orig-tar.exclude	2011-08-25 09:13:59 UTC (rev 14481)
@@ -1,2 +1,3 @@
-mysql-connector-java-*-bin.jar
-src/lib/*.jar
+*.jar
+*.zip
+*/docs/*

Modified: trunk/mysql-connector-java/debian/orig-tar.sh
===================================================================
--- trunk/mysql-connector-java/debian/orig-tar.sh	2011-08-25 08:39:04 UTC (rev 14480)
+++ trunk/mysql-connector-java/debian/orig-tar.sh	2011-08-25 09:13:59 UTC (rev 14481)
@@ -16,4 +16,3 @@
 	echo "moved $3 to $origDir"
 fi
 
-exit 0

Copied: trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch (from rev 14475, trunk/mysql-connector-java/debian/patches/disable-tests.patch)
===================================================================
--- trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch	                        (rev 0)
+++ trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch	2011-08-25 09:13:59 UTC (rev 14481)
@@ -0,0 +1,22 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Thu, 25 Aug 2011 10:44:00 +0200
+Subject: [PATCH] disable testsuite
+
+---
+ build.xml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 6ab7c02..2a65115 100644
+--- a/build.xml
++++ b/build.xml
+@@ -736,7 +736,7 @@ and the full path to the rt.jar from Java-6 with the property "com.mysql.jd
+ 	</target>
+ 
+ 
+-	<target name="compile" depends="init, compile-driver, compile-testsuite, compile.integration">
++	<target name="compile" depends="init, compile-driver, compile.integration">
+ 	</target>
+ 
+ 	<!-- Compiles the driver itself -->
+-- 

Deleted: trunk/mysql-connector-java/debian/patches/disable-tests.patch
===================================================================
--- trunk/mysql-connector-java/debian/patches/disable-tests.patch	2011-08-25 08:39:04 UTC (rev 14480)
+++ trunk/mysql-connector-java/debian/patches/disable-tests.patch	2011-08-25 09:13:59 UTC (rev 14481)
@@ -1,11 +0,0 @@
---- mysql-connector-java-5.1.10+dfsg.orig/build.xml
-+++ mysql-connector-java-5.1.10+dfsg/build.xml
-@@ -770,7 +770,7 @@
- 	</target>
- 
- 
--	<target name="compile" depends="init, compile-driver, compile-testsuite, compile.integration">
-+	<target name="compile" depends="init, compile-driver, compile.integration">
- 	</target>
- 
- 	<target name="compile-trace" depends="init, compile-driver-trace">

Modified: trunk/mysql-connector-java/debian/patches/series
===================================================================
--- trunk/mysql-connector-java/debian/patches/series	2011-08-25 08:39:04 UTC (rev 14480)
+++ trunk/mysql-connector-java/debian/patches/series	2011-08-25 09:13:59 UTC (rev 14481)
@@ -1 +1 @@
-disable-tests.patch
+0001-disable-testsuite.patch

Modified: trunk/mysql-connector-java/debian/rules
===================================================================
--- trunk/mysql-connector-java/debian/rules	2011-08-25 08:39:04 UTC (rev 14480)
+++ trunk/mysql-connector-java/debian/rules	2011-08-25 09:13:59 UTC (rev 14481)
@@ -8,8 +8,10 @@
 JAVA_HOME := /usr/lib/jvm/java-gcj
 JAVA6_HOME := /usr/lib/jvm/java-6-openjdk
 
-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
+DEB_JARS := ant ant-launcher ant-junit junit ant-contrib slf4j-api
+DEB_ANT_ARGS := -Dcom.mysql.jdbc.java6.javac=$(JAVA6_HOME)/bin/javac \
+    -Dcom.mysql.jdbc.java6.rtjar=$(JAVA6_HOME)/jre/lib/rt.jar \
+    -Dsnapshot.version=
 
 binary-post-install/libmysql-java::
 	mh_installpoms -plibmysql-java -e$(VERSION)
@@ -22,4 +24,4 @@
 	rm -f build-stamp
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

Modified: trunk/mysql-connector-java/debian/watch
===================================================================
--- trunk/mysql-connector-java/debian/watch	2011-08-25 08:39:04 UTC (rev 14480)
+++ trunk/mysql-connector-java/debian/watch	2011-08-25 09:13:59 UTC (rev 14481)
@@ -1,3 +1,2 @@
 version=3
-opts=dversionmangle=s/\+dfsg.*// \
 ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/Connector-J/mysql-connector-java-(.*)\.tar\.gz debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list