[jline2] 01/03: Imported Debian patch 2.11-2

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository jline2.

commit a26281f1877652945c025a86b13310d33b6bebbf
Author: Eugenio Cano-Manuel Mendoza <eugeniocanom at gmail.com>
Date:   Thu Nov 28 18:17:06 2013 +0100

    Imported Debian patch 2.11-2
---
 debian/changelog               | 7 +++++++
 debian/libjline2-java.manifest | 2 +-
 debian/libjline2-java.poms     | 2 +-
 debian/maven.publishedRules    | 2 +-
 debian/maven.rules             | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc28901..19e69f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jline2 (2.11-2) UNRELEASED; urgency=low
+
+  * Change version from debian to 2.*.
+  * Rename versionless jar to jline2.jar. (Closes: #723956)
+
+ -- Eugenio Cano-Manuel Mendoza <eugeniocanom at gmail.com>  Thu, 28 Nov 2013 18:17:06 +0100
+
 jline2 (2.11-1) unstable; urgency=low
 
   * Initial release. (Closes: #720463)
diff --git a/debian/libjline2-java.manifest b/debian/libjline2-java.manifest
index 6147194..f01366d 100644
--- a/debian/libjline2-java.manifest
+++ b/debian/libjline2-java.manifest
@@ -1,4 +1,4 @@
-usr/share/java/jline.jar:
+usr/share/java/jline2.jar:
     Manifest-Version: 1.0
     Class-Path: /usr/share/java/jansi.jar
     Export-Package: jline.console;uses:="jline.console.history,jline,jline.console.completer";version="2.11.0",jline.console.completer;uses:="jline.console";version="2.11.0",jline.console.history;version="2.11.0"
diff --git a/debian/libjline2-java.poms b/debian/libjline2-java.poms
index 5ad70f2..e4ad511 100644
--- a/debian/libjline2-java.poms
+++ b/debian/libjline2-java.poms
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --no-parent --has-package-version
+pom.xml --no-parent --usj-name=jline2
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index de2eead..395e958 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -1,2 +1,2 @@
 
-jline jline jar s/.*/debian/ * *
+jline jline jar s/2\..*/2.*/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index b667cda..b975783 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,5 @@
 
-jline jline jar s/.*/debian/ * *
+jline jline jar s/2\..*/2.x/ * *
 junit junit jar s/4\..*/4.x/ * *
 org.apache.maven.scm maven-scm-manager-plexus jar s/.*/debian/ * *
 org.apache.maven.scm maven-scm-provider-gitexe jar s/.*/debian/ * *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jline2.git