[pkg-java] r13146 - trunk/apache-log4j1.2/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2010-12-05 14:21:40 +0000 (Sun, 05 Dec 2010)
New Revision: 13146

Modified:
   trunk/apache-log4j1.2/debian/changelog
   trunk/apache-log4j1.2/debian/liblog4j1.2-java.poms
   trunk/apache-log4j1.2/debian/rules
Log:
* Add --has-package-version to libapache-log4j1.2-java.poms
* Deploy javadoc jar into the Maven repository 

Modified: trunk/apache-log4j1.2/debian/changelog
===================================================================
--- trunk/apache-log4j1.2/debian/changelog	2010-12-05 14:04:25 UTC (rev 13145)
+++ trunk/apache-log4j1.2/debian/changelog	2010-12-05 14:21:40 UTC (rev 13146)
@@ -1,3 +1,10 @@
+apache-log4j1.2 (1.2.16-2) experimental; urgency=low
+
+  * Add --has-package-version to libapache-log4j1.2-java.poms
+  * Deploy javadoc jar into the Maven repository 
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 04 Oct 2010 21:18:53 +0200
+
 apache-log4j1.2 (1.2.16-1) experimental; urgency=low
 
   * Add myself to uploaders

Modified: trunk/apache-log4j1.2/debian/liblog4j1.2-java.poms
===================================================================
--- trunk/apache-log4j1.2/debian/liblog4j1.2-java.poms	2010-12-05 14:04:25 UTC (rev 13145)
+++ trunk/apache-log4j1.2/debian/liblog4j1.2-java.poms	2010-12-05 14:21:40 UTC (rev 13146)
@@ -1 +1,2 @@
-pom.xml
+pom.xml --has-package-version --java-lib --usj-name=log4j-1.2 --artifact=dist/lib/log4j-*.jar
+dist/lib/log4j.javadoc.pom --has-package-version --artifact=dist/lib/log4j.javadoc.jar --classifier=javadoc --ignore-pom --package=liblog4j-1.2-java-doc

Modified: trunk/apache-log4j1.2/debian/rules
===================================================================
--- trunk/apache-log4j1.2/debian/rules	2010-12-05 14:04:25 UTC (rev 13145)
+++ trunk/apache-log4j1.2/debian/rules	2010-12-05 14:21:40 UTC (rev 13146)
@@ -30,10 +30,11 @@
 		-output log4j.jar dist/lib/log4j-$(VERSION).jar
 	rm debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar
 	mv log4j.jar dist/lib/log4j-$(VERSION).jar
+	cp pom.xml dist/lib/log4j.javadoc.pom
+	jar cvf dist/lib/log4j.javadoc.jar -C docs/api/ .
 
 install/liblog4j1.2-java::
-	mh_installpoms -pliblog4j1.2-java
-	mh_installjar -pliblog4j1.2-java -l --usj-name=log4j-1.2 pom.xml dist/lib/log4j-$(VERSION).jar
+	mh_install
 
 ifeq ($(with_gcj_native),yes)
 install/liblog4j1.2-java-gcj:: install/liblog4j1.2-java