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

Emmanuel Bourg ebourg-guest at alioth.debian.org
Tue May 14 07:53:04 UTC 2013 

Author: ebourg-guest
Date: 2013-05-14 07:53:04 +0000 (Tue, 14 May 2013)
New Revision: 16630

Modified:
   trunk/jsch/debian/changelog
   trunk/jsch/debian/control
   trunk/jsch/debian/copyright
   trunk/jsch/debian/docs
   trunk/jsch/debian/manifest.mf
   trunk/jsch/debian/patches/jsch-build-xml.patch
   trunk/jsch/debian/pom.xml
   trunk/jsch/debian/rules
Log:
New upstream release (Closes: #659599)
- Updated the OSGi metadata
- Updated the pom.xml file
- Refreshed the patch
Bumped Standards-Version to 3.9.4 - no changes required.
Removed Michael Koch from the Uploaders list (Closes: #654038)
debian/copyright: Changed to comply with the Copyright Format 1.0
debian/rules: Fixed the URL used to fetch the pom.xml file
debian/rules: Call mh_clean in the clean target to rebuilt properly
Added the Javadoc to the documentation package
Added "Recommends: default-jdk-doc" to libjsch-java-doc
Removed the duplicate upstream changelog in libjsch-java-doc


Modified: trunk/jsch/debian/changelog
===================================================================
--- trunk/jsch/debian/changelog	2013-05-14 07:43:55 UTC (rev 16629)
+++ trunk/jsch/debian/changelog	2013-05-14 07:53:04 UTC (rev 16630)
@@ -1,3 +1,20 @@
+jsch (0.1.50-1) unstable; urgency=low
+
+  * New upstream release (Closes: #659599)
+    - Updated the OSGi metadata
+    - Updated the pom.xml file
+    - Refreshed the patch
+  * Bumped Standards-Version to 3.9.4 - no changes required.
+  * Removed Michael Koch from the Uploaders list (Closes: #654038)
+  * debian/copyright: Changed to comply with the Copyright Format 1.0
+  * debian/rules: Fixed the URL used to fetch the pom.xml file
+  * debian/rules: Call mh_clean in the clean target to rebuilt properly
+  * Added the Javadoc to the documentation package
+  * Added "Recommends: default-jdk-doc" to libjsch-java-doc
+  * Removed the duplicate upstream changelog in libjsch-java-doc
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 14 May 2013 09:50:42 +0200
+
 jsch (0.1.42-2) unstable; urgency=low
 
   * Made the OSGi-metadata export a versioned package. (LP: #566025)

Modified: trunk/jsch/debian/control
===================================================================
--- trunk/jsch/debian/control	2013-05-14 07:43:55 UTC (rev 16629)
+++ trunk/jsch/debian/control	2013-05-14 07:53:04 UTC (rev 16630)
@@ -2,20 +2,20 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>,
+Uploaders: Emmanuel Bourg <ebourg at apache.org>,
  Ludovic Claude <ludovic.claude at laposte.net>,
  Niels Thykier <niels at thykier.net>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk
-Build-Depends-Indep: maven-repo-helper, ant (>= 1.6.5)
-Standards-Version: 3.8.4
+Build-Depends-Indep: maven-repo-helper, ant (>= 1.6.5), libjzlib-java
+Standards-Version: 3.9.4
 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
-Depends: ${misc:Depends}
-Description: pure Java implementation of the SSH2 protocol
+Depends: ${misc:Depends}, libjzlib-java
+Description: 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.
 
@@ -23,7 +23,8 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Description: pure Java implementation of the SSH2 protocol - documentation
+Recommends: default-jdk-doc
+Description: Java implementation of the SSH2 protocol - documentation
  JSch allows your programs to connect to an SSH server. It supports
  port forwarding, X11 forwarding, file transfer and more.
  .

Modified: trunk/jsch/debian/copyright
===================================================================
--- trunk/jsch/debian/copyright	2013-05-14 07:43:55 UTC (rev 16629)
+++ trunk/jsch/debian/copyright	2013-05-14 07:53:04 UTC (rev 16630)
@@ -1,34 +1,31 @@
-This package was debianized by Jerry Haltom <wasabi at larvalstage.net> on
-Thu, 13 Jan 2005 16:13:08 -0600.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: JSch - Java Secure Channel
+Upstream-Contact: Atsuhiko Yamanaka <ymnk at jcraft.com>
+Source: http://www.jcraft.com/jsch/
 
-It was downloaded from http://sourceforge.net/projects/jsch
-
-License:
-
-------------------------------------------------------------------------------
-Copyright (c) 2002,2003,2004,2005,2006,2007,2008,2009 Atsuhiko Yamanaka, JCraft,Inc. 
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Files: *
+Copyright: 2002-2012, Atsuhiko Yamanaka, JCraft,Inc
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+   1. Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+ .
+   2. Redistributions in binary form must reproduce the above copyright 
+      notice, this list of conditions and the following disclaimer in 
+      the documentation and/or other materials provided with the distribution.
+ .
+   3. The names of the authors may not be used to endorse or promote products
+      derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+ INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: trunk/jsch/debian/docs
===================================================================
--- trunk/jsch/debian/docs	2013-05-14 07:43:55 UTC (rev 16629)
+++ trunk/jsch/debian/docs	2013-05-14 07:53:04 UTC (rev 16630)
@@ -1,2 +1,2 @@
 README
-ChangeLog
+javadoc

Modified: trunk/jsch/debian/manifest.mf
===================================================================
--- trunk/jsch/debian/manifest.mf	2013-05-14 07:43:55 UTC (rev 16629)
+++ trunk/jsch/debian/manifest.mf	2013-05-14 07:53:04 UTC (rev 16630)
@@ -1,9 +1,14 @@
 Bundle-ManifestVersion: 2
-Bundle-Version: 0.1.42
-Export-Package: com.jcraft.jsch;version="0.1.42", com.jcraft.jsch.jce;x-internal:=true;version="0.1.42", com.jcraft.jsch.jcraft;x-internal:=true;version="0.1.42"
+Bundle-Version: 0.1.50
 Bundle-SymbolicName: com.jcraft.jsch
-Bundle-Name: %bundleName
-Bundle-Localization: plugin
-Bundle-Vendor: %venderName
-Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-Name: Jsch
+Export-Package: com.jcraft.jsch.jgss;uses:="com.jcraft.jsch,org.ietf.jgs
+ s";version="0.1.50",com.jcraft.jsch.jcraft;uses:="com.jcraft.jsch,com.j
+ craft.jzlib";version="0.1.50",com.jcraft.jsch;uses:="signature,keypairg
+ en,userauth";version="0.1.50",com.jcraft.jsch.jce;uses:="javax.crypto.s
+ pec,com.jcraft.jsch,javax.crypto,javax.crypto.interfaces";version="0.1.
+ 50"
+Import-Package: com.jcraft.jzlib;resolution:=optional;version="[1.1,2)",
+ javax.crypto,javax.crypto.interfaces,javax.crypto.spec,keypairgen;resol
+ ution:=optional,org.ietf.jgss;resolution:=optional,signature;resolution
+ :=optional,userauth;resolution:=optional

Modified: trunk/jsch/debian/patches/jsch-build-xml.patch
===================================================================
--- trunk/jsch/debian/patches/jsch-build-xml.patch	2013-05-14 07:43:55 UTC (rev 16629)
+++ trunk/jsch/debian/patches/jsch-build-xml.patch	2013-05-14 07:53:04 UTC (rev 16630)
@@ -1,15 +1,21 @@
-Description: Removes date-stamp from the name of the resulting jar file
- and makes it use the manifest with OSGi-metadata.
-
-diff -Nur jsch-0.1.37/build.xml jsch-0.1.37.new/build.xml
---- a/build.xml	2008-01-08 19:57:25.000000000 +0100
-+++ b/build.xml	2008-03-21 11:38:58.000000000 +0100
-@@ -42,7 +42,7 @@
+Description: Add OSGi metadata to the generated jar
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -49,7 +49,7 @@
      <mkdir dir="${dist}/lib"/>
  
-     <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
--    <jar jarfile="${dist}/lib/jsch-${DSTAMP}.jar" basedir="${build}"/>
-+    <jar jarfile="${dist}/lib/jsch.jar" basedir="${build}" manifest="debian/manifest.mf" />
+     <!-- Put everything in ${build} into the MyProject-${version}.jar file -->
+-    <jar jarfile="${dist}/lib/jsch-${version}.jar" basedir="${build}">
++    <jar jarfile="${dist}/lib/jsch-${version}.jar" basedir="${build}" manifest="debian/manifest.mf">
+       <!--
+       <manifest>
+         <attribute name="Bundle-ClassPath" value="."/>
+@@ -92,6 +92,7 @@
+ 		destdir="${javadoc}"
+ 	>
+ 		<packageset dir="${src}"/>
++		<classpath refid="lib.path.ref"/>
+ 	</javadoc>
    </target>
- 
-   <target name="examples"
+ </project>

Modified: trunk/jsch/debian/pom.xml
===================================================================
--- trunk/jsch/debian/pom.xml	2013-05-14 07:43:55 UTC (rev 16629)
+++ trunk/jsch/debian/pom.xml	2013-05-14 07:53:04 UTC (rev 16630)
@@ -1,31 +1,44 @@
-<?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">
-
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.jcraft</groupId>
   <artifactId>jsch</artifactId>
-  <version>0.1.42</version>
+  <packaging>jar</packaging>
+  <version>0.1.50</version>
   <name>JSch</name>
-
+  <url>http://www.jcraft.com/jsch/</url>
   <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>
+    <name>JCraft,Inc.</name>
+    <url>http://www.jcraft.com/</url>
   </organization>
-
+  <scm>
+    <connection>scm:git:http://git.jcraft.com/jsch.git</connection>
+    <developerConnection>scm:git:http://git.jcraft.com/jsch.git</developerConnection>
+    <url>http://git.jcraft.com/jsch.git</url>
+  </scm>
+  <developers>
+    <developer>
+    <id>ymnk</id>
+    <name>Atsuhiko Yamanaka</name>
+    <email>ymnk at jcraft D0t com</email>
+    <url>http://github.com/ymnk</url>
+    <organization>JCraft,Inc.</organization>
+    <organizationUrl>http://www.jcraft.com/</organizationUrl>
+    <roles>
+      <role>architect</role>
+      <role>developer</role>
+    </roles>
+    <timezone>+9</timezone>
+    </developer>
+  </developers>
   <licenses>
     <license>
-      <name>BSD</name>
+      <name>Revised BSD</name>
       <url>http://www.jcraft.com/jsch/LICENSE.txt</url>
     </license>
   </licenses>
-
   <dependencies>
-
     <dependency>
       <groupId>com.jcraft</groupId>
       <artifactId>jzlib</artifactId>
@@ -34,4 +47,65 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>sign-artifacts</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+         <artifactId>wagon-ssh-external</artifactId>
+         <version>1.0-alpha-5</version>
+      </extension>
+    </extensions>
+  </build>
+
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>6</version>
+  </parent>
 </project>

Modified: trunk/jsch/debian/rules
===================================================================
--- trunk/jsch/debian/rules	2013-05-14 07:43:55 UTC (rev 16629)
+++ trunk/jsch/debian/rules	2013-05-14 07:53:04 UTC (rev 16630)
@@ -7,18 +7,23 @@
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
 ANT_OPTS             := -Dant.build.javac.source=1.4
+DEB_JARS             := jzlib
+DEB_ANT_BUILD_TARGET := dist javadoc
 
 binary-post-install/lib$(PACKAGE)-java::
 	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l debian/pom.xml dist/lib/jsch.jar
+	mh_installjar -plib$(PACKAGE)-java -l debian/pom.xml dist/lib/jsch-$(DEB_UPSTREAM_VERSION).jar
 
 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::
+	mh_clean
+
 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
+	wget -O debian/pom.xml http://repo1.maven.org/maven2/com/jcraft/jsch/$(VERSION)/jsch-$(VERSION).pom

More information about the pkg-java-commits mailing list