[jline2] 02/02: Use javahelper to install the manifest

Eugenio Cano-Manuel zero123-guest at alioth.debian.org
Thu Aug 29 12:14:27 UTC 2013


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

zero123-guest pushed a commit to branch master
in repository jline2.

commit f5b91a7f8a464f683bee1788e7b8939d5f5e77dd
Author: Eugenio Cano-Manuel <eugeniocanom at gmail.com>
Date:   Thu Aug 29 13:44:23 2013 +0200

    Use javahelper to install the manifest
---
 debian/libjline2-java.manifest |   27 +++++++++++----------------
 debian/maven.ignoreRules       |    1 +
 debian/rules                   |    4 +---
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/debian/libjline2-java.manifest b/debian/libjline2-java.manifest
index a95545a..dc414b8 100644
--- a/debian/libjline2-java.manifest
+++ b/debian/libjline2-java.manifest
@@ -1,17 +1,12 @@
-Manifest-Version: 1.0
-Export-Package: jline;uses:="org.fusesource.jansi";version="2.11.0",jl
- ine.console;uses:="org.fusesource.jansi,jline.console.history,jline,j
- line.console.completer";version="2.11.0",jline.console.completer;uses
- :="jline.console";version="2.11.0",jline.console.history;version="2.1
- 1.0",org.fusesource.jansi;version="1.11"
-Bundle-Name: JLine
-DynamicImport-Package: *
-Bundle-Version: 2.11.0
-Bnd-LastModified: 1376876490387
-Bundle-ManifestVersion: 2
-Bundle-Description: Sonatype helps open source projects to set up Mave
- n repositories on https://oss.sonatype.org/
-Bundle-License: http://www.opensource.org/licenses/bsd-license.php
-Import-Package: javax.swing;resolution:=optional
-Bundle-SymbolicName: jline
+usr/share/java/jline.jar:
+    Manifest-Version: 1.0
+    Export-Package: jline;uses:="org.fusesource.jansi";version="2.11.0",jline.console;uses:="org.fusesource.jansi,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",org.fusesource.jansi;version="1.11"
+    Bundle-Name: JLine
+    DynamicImport-Package: *
+    Bundle-Version: 2.11.0
+    Bnd-LastModified: 1376876490387
+    Bundle-ManifestVersion: 2
+    Bundle-Description: Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/Bundle-License: http://www.opensource.org/licenses/bsd-license.php
+    Import-Package: javax.swing;resolution:=optional
+    Bundle-SymbolicName: jline
 
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 7d5d134..91720b5 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -3,6 +3,7 @@ com.github.stephenc.wagon wagon-gitsite * * * *
 com.mycila.maven-license-plugin maven-license-plugin * * * *
 junit junit * * * *
 org.apache.felix maven-bundle-plugin * * * *
+org.apache.maven.plugins maven-jar-plugin * * * *
 org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.apache.maven.plugins maven-jxr-plugin * * * *
 org.apache.maven.plugins maven-pmd-plugin * * * *
diff --git a/debian/rules b/debian/rules
index 3863316..5f485a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,9 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
+include /usr/share/cdbs/1/class/javahelper.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
-configure/libjline2-java::
-	mkdir -p target/classes/META-INF; cp debian/libjline2-java.manifest target/classes/META-INF/MANIFEST.MF

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



More information about the pkg-java-commits mailing list