diff -u libcommons-cli-java-1.1/debian/changelog libcommons-cli-java-1.1/debian/changelog
--- libcommons-cli-java-1.1/debian/changelog
+++ libcommons-cli-java-1.1/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 <twerner@debian.org>  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 -u libcommons-cli-java-1.1/debian/rules libcommons-cli-java-1.1/debian/rules
--- libcommons-cli-java-1.1/debian/rules
+++ libcommons-cli-java-1.1/debian/rules
@@ -15,2 +15,2 @@
-	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
diff -u libcommons-cli-java-1.1/debian/control libcommons-cli-java-1.1/debian/control
--- libcommons-cli-java-1.1/debian/control
+++ libcommons-cli-java-1.1/debian/control
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk@debian.org>, Michael Koch <konqueror@gmx.de>, Paul Cager <paul-debian@home.paulcager.org>
 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
only in patch2:
unchanged:
--- libcommons-cli-java-1.1.orig/debian/pom.xml
+++ libcommons-cli-java-1.1/debian/pom.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>commons-cli</groupId>
+  <artifactId>commons-cli</artifactId>
+  <name>CLI</name>
+  <version>1.1</version>
+  <description>Commons CLI provides a simple API for presenting, processing and
+    validating a command line interface.</description>
+  <url>http://jakarta.apache.org/commons/cli/</url>
+  <issueManagement>
+    <url>http://issues.apache.org/jira/</url>
+  </issueManagement>
+  <ciManagement>
+    <notifiers>
+      <notifier>
+        <configuration>
+          <address>commons-dev@jakarta.apache.org</address>
+        </configuration>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+  <inceptionYear>2002</inceptionYear>
+  <mailingLists>
+    <mailingList>
+      <name>Commons Dev List</name>
+      <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
+      <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Commons User List</name>
+      <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
+      <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
+    </mailingList>
+  </mailingLists>
+  <developers>
+    <developer>
+      <id>jstrachan</id>
+      <name>James Strachan</name>
+      <email>jstrachan@apache.org</email>
+      <organization>SpiritSoft, Inc.</organization>
+    </developer>
+    <developer>
+      <id>bob</id>
+      <name>Bob McWhirter</name>
+      <email>bob@werken.com</email>
+      <organization>Werken</organization>
+      <roles>
+        <role>contributed ideas and code from werken.opt</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>jkeyes</id>
+      <name>John Keyes</name>
+      <email>jbjk@mac.com</email>
+      <organization>integral Source</organization>
+      <roles>
+        <role>contributed ideas and code from Optz</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>roxspring</id>
+      <name>Rob Oxspring</name>
+      <email>roxspring@imapmail.org</email>
+      <organization>Indigo Stone</organization>
+      <roles>
+        <role>designed CLI2</role>
+      </roles>
+    </developer>
+  </developers>
+  <contributors>
+    <contributor>
+      <name>Peter Donald</name>
+      <roles>
+        <role>contributed ideas and code from Avalon Excalibur's cli package</role>
+      </roles>
+    </contributor>
+    <contributor>
+      <name>Brian Egge</name>
+      <roles>
+        <role>made the 1.1 release happen</role>
+      </roles>
+    </contributor>
+    <contributor>
+      <name>Berin Loritsch</name>
+      <email>bloritsch@apache.org</email>
+      <roles>
+        <role>helped in the Avalon CLI merge</role>
+      </roles>
+    </contributor>
+    <contributor>
+      <name>Peter Maddocks</name>
+      <email>peter_maddocks@hp.com</email>
+      <organization>Hewlett-Packard</organization>
+      <roles>
+        <role>supplied patch</role>
+      </roles>
+    </contributor>
+    <contributor>
+      <name>Andrew Shirley</name>
+      <roles>
+        <role>lots of fixes for 1.1 and 2.0</role>
+      </roles>
+    </contributor>
+  </contributors>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>/LICENSE.txt</url>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk</connection>
+    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk</url>
+  </scm>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org</url>
+  </organization>
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
+    <resources>
+      <resource>
+        <targetPath>META-INF</targetPath>
+        <directory>${basedir}</directory>
+        <includes>
+          <include>NOTICE.txt</include>
+        </includes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/*Test.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <repository>
+      <id>default</id>
+      <name>Default Repository</name>
+      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/cli/</url>
+    </repository>
+    <site>
+      <id>default</id>
+      <name>Default Site</name>
+      <url>scp://people.apache.org//www/jakarta.apache.org/commons/cli/</url>
+    </site>
+    <status>converted</status>
+  </distributionManagement>
+</project>
\ No newline at end of file
only in patch2:
unchanged:
--- libcommons-cli-java-1.1.orig/debian/libcommons-cli-java.poms
+++ libcommons-cli-java-1.1/debian/libcommons-cli-java.poms
@@ -0,0 +1 @@
+debian/pom.xml --no-parent
only in patch2:
unchanged:
--- libcommons-cli-java-1.1.orig/debian/maven.rules
+++ libcommons-cli-java-1.1/debian/maven.rules
@@ -0,0 +1 @@
+junit junit jar s/3\..*/3.x/