Author: mkoch
Date: 2009-10-05 18:21:15 +0000 (Mon, 05 Oct 2009)
New Revision: 10773

Added:
   trunk/mysql-connector-java/debian/patches/
   trunk/mysql-connector-java/debian/patches/disable-tests.patch
Removed:
   trunk/mysql-connector-java/debian/dirs
Modified:
   trunk/mysql-connector-java/debian/changelog
   trunk/mysql-connector-java/debian/rules
Log:
mysql-connector-java (5.1.10+dfsg-2) unstable; urgency=low

  * Fix installation of versioned jar (Closes: #549677).

 -- Michael Koch <[email protected]>  Mon, 05 Oct 2009 20:18:40 +0200



Modified: trunk/mysql-connector-java/debian/changelog
===================================================================
--- trunk/mysql-connector-java/debian/changelog 2009-10-05 11:06:07 UTC (rev 
10772)
+++ trunk/mysql-connector-java/debian/changelog 2009-10-05 18:21:15 UTC (rev 
10773)
@@ -1,3 +1,9 @@
+mysql-connector-java (5.1.10+dfsg-2) unstable; urgency=low
+
+  * Fix installation of versioned jar (Closes: #549677).
+
+ -- Michael Koch <[email protected]>  Mon, 05 Oct 2009 20:18:40 +0200
+
 mysql-connector-java (5.1.10+dfsg-1) unstable; urgency=low
 
   * New upstream release.

Deleted: trunk/mysql-connector-java/debian/dirs
===================================================================
--- trunk/mysql-connector-java/debian/dirs      2009-10-05 11:06:07 UTC (rev 
10772)
+++ trunk/mysql-connector-java/debian/dirs      2009-10-05 18:21:15 UTC (rev 
10773)
@@ -1 +0,0 @@
-usr/share/java

Added: trunk/mysql-connector-java/debian/patches/disable-tests.patch
===================================================================
--- trunk/mysql-connector-java/debian/patches/disable-tests.patch               
                (rev 0)
+++ trunk/mysql-connector-java/debian/patches/disable-tests.patch       
2009-10-05 18:21:15 UTC (rev 10773)
@@ -0,0 +1,11 @@
+--- 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/rules
===================================================================
--- trunk/mysql-connector-java/debian/rules     2009-10-05 11:06:07 UTC (rev 
10772)
+++ trunk/mysql-connector-java/debian/rules     2009-10-05 18:21:15 UTC (rev 
10773)
@@ -13,7 +13,7 @@
 DEB_ANT_ARGS := -Dcom.mysql.jdbc.java6.javac=$(JAVA6_HOME)/bin/javac 
-Dcom.mysql.jdbc.java6.rtjar=$(JAVA6_HOME)/jre/lib/rt.jar
 
 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
+       install -D -m 644 
build/mysql-connector-java-$(VERSION)/mysql-connector-java-$(VERSION)-bin.jar 
debian/libmysql-java/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


_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to