[pkg-java] r8815 - in trunk/jsch/debian: . patches

Thu Jul 2 23:10:13 UTC 2009

Author: ludovicc-guest
Date: 2009-07-02 23:10:13 +0000 (Thu, 02 Jul 2009)
New Revision: 8815

Added:
   trunk/jsch/debian/libjsch-java.poms
   trunk/jsch/debian/pom.xml
Modified:
   trunk/jsch/debian/changelog
   trunk/jsch/debian/compat
   trunk/jsch/debian/control
   trunk/jsch/debian/patches/jsch-build-xml.patch
   trunk/jsch/debian/rules
   trunk/jsch/debian/watch
Log:
* New version

Modified: trunk/jsch/debian/changelog
===================================================================

--- trunk/jsch/debian/changelog	2009-07-02 22:49:44 UTC (rev 8814)
+++ trunk/jsch/debian/changelog	2009-07-02 23:10:13 UTC (rev 8815)
@@ -1,5 +1,14 @@
-jsch (0.1.37-4) UNRELEASED; urgency=low
+jsch (0.1.41-1) unstable; urgency=low
 
+  [Ludovic Claude]
+  * New upstream version, add myself to Uploaders
+  * Change section to java, bump up Standards-Version to 3.8.1,
+    bump up debhelper to 6
+  * 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
+
   [Michael Koch]
   * Revised package descriptions. Thanks to Marcus Better. Closes: #475162.
 
@@ -7,7 +16,7 @@
   * (Build-)depend on default-jre/-jdk.
   * Set java source version to 1.4.
 
- -- Matthias Klose <doko at debian.org>  Mon, 20 Oct 2008 13:11:57 +0000
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 06 May 2009 11:30:49 +0100
 
 jsch (0.1.37-3) unstable; urgency=low
 

Modified: trunk/jsch/debian/compat
===================================================================
--- trunk/jsch/debian/compat	2009-07-02 22:49:44 UTC (rev 8814)
+++ trunk/jsch/debian/compat	2009-07-02 23:10:13 UTC (rev 8815)
@@ -1 +1 @@
-4
+6

Modified: trunk/jsch/debian/control
===================================================================
--- trunk/jsch/debian/control	2009-07-02 22:49:44 UTC (rev 8814)
+++ trunk/jsch/debian/control	2009-07-02 23:10:13 UTC (rev 8815)
@@ -1,19 +1,19 @@
 Source: jsch
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.1.0), cdbs
-Build-Depends-Indep: default-jdk, ant (>= 1.6.5)
-Standards-Version: 3.7.3
+Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>,
+ Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: debhelper (>= 6), cdbs, default-jdk
+Build-Depends-Indep: maven-repo-helper, ant (>= 1.6.5)
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jsch
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jsch
 Homepage: http://www.jcraft.com/jsch/
 
 Package: libjsch-java
 Architecture: all
-Section: libs
-Depends: default-jre-headless | java2-runtime-headless
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
 Description: pure Java implementation of the SSH2 protocol
  JSch allows your programs to connect to an SSH server. It supports
  port forwarding, X11 forwarding, file transfer and more.
@@ -21,6 +21,7 @@
 Package: libjsch-java-doc
 Architecture: all
 Section: doc
+Depends: ${misc:Depends}
 Description: pure Java implementation of the SSH2 protocol
  JSch allows your programs to connect to an SSH server. It supports
  port forwarding, X11 forwarding, file transfer and more.

Added: trunk/jsch/debian/libjsch-java.poms
===================================================================
--- trunk/jsch/debian/libjsch-java.poms	                        (rev 0)
+++ trunk/jsch/debian/libjsch-java.poms	2009-07-02 23:10:13 UTC (rev 8815)
@@ -0,0 +1 @@
+debian/pom.xml --no-parent

Modified: trunk/jsch/debian/patches/jsch-build-xml.patch
===================================================================
--- trunk/jsch/debian/patches/jsch-build-xml.patch	2009-07-02 22:49:44 UTC (rev 8814)
+++ trunk/jsch/debian/patches/jsch-build-xml.patch	2009-07-02 23:10:13 UTC (rev 8815)
@@ -6,7 +6,7 @@
  
      <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
 -    <jar jarfile="${dist}/lib/jsch-${DSTAMP}.jar" basedir="${build}"/>
-+    <jar jarfile="${dist}/lib/jsch-${DSTAMP}.jar" basedir="${build}" manifest="debian/manifest.mf" />
++    <jar jarfile="${dist}/lib/jsch.jar" basedir="${build}" manifest="debian/manifest.mf" />
    </target>
  
    <target name="examples"

Added: trunk/jsch/debian/pom.xml
===================================================================
--- trunk/jsch/debian/pom.xml	                        (rev 0)
+++ trunk/jsch/debian/pom.xml	2009-07-02 23:10:13 UTC (rev 8815)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>com.jcraft</groupId>
+  <artifactId>jsch</artifactId>
+  <version>0.1.41</version>
+  <name>JSch</name>
+
+  <description>JSch is a pure Java implementation of SSH2</description>
+  <url>http://www.jcraft.com/jsch/</url>
+
+  <organization>
+    <name>jcraft</name>
+    <url>http://www.jcraft.com/jsch</url>
+  </organization>
+
+  <licenses>
+    <license>
+      <name>BSD</name>
+      <url>http://www.jcraft.com/jsch/LICENSE.txt</url>
+    </license>
+  </licenses>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jzlib</artifactId>
+      <version>1.0.7</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+</project>

Modified: trunk/jsch/debian/rules
===================================================================
--- trunk/jsch/debian/rules	2009-07-02 22:49:44 UTC (rev 8814)
+++ trunk/jsch/debian/rules	2009-07-02 23:10:13 UTC (rev 8815)
@@ -4,14 +4,25 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME=/usr/lib/jvm/default-java
-ANT_OPTS = -Dant.build.javac.source=1.4
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
+ANT_OPTS             := -Dant.build.javac.source=1.4
 
-binary-post-install/libjsch-java::
-	install -m 644 -D dist/lib/jsch-*.jar debian/libjsch-java/usr/share/java/jsch-$(DEB_UPSTREAM_VERSION).jar
-	dh_link -plibjsch-java /usr/share/java/jsch-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jsch.jar
-	dh_link -plibjsch-java /usr/share/java/jsch.jar /usr/share/ant/lib/jsch.jar
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l debian/pom.xml dist/lib/jsch.jar
 
-binary-post-install/libjsch-java-doc::
+binary-post-install/lib$(PACKAGE)-java-doc::
 	install -d debian/libjsch-java-doc/usr/share/doc/libjsch-java-doc/examples
 	install -m 644 examples/*.java debian/libjsch-java-doc/usr/share/doc/libjsch-java-doc/examples
+
+clean::
+	-rm -rf debian/tmp
+
+get-orig-source:
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack
+
+get-orig-pom:
+	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/com/jcraft/jsch/$(VERSION)/jsch-$(VERSION).pom
+

Modified: trunk/jsch/debian/watch
===================================================================
--- trunk/jsch/debian/watch	2009-07-02 22:49:44 UTC (rev 8814)
+++ trunk/jsch/debian/watch	2009-07-02 23:10:13 UTC (rev 8815)
@@ -1,3 +1,2 @@
 version=3
-opts=dversionmangle=s/ds\d$// \
-	http://sf.net/jsch/jsch-(.+)\.zip 
+http://sf.net/jsch/jsch-(.+)\.zip 


