From b28f0f0a3a1e8f2e9a9b6e8c9e7f7955a4f8c37c Mon Sep 17 00:00:00 2001 From: Torsten Werner Date: Sun, 18 Oct 2009 20:33:44 +0200 Subject: [PATCH] Pick changes from version 1.2-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 --- debian/changelog | 10 +++ debian/control | 2 +- debian/libcommons-cli-java.poms | 1 + debian/maven.rules | 1 + debian/pom.xml | 165 +++++++++++++++++++++++++++++++++++++++ debian/rules | 4 +- 6 files changed, 180 insertions(+), 3 deletions(-) create mode 100644 debian/libcommons-cli-java.poms create mode 100644 debian/maven.rules create mode 100644 debian/pom.xml diff --git a/debian/changelog b/debian/changelog index 4f261c1..758efa7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libcommons-cli-java (1.1-3ubuntu3) karmic; urgency=low + + * Pick the following changes from version 1.2-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 + + -- Torsten Werner Sun, 18 Oct 2009 20:30:27 +0200 + libcommons-cli-java (1.1-3ubuntu2) karmic; urgency=low * debian/ant.properties: Build java2 compatible code. diff --git a/debian/control b/debian/control index 1819a9e..f140503 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Arnaud Vandyck , Michael Koch , Paul Cager Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8) -Build-Depends-Indep: default-jdk, ant, ant-optional, libcommons-lang-java (>= 2.0), junit +Build-Depends-Indep: default-jdk, ant, ant-optional, libcommons-lang-java (>= 2.0), junit, maven-repo-helper Standards-Version: 3.7.3 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 diff --git a/debian/libcommons-cli-java.poms b/debian/libcommons-cli-java.poms new file mode 100644 index 0000000..623bd24 --- /dev/null +++ b/debian/libcommons-cli-java.poms @@ -0,0 +1 @@ +debian/pom.xml --no-parent diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..8577380 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1 @@ +junit junit jar s/3\..*/3.x/ diff --git a/debian/pom.xml b/debian/pom.xml new file mode 100644 index 0000000..ef3edac --- /dev/null +++ b/debian/pom.xml @@ -0,0 +1,165 @@ + + 4.0.0 + commons-cli + commons-cli + CLI + 1.1 + Commons CLI provides a simple API for presenting, processing and + validating a command line interface. + http://jakarta.apache.org/commons/cli/ + + http://issues.apache.org/jira/ + + + + + +
commons-dev@jakarta.apache.org
+ + + + + 2002 + + + Commons Dev List + commons-dev-subscribe@jakarta.apache.org + commons-dev-unsubscribe@jakarta.apache.org + http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/ + + + Commons User List + commons-user-subscribe@jakarta.apache.org + commons-user-unsubscribe@jakarta.apache.org + http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/ + + + + + jstrachan + James Strachan + jstrachan@apache.org + SpiritSoft, Inc. + + + bob + Bob McWhirter + bob@werken.com + Werken + + contributed ideas and code from werken.opt + + + + jkeyes + John Keyes + jbjk@mac.com + integral Source + + contributed ideas and code from Optz + + + + roxspring + Rob Oxspring + roxspring@imapmail.org + Indigo Stone + + designed CLI2 + + + + + + Peter Donald + + contributed ideas and code from Avalon Excalibur's cli package + + + + Brian Egge + + made the 1.1 release happen + + + + Berin Loritsch + bloritsch@apache.org + + helped in the Avalon CLI merge + + + + Peter Maddocks + peter_maddocks@hp.com + Hewlett-Packard + + supplied patch + + + + Andrew Shirley + + lots of fixes for 1.1 and 2.0 + + + + + + The Apache Software License, Version 2.0 + /LICENSE.txt + + + + scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk + http://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk + + + Apache Software Foundation + http://www.apache.org + + + src/java + src/test + + + META-INF + ${basedir} + + NOTICE.txt + + + + + + maven-surefire-plugin + + + **/*Test.java + + + + + + + + junit + junit + 3.8.1 + test + + + + + default + Default Repository + file:///www/jakarta.apache.org/builds/jakarta-commons/cli/ + + + default + Default Site + scp://people.apache.org//www/jakarta.apache.org/commons/cli/ + + converted + + \ No newline at end of file diff --git a/debian/rules b/debian/rules index db5cc5d..3c69189 100755 --- a/debian/rules +++ b/debian/rules @@ -12,5 +12,5 @@ DEB_JARS := junit commons-lang ant-junit DEB_ANT_BUILD_TARGET := jar 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 + mh_installpoms -p$(DEB_SOURCE_PACKAGE) + mh_installjar -p$(DEB_SOURCE_PACKAGE) -l debian/pom.xml target/commons-cli.jar -- 1.6.3.3