diff -u jline-0.9.94/debian/control jline-0.9.94/debian/control
--- jline-0.9.94/debian/control
+++ jline-0.9.94/debian/control
@@ -1,19 +1,19 @@
 Source: jline
-Section: libs
+Section: java
 Priority: optional
-Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Peter Eisentraut <petere@debian.org>, Varun Hiremath <varun@debian.org>, Kumar Appaiah <akumar@ee.iitm.ac.in>
-Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, junit, default-jdk
-Standards-Version: 3.7.3
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: Varun Hiremath <varun@debian.org>, Kumar Appaiah <akumar@ee.iitm.ac.in>,
+ Torsten Werner <twerner@debian.org>
+Build-Depends: cdbs, debhelper (>= 5), default-jdk, ant
+Build-Depends-Indep: maven-repo-helper, junit, openjdk-6-doc
+Standards-Version: 3.8.2
 Homepage: http://jline.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jline
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jline
 
 Package: libjline-java
 Architecture: all
-Depends: default-jre-headless | java2-runtime-headless | java1-runtime-headless
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless | java1-runtime-headless
 Suggests: libjline-java-doc
 Description: Java library for handling console input
  JLine is a 100% pure Java library for reading and editing console input.
@@ -24,6 +24,7 @@
 Package: libjline-java-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}, openjdk-6-doc | classpath-doc
 Suggests: libjline-java
 Description: Java library for handling console input - documentation
  JLine is a 100% pure Java library for reading and editing console input.
diff -u jline-0.9.94/debian/libjline-java-doc.install jline-0.9.94/debian/libjline-java-doc.install
--- jline-0.9.94/debian/libjline-java-doc.install
+++ jline-0.9.94/debian/libjline-java-doc.install
@@ -1,2 +1,2 @@
-api/* usr/share/doc/libjline-java-doc/api
+api/* usr/share/doc/libjline-java/api
 
diff -u jline-0.9.94/debian/libjline-java-doc.doc-base jline-0.9.94/debian/libjline-java-doc.doc-base
--- jline-0.9.94/debian/libjline-java-doc.doc-base
+++ jline-0.9.94/debian/libjline-java-doc.doc-base
@@ -8,5 +8,5 @@
-Section: Apps/Text
+Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libjline-java-doc/api/index.html
-Files: /usr/share/doc/libjline-java-doc/api/*.html
+Index: /usr/share/doc/libjline-java/api/index.html
+Files: /usr/share/doc/libjline-java/api/*.html
diff -u jline-0.9.94/debian/changelog jline-0.9.94/debian/changelog
--- jline-0.9.94/debian/changelog
+++ jline-0.9.94/debian/changelog
@@ -1,9 +1,39 @@
-jline (0.9.94-1ubuntu1) intrepid; urgency=low
+jline (0.9.94-5~ubuntu1) karmic; urgency=low
 
+  * Merge to add Maven POM to the package. LP: #461090.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 26 Oct 2009 14:58:48 +0100
+
+jline (0.9.94-5) unstable; urgency=low
+
+  * Add myself to Uploaders.
+  * Add missing file debian/libjline-java.poms.
+
+ -- Torsten Werner <twerner@debian.org>  Fri, 14 Aug 2009 18:03:22 +0200
+
+jline (0.9.94-4) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Torsten Werner <twerner@debian.org>  Sun, 09 Aug 2009 11:38:11 +0200
+
+jline (0.9.94-3) experimental; urgency=low
+
+  [Ludovic Claude]
+  * Bump Standards-Version to 3.8.2
+  * Add the Maven POM to the package
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Add ${misc:Depends} to Depends to clear Lintian warnings
+  * Change doc-base section from Apps/Text to Programming
+  * Move API documentation to /usr/share/doc/libjline-java/api/
+
+  [Peter Eisentraut]
+  * Removed myself from Uploaders
+
+  [Matthias Klose]
   * (Build-)depend on default-jre/-jdk.
-  * Set Ubuntu maintainer address.
 
- -- Matthias Klose <doko@ubuntu.com>  Thu, 31 Jul 2008 07:55:15 +0000
+ -- Ludovic Claude <ludovic.claude@laposte.net>  Tue, 21 Jul 2009 23:00:09 +0100
 
 jline (0.9.94-1) unstable; urgency=low
 
diff -u jline-0.9.94/debian/rules jline-0.9.94/debian/rules
--- jline-0.9.94/debian/rules
+++ jline-0.9.94/debian/rules
@@ -6,14 +6,22 @@
-JAVA_HOME 		:= /usr/lib/jvm/default-java
-DEB_JARS 		:= junit
-DEB_ANT_BUILDFILE	:= debian/build.xml
-DEB_ANT_BUILD_TARGET    := jar javadoc
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME 		     := /usr/lib/jvm/default-java
+DEB_JARS 		     := junit
+DEB_ANT_BUILDFILE	 := debian/build.xml
+DEB_ANT_BUILD_TARGET := jar javadoc
 
 DEB_INSTALL_EXAMPLES_libjline-java-doc = jline-demo.jar
 
-install/libjline-java:: DEB_FINALDIR=$(CURDIR)/debian/libjline-java
-install/libjline-java::
-	install -m 644 -D jline.jar $(DEB_FINALDIR)/usr/share/java/jline-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/jline-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jline.jar
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l debian/pom.xml jline.jar
+
+clean::
+	-rm -rf debian/tmp
 
 get-orig-source:
 	-uscan --upstream-version 0
+
+get-orig-pom:
+	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/jline/jline/$(VERSION)/jline-$(VERSION).pom
+
only in patch2:
unchanged:
--- jline-0.9.94.orig/debian/libjline-java.poms
+++ jline-0.9.94/debian/libjline-java.poms
@@ -0,0 +1 @@
+debian/pom.xml
only in patch2:
unchanged:
--- jline-0.9.94.orig/debian/pom.xml
+++ jline-0.9.94/debian/pom.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+To build, you need to have Maven 2 installed.
+
+To compile, run:
+
+    mvn compile
+
+To run tests, run:
+
+    mvn test
+
+To run one particular test, e.g. TestSomeTest, run:
+
+    mvn test -Dtest=TestSomeTest
+
+To build the jars, run:
+
+    mvn package
+
+To create and upload a release, run:
+
+    mvn deploy
+
+To build the site and upload it, run:
+
+    mvn site:deploy
+
+To perform a complete release, run:
+
+    mvn clean compile package site assembly:assembly deploy site:deploy
+
+To actually upload the artifact to sourceforge, it must be manually ftp'd:
+
+    lftp ftp://upload.sourceforge.net/incoming/ -e "put `ls target/jline-*.zip`"
+
+To make a bundle and request that ibilio upload it, do:
+
+    mvn source:jar javadoc:jar repository:bundle-create
+
+    scp target/jline-*-bundle.jar shell.sourceforge.net:/home/groups/j/jl/jline/htdocs
+
+    Make a request like at http://jira.codehaus.org/browse/MAVENUPLOAD-1003
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+    http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>jline</groupId>
+  <artifactId>jline</artifactId>
+  <packaging>jar</packaging>
+  <name>JLine</name>
+  <version>0.9.94</version>
+  <description>JLine is a java library for reading and editing user input in console applications. It features tab-completion, command history, password masking, customizable keybindings, and pass-through handlers to use to chain to other console applications.</description>
+  <url>http://jline.sourceforge.net</url>
+  <issueManagement>
+    <system>sourceforge</system>
+    <url>http://sourceforge.net/tracker/?group_id=64033&amp;atid=506056</url>
+  </issueManagement>
+  <inceptionYear>2002</inceptionYear>
+  <mailingLists>
+    <mailingList>
+      <name>JLine users</name>
+      <subscribe>https://lists.sourceforge.net/lists/listinfo/jline-users</subscribe>
+      <post>jline-users@lists.sourceforge.net</post>
+      <archive>http://sourceforge.net/mailarchive/forum.php?forum=jline-users</archive>
+    </mailingList>
+  </mailingLists>
+
+  <developers>
+    <developer>
+      <id>mprudhom</id>
+      <name>Marc Prud'hommeaux</name>
+      <email>mwp1@cornell.edu</email>
+    </developer>
+  </developers>
+  <licenses>
+    <license>
+      <name>BSD</name>
+      <url>LICENSE.txt</url>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:cvs:pserver:anonymous@jline.cvs.sourceforge.net:/cvsroot/jline:jline</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@jline.cvs.sourceforge.net:/cvsroot/jline:jline</developerConnection>
+    <url>http://jline.cvs.sourceforge.net/jline</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <!--
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jalopy-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <fileFormat>UNIX</fileFormat>
+          <convention>codestyle.xml</convention>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>format</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      -->
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <!-- <testFailureIgnore>true</testFailureIgnore> -->
+          <useFile>false</useFile>
+          <trimStackTrace>false</trimStackTrace>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.3</source>
+          <target>1.3</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <stagingDirectory>../site-staging</stagingDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assembly/assembly.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jxr-maven-plugin</artifactId>
+        <configuration>
+          <aggregate>true</aggregate>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <aggregate>true</aggregate>
+          <linksource>true</linksource>
+          <links>
+            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+          </links>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-pmd-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <!-- <report>dependencies</report> -->
+              <!-- <report>cim</report> -->
+              <!-- <report>cobertura</report> -->
+              <report>project-team</report>
+              <report>mailing-list</report>
+              <report>issue-tracking</report>
+              <report>license</report>
+              <report>scm</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>surefire-report-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+  <distributionManagement>
+    <repository>
+      <id>jline</id>
+      <url>scp://shell.sourceforge.net/home/groups/j/jl/jline/htdocs/m2repo</url>
+    </repository>
+    <snapshotRepository>
+      <id>jline</id>
+      <url>scp://shell.sourceforge.net/home/groups/j/jl/jline/htdocs/m2snapshot</url>
+    </snapshotRepository>
+    <site>
+      <id>jline</id>
+      <name>jline</name>
+      <url>scpexe://shell.sourceforge.net/home/groups/j/jl/jline/htdocs/</url>
+    </site>
+  </distributionManagement>
+</project>
only in patch2:
unchanged:
--- jline-0.9.94.orig/debian/maven.rules
+++ jline-0.9.94/debian/maven.rules
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/
+