[pkg-java] r8754 - trunk/commons-configuration/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-02 09:44:13 +0000 (Thu, 02 Jul 2009)
New Revision: 8754

Added:
   trunk/commons-configuration/debian/libcommons-configuration-java-doc.doc-base
   trunk/commons-configuration/debian/libcommons-configuration-java.poms
   trunk/commons-configuration/debian/maven.rules
Removed:
   trunk/commons-configuration/debian/install
Modified:
   trunk/commons-configuration/debian/changelog
   trunk/commons-configuration/debian/rules
Log:
* New version

Modified: trunk/commons-configuration/debian/changelog
===================================================================
--- trunk/commons-configuration/debian/changelog	2009-07-02 09:42:18 UTC (rev 8753)
+++ trunk/commons-configuration/debian/changelog	2009-07-02 09:44:13 UTC (rev 8754)
@@ -1,3 +1,16 @@
+commons-configuration (1.6-2) unstable; urgency=low
+
+  * Change section to java, bump up Standards-Version to 3.8.1
+  * Add the Maven POM to the package,
+  * 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
+  * Add missing dependencies on the binary package
+  * Add new java-doc package
+  * Use default-jdk to build the package, otherwise javadoc generation fails
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 19 Apr 2009 15:31:35 +0100
+
 commons-configuration (1.6-1) unstable; urgency=low
 
   * new upstream release

Deleted: trunk/commons-configuration/debian/install
===================================================================
--- trunk/commons-configuration/debian/install	2009-07-02 09:42:18 UTC (rev 8753)
+++ trunk/commons-configuration/debian/install	2009-07-02 09:44:13 UTC (rev 8754)
@@ -1,2 +0,0 @@
-target/commons-configuration-*.jar /usr/share/java/
-

Added: trunk/commons-configuration/debian/libcommons-configuration-java-doc.doc-base
===================================================================
--- trunk/commons-configuration/debian/libcommons-configuration-java-doc.doc-base	                        (rev 0)
+++ trunk/commons-configuration/debian/libcommons-configuration-java-doc.doc-base	2009-07-02 09:44:13 UTC (rev 8754)
@@ -0,0 +1,9 @@
+Document: libcommons-configuration-java
+Title: API Javadoc for commons-configuration
+Author: commons-configuration developers
+Abstract: This is the API Javadoc provided by the commons-configuration library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcommons-configuration-java/api/index.html
+Files: /usr/share/doc/libcommons-configuration-java/api/*

Added: trunk/commons-configuration/debian/libcommons-configuration-java.poms
===================================================================
--- trunk/commons-configuration/debian/libcommons-configuration-java.poms	                        (rev 0)
+++ trunk/commons-configuration/debian/libcommons-configuration-java.poms	2009-07-02 09:44:13 UTC (rev 8754)
@@ -0,0 +1 @@
+pom.xml --no-parent

Added: trunk/commons-configuration/debian/maven.rules
===================================================================
--- trunk/commons-configuration/debian/maven.rules	                        (rev 0)
+++ trunk/commons-configuration/debian/maven.rules	2009-07-02 09:44:13 UTC (rev 8754)
@@ -0,0 +1,8 @@
+junit junit jar s/3\..*/3.x/
+commons-collections commons-collections jar s/2\..*/2.x/
+commons-collections commons-collections jar s/3\..*/3.x/
+s/ant/org.apache.ant/ * * s/.*/debian/
+log4j log4j jar s/1\.2\..*/1.2.x/
+# force using servlet 2.5
+javax.servlet * * s/.*/2.5/
+

Modified: trunk/commons-configuration/debian/rules
===================================================================
--- trunk/commons-configuration/debian/rules	2009-07-02 09:42:18 UTC (rev 8753)
+++ trunk/commons-configuration/debian/rules	2009-07-02 09:44:13 UTC (rev 8754)
@@ -1,18 +1,30 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+PACKAGE			   := $(DEB_SOURCE_PACKAGE)
+VERSION			   := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME          := /usr/lib/jvm/default-java
 DEB_JARS  := ant-nodeps commons-beanutils commons-codec commons-collections3 \
              commons-digester commons-jxpath commons-lang commons-logging    \
 	     servlet-api
-PACKAGE   := commons-configuration-$(DEB_UPSTREAM_VERSION)
+DEB_ANT_BUILD_TARGET := jar javadoc
+DEB_ANT_BUILDFILE    := build.xml
+DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -DartifactId=$(PACKAGE) -Dversion=$(VERSION)
+API_DOCS             := dist/docs/api
 
-install/libcommons-configuration-java::
-	dh_link /usr/share/java/$(PACKAGE).jar \
-	  /usr/share/java/commons-configuration.jar
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar
 
+binary-post-install/lib$(PACKAGE)-java-doc::
+	dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
+
+clean::
+	-rm -rf debian/tmp
+
 get-orig-source:
-	-uscan --upstream-version 0 --rename
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+


Property changes on: trunk/commons-configuration/debian/rules
___________________________________________________________________
Modified: svn:executable
   - 
   + *