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

[Torsten Werner]

Author: twerner
Date: 2011-08-25 07:22:06 +0000 (Thu, 25 Aug 2011)
New Revision: 14478

Added:
   trunk/mysql-connector-java/debian/libmysql-java.poms
Modified:
   trunk/mysql-connector-java/debian/changelog
   trunk/mysql-connector-java/debian/control
   trunk/mysql-connector-java/debian/rules
Log:
Add mh_installpoms to give maven support for other packages using
mysql-java. (Closes: #627746)

Modified: trunk/mysql-connector-java/debian/changelog
===================================================================
--- trunk/mysql-connector-java/debian/changelog	2011-08-25 07:03:13 UTC (rev 14477)
+++ trunk/mysql-connector-java/debian/changelog	2011-08-25 07:22:06 UTC (rev 14478)
@@ -2,6 +2,12 @@
 
   UNRELEASED
   * Team upload.
+
+  [ Miguel Telleria de Esteban ]
+  * Add mh_installpoms to give maven support for other packages using
+    mysql-java. (Closes: #627746)
+
+  [ Torsten Werner ]
   * Add target get-orig-source to debian/rules.
 
  -- Torsten Werner <twerner at debian.org>  Thu, 25 Aug 2011 08:58:53 +0200

Modified: trunk/mysql-connector-java/debian/control
===================================================================
--- trunk/mysql-connector-java/debian/control	2011-08-25 07:03:13 UTC (rev 14477)
+++ trunk/mysql-connector-java/debian/control	2011-08-25 07:22:06 UTC (rev 14478)
@@ -4,7 +4,7 @@
 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), cdbs, ant, java-gcj-compat-dev, ant-optional
-Build-Depends-Indep: openjdk-6-jdk, liblog4j1.2-java, libcommons-logging-java, junit, ant-contrib
+Build-Depends-Indep: openjdk-6-jdk, liblog4j1.2-java, libcommons-logging-java, junit, ant-contrib, maven-repo-helper
 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

Added: trunk/mysql-connector-java/debian/libmysql-java.poms
===================================================================
--- trunk/mysql-connector-java/debian/libmysql-java.poms	                        (rev 0)
+++ trunk/mysql-connector-java/debian/libmysql-java.poms	2011-08-25 07:22:06 UTC (rev 14478)
@@ -0,0 +1,7 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]
+# where option can be:
+#   --ignore: ignore this POM or
+#   --no-parent: remove the <parent> tag from the POM
+src/doc/sources/pom.xml

Modified: trunk/mysql-connector-java/debian/rules
===================================================================
--- trunk/mysql-connector-java/debian/rules	2011-08-25 07:03:13 UTC (rev 14477)
+++ trunk/mysql-connector-java/debian/rules	2011-08-25 07:22:06 UTC (rev 14478)
@@ -12,11 +12,11 @@
 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
 
-install/libmysql-java::
-	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
+binary-post-install/libmysql-java::
+	mh_installpoms -plibmysql-java -e$(VERSION)
+	mh_installjar -plibmysql-java -e$(VERSION) -l src/doc/sources/pom.xml build/mysql-connector-java-$(VERSION)/mysql-connector-java-$(VERSION)-bin.jar
+	# compat link?
+	dh_link -plibmysql-java usr/share/java/mysql-connector-java.jar usr/share/java/mysql.jar
 
 clean::
 	rm -rf dist