[pkg-java] r9975 - trunk/commons-pool/debian

[Damien Raude-Morvan]

Author: drazzib-guest
Date: 2009-08-14 09:49:30 +0000 (Fri, 14 Aug 2009)
New Revision: 9975

Added:
   trunk/commons-pool/debian/libcommons-pool-java-doc.install
   trunk/commons-pool/debian/libcommons-pool-java.poms
   trunk/commons-pool/debian/maven.rules
Removed:
   trunk/commons-pool/debian/libcommons-pool-java-doc.docs
Modified:
   trunk/commons-pool/debian/changelog
   trunk/commons-pool/debian/control
   trunk/commons-pool/debian/libcommons-pool-java-doc.doc-base
   trunk/commons-pool/debian/rules
Log:
[commons-pool]

  * Maven POMs:
    - Add a Build-Depends-Indep dependency on maven-repo-helper
    - Use mh_installpom and mh_installjar to install the POM and the jar to the
     Maven repository
  * Move api documentation to /usr/share/doc/libcommons-pool-java/api



Modified: trunk/commons-pool/debian/changelog
===================================================================
--- trunk/commons-pool/debian/changelog	2009-08-14 09:48:11 UTC (rev 9974)
+++ trunk/commons-pool/debian/changelog	2009-08-14 09:49:30 UTC (rev 9975)
@@ -19,8 +19,13 @@
   * Update debian/copyright:
     - Don't include full Apache 2 licence
     - Update Copyright assignements
+  * Maven POMs:
+    - Add a Build-Depends-Indep dependency on maven-repo-helper
+    - Use mh_installpom and mh_installjar to install the POM and the jar to the
+     Maven repository
+  * Move api documentation to /usr/share/doc/libcommons-pool-java/api
 
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Tue, 14 Jul 2009 15:39:34 +0200
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Fri, 14 Aug 2009 01:59:23 +0200
 
 commons-pool (1.3-1) unstable; urgency=low
 

Modified: trunk/commons-pool/debian/control
===================================================================
--- trunk/commons-pool/debian/control	2009-08-14 09:48:11 UTC (rev 9974)
+++ trunk/commons-pool/debian/control	2009-08-14 09:49:30 UTC (rev 9975)
@@ -6,7 +6,7 @@
 Priority: optional
 Standards-Version: 3.8.2
 Build-Depends: debhelper (>= 5), default-jdk, ant, cdbs, quilt
-Build-Depends-Indep: ant-optional, junit, classpath-doc
+Build-Depends-Indep: ant-optional, junit, classpath-doc, maven-repo-helper
 Homepage: http://commons.apache.org/pool/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-pool/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-pool/

Modified: trunk/commons-pool/debian/libcommons-pool-java-doc.doc-base
===================================================================
--- trunk/commons-pool/debian/libcommons-pool-java-doc.doc-base	2009-08-14 09:48:11 UTC (rev 9974)
+++ trunk/commons-pool/debian/libcommons-pool-java-doc.doc-base	2009-08-14 09:49:30 UTC (rev 9975)
@@ -5,5 +5,5 @@
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libcommons-pool-java-doc/api/index.html
-Files: /usr/share/doc/libcommons-pool-java-doc/api/*
+Index: /usr/share/doc/libcommons-pool-java/api/index.html
+Files: /usr/share/doc/libcommons-pool-java/api/*

Deleted: trunk/commons-pool/debian/libcommons-pool-java-doc.docs
===================================================================
--- trunk/commons-pool/debian/libcommons-pool-java-doc.docs	2009-08-14 09:48:11 UTC (rev 9974)
+++ trunk/commons-pool/debian/libcommons-pool-java-doc.docs	2009-08-14 09:49:30 UTC (rev 9975)
@@ -1 +0,0 @@
-dist/docs/api

Copied: trunk/commons-pool/debian/libcommons-pool-java-doc.install (from rev 9970, trunk/commons-pool/debian/libcommons-pool-java-doc.docs)
===================================================================
--- trunk/commons-pool/debian/libcommons-pool-java-doc.install	                        (rev 0)
+++ trunk/commons-pool/debian/libcommons-pool-java-doc.install	2009-08-14 09:49:30 UTC (rev 9975)
@@ -0,0 +1 @@
+dist/docs/api /usr/share/doc/libcommons-pool-java

Added: trunk/commons-pool/debian/libcommons-pool-java.poms
===================================================================
--- trunk/commons-pool/debian/libcommons-pool-java.poms	                        (rev 0)
+++ trunk/commons-pool/debian/libcommons-pool-java.poms	2009-08-14 09:49:30 UTC (rev 9975)
@@ -0,0 +1 @@
+pom.xml --no-parent

Added: trunk/commons-pool/debian/maven.rules
===================================================================
--- trunk/commons-pool/debian/maven.rules	                        (rev 0)
+++ trunk/commons-pool/debian/maven.rules	2009-08-14 09:49:30 UTC (rev 9975)
@@ -0,0 +1 @@
+junit junit jar s/3\..*/3.x/ *

Modified: trunk/commons-pool/debian/rules
===================================================================
--- trunk/commons-pool/debian/rules	2009-08-14 09:48:11 UTC (rev 9974)
+++ trunk/commons-pool/debian/rules	2009-08-14 09:49:30 UTC (rev 9975)
@@ -6,17 +6,19 @@
 
 JAVA_HOME	:= /usr/lib/jvm/default-java
 DEB_JARS        := junit ant-junit
-BASENAME	:= $(DEB_SOURCE_PACKAGE)
+PACKAGE		:= $(DEB_SOURCE_PACKAGE)
 
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := dist
 DEB_ANT_CHECK_TARGET := test
 
 # Per Debian Java Policy, install a versioned JAR and an unversioned symlink
-binary-post-install/lib$(BASENAME)-java::
-	mv dist/$(BASENAME).jar dist/$(BASENAME)-$(DEB_UPSTREAM_VERSION).jar
-	dh_install dist/$(BASENAME)-$(DEB_UPSTREAM_VERSION).jar /usr/share/java
-	dh_link /usr/share/java/$(BASENAME)-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/$(BASENAME).jar
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l pom.xml dist/$(PACKAGE).jar
 
+clean::
+	-rm -rf debian/tmp
+
 get-orig-source:
 	uscan --force-download --rename