[pkg-java] r8759 - trunk/libcommons-cli-java/debian

Thu Jul 2 11:13:48 UTC 2009

Author: ludovicc-guest
Date: 2009-07-02 11:13:47 +0000 (Thu, 02 Jul 2009)
New Revision: 8759

Added:
   trunk/libcommons-cli-java/debian/libcommons-cli-java.poms
   trunk/libcommons-cli-java/debian/maven.rules
Removed:
   trunk/libcommons-cli-java/debian/patches/
Modified:
   trunk/libcommons-cli-java/debian/ant.properties
   trunk/libcommons-cli-java/debian/changelog
   trunk/libcommons-cli-java/debian/control
   trunk/libcommons-cli-java/debian/copyright
   trunk/libcommons-cli-java/debian/rules
Log:
* New version

Modified: trunk/libcommons-cli-java/debian/ant.properties
===================================================================

--- trunk/libcommons-cli-java/debian/ant.properties	2009-07-02 10:27:30 UTC (rev 8758)
+++ trunk/libcommons-cli-java/debian/ant.properties	2009-07-02 11:13:47 UTC (rev 8759)
@@ -1,3 +1,4 @@
-#build.sysclasspath=only
-final.name=commons-cli
-noget=true
+javadoc.dir=target/api
+build.directory=target
+maven.test.skip=true
+

Modified: trunk/libcommons-cli-java/debian/changelog
===================================================================
--- trunk/libcommons-cli-java/debian/changelog	2009-07-02 10:27:30 UTC (rev 8758)
+++ trunk/libcommons-cli-java/debian/changelog	2009-07-02 11:13:47 UTC (rev 8759)
@@ -1,3 +1,24 @@
+libcommons-cli-java (1.2-1) unstable; urgency=low
+
+  * New upstream version, add myself to Uploaders
+  * Change section to java, bump up Standards-Version to 3.8.1
+  * Change the dependency on java-gcj to default-jdk for Build-Depend
+  * Add Build-Depends on maven-ant-helper and use its maven-build.xml
+    file to build the package as the build system has switched to
+    Maven.
+  * Remove the dependencies on java runtimes on the binary package
+    as it's a library (avoids introducing dependencies on graphics in
+    a headless environment)
+  * Add ${misc:Depends} to Depends to clear Lintian warnings
+  * 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
+  * Remove MultOption patch as it doesn't apply anymore and seems solved 
+    upstream.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 02 Jul 2009 11:30:49 +0100
+
 libcommons-cli-java (1.1-3.1) UNRELEASED; urgency=low
 
   * Non-maintainer upload.

Modified: trunk/libcommons-cli-java/debian/control
===================================================================
--- trunk/libcommons-cli-java/debian/control	2009-07-02 10:27:30 UTC (rev 8758)
+++ trunk/libcommons-cli-java/debian/control	2009-07-02 11:13:47 UTC (rev 8759)
@@ -1,18 +1,19 @@
 Source: libcommons-cli-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Paul Cager <paul-debian at home.paulcager.org>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8)
-Build-Depends-Indep: java-gcj-compat-dev, ant, ant-optional, libcommons-lang-java (>= 2.0), junit
-Standards-Version: 3.7.3
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Paul Cager <paul-debian at home.paulcager.org>,
+ Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8), default-jdk
+Build-Depends-Indep: maven-ant-helper, maven-repo-helper, ant, ant-optional, libcommons-lang-java (>= 2.0), junit
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-cli-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-cli-java
 Homepage: http://commons.apache.org/cli/
 
 Package: libcommons-cli-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libcommons-lang-java (>= 2.0)
+Depends: ${misc:Depends}, libcommons-lang-java (>= 2.0)
 Description: API for working with the command line arguments and options
  You define arguments you want to parse, parse arguments the user
  entered and then you can retrieve them like properties

Modified: trunk/libcommons-cli-java/debian/copyright
===================================================================
--- trunk/libcommons-cli-java/debian/copyright	2009-07-02 10:27:30 UTC (rev 8758)
+++ trunk/libcommons-cli-java/debian/copyright	2009-07-02 11:13:47 UTC (rev 8759)
@@ -14,7 +14,7 @@
                   Peter Maddocks <peter_maddocks at hp.com>,
                   Andrew Shirley
 
-Copyright: © 2002-2009 The Apache Software Foundation
+Copyright: 2002-2009 The Apache Software Foundation
 
 License: Apache-2.0
 

Added: trunk/libcommons-cli-java/debian/libcommons-cli-java.poms
===================================================================
--- trunk/libcommons-cli-java/debian/libcommons-cli-java.poms	                        (rev 0)
+++ trunk/libcommons-cli-java/debian/libcommons-cli-java.poms	2009-07-02 11:13:47 UTC (rev 8759)
@@ -0,0 +1 @@
+pom.xml --no-parent

Added: trunk/libcommons-cli-java/debian/maven.rules
===================================================================
--- trunk/libcommons-cli-java/debian/maven.rules	                        (rev 0)
+++ trunk/libcommons-cli-java/debian/maven.rules	2009-07-02 11:13:47 UTC (rev 8759)
@@ -0,0 +1 @@
+junit junit jar s/3\..*/3.x/

Modified: trunk/libcommons-cli-java/debian/rules
===================================================================
--- trunk/libcommons-cli-java/debian/rules	2009-07-02 10:27:30 UTC (rev 8758)
+++ trunk/libcommons-cli-java/debian/rules	2009-07-02 11:13:47 UTC (rev 8759)
@@ -4,13 +4,22 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
-ANT_HOME := /usr/share/ant
-DEB_JARS := junit commons-lang ant-junit
-DEB_ANT_BUILD_TARGET := jar
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := ant-nodeps junit commons-lang ant-junit
+DEB_ANT_BUILD_TARGET := package #javadoc
+DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
+DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION)
 
-install/libcommons-cli-java::
-	install -m 644 -D target/commons-cli.jar debian/libcommons-cli-java/usr/share/java/commons-cli-$(DEB_UPSTREAM_VERSION).jar
-	dh_link -plibcommons-cli-java usr/share/java/commons-cli-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-cli.jar
+binary-post-install/$(PACKAGE)::
+	mh_installpoms -p$(PACKAGE)
+	mh_installjar -p$(PACKAGE) -l pom.xml target/commons-cli-$(VERSION).jar
+
+clean::
+	-rm -rf debian/tmp
+
+get-orig-source:
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+


