diff -Nru libcommons-cli-java-1.3.1/debian/build.properties libcommons-cli-java-1.3.1/debian/build.properties
--- libcommons-cli-java-1.3.1/debian/build.properties	2015-07-10 04:27:45.000000000 +0000
+++ libcommons-cli-java-1.3.1/debian/build.properties	2015-09-04 11:54:22.000000000 +0000
@@ -1,7 +1,5 @@
 javadoc.dir=target/api
-build.sourceDirectory=src/java
-build.testDirectory=src/test
 build.directory=target
-maven.test.skip=true
+#maven.test.skip=true
 ant.build.javac.target=1.4
 ant.build.javac.source=1.4
diff -Nru libcommons-cli-java-1.3.1/debian/changelog libcommons-cli-java-1.3.1/debian/changelog
--- libcommons-cli-java-1.3.1/debian/changelog	2015-07-10 04:27:45.000000000 +0000
+++ libcommons-cli-java-1.3.1/debian/changelog	2015-09-04 11:57:21.000000000 +0000
@@ -1,3 +1,11 @@
+libcommons-cli-java (1.3.1-2ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - d/p/*: Dropped, no longer required.
+    - d/*: Switch to using maven-ant-helper for package build.
+
+ -- James Page <james.page@ubuntu.com>  Fri, 04 Sep 2015 12:57:15 +0100
+
 libcommons-cli-java (1.3.1-2) unstable; urgency=medium
 
   * Team upload.
@@ -23,6 +31,22 @@
 
  -- tony mancill <tmancill@debian.org>  Mon, 22 Jun 2015 05:40:07 +0000
 
+libcommons-cli-java (1.2-3ubuntu1) quantal; urgency=low
+
+  * d/patches/CLI-193.patch: Cherry picked patch from upstream VCS
+    to ensure that wrap width is never exceeded when printing help
+    messages which can result in exceptions (LP: #944546).
+  * d/build.properties: Fix test source directory location and enable
+    test suite execution during build process.
+
+ -- James Page <james.page@ubuntu.com>  Tue, 19 Jun 2012 15:00:56 +0100
+
+libcommons-cli-java (1.2-3build1) quantal; urgency=low
+
+  * No-change rebuild with openjdk-7 as default-jdk.
+
+ -- James Page <james.page@ubuntu.com>  Fri, 18 May 2012 11:41:30 +0100
+
 libcommons-cli-java (1.2-3) unstable; urgency=low
 
   * Team upload.
diff -Nru libcommons-cli-java-1.3.1/debian/control libcommons-cli-java-1.3.1/debian/control
--- libcommons-cli-java-1.3.1/debian/control	2015-07-10 04:27:45.000000000 +0000
+++ libcommons-cli-java-1.3.1/debian/control	2015-09-04 11:39:52.000000000 +0000
@@ -1,7 +1,8 @@
 Source: libcommons-cli-java
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude@laposte.net>,
  tony mancill <tmancill@debian.org>
 Build-Depends: debhelper (>= 9),
@@ -9,10 +10,7 @@
  default-jdk,
  ant,
  ant-optional,
- libmaven-antrun-plugin-java,
- maven-debian-helper,
- maven-repo-helper,
- libmaven-assembly-plugin-java,
+ maven-ant-helper, maven-repo-helper,
  libcommons-lang-java (>= 2.0),
  junit4
 Standards-Version: 3.9.6
diff -Nru libcommons-cli-java-1.3.1/debian/rules libcommons-cli-java-1.3.1/debian/rules
--- libcommons-cli-java-1.3.1/debian/rules	2015-07-10 04:27:45.000000000 +0000
+++ libcommons-cli-java-1.3.1/debian/rules	2015-09-04 11:46:07.000000000 +0000
@@ -3,11 +3,15 @@
 export DH_VERBOSE=1
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+include /usr/share/cdbs/1/class/ant.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := ant-nodeps junit4 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)
 
 binary-post-install/$(PACKAGE)::
 	mh_installpoms -p$(PACKAGE)