[pkg-java] r6779 - trunk/jsch/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 15:31:48 +0000 (Wed, 30 Jul 2008)
New Revision: 6779

Modified:
   trunk/jsch/debian/changelog
   trunk/jsch/debian/control
   trunk/jsch/debian/rules
Log:
* (Build-)depend on default-jre/-jdk.


Modified: trunk/jsch/debian/changelog
===================================================================
--- trunk/jsch/debian/changelog	2008-07-30 15:26:32 UTC (rev 6778)
+++ trunk/jsch/debian/changelog	2008-07-30 15:31:48 UTC (rev 6779)
@@ -1,9 +1,13 @@
 jsch (0.1.37-4) UNRELEASED; urgency=low
 
+  [Michael Koch]
   * Revised package descriptions. Thanks to Marcus Better. Closes: #475162.
 
- -- Michael Koch <konqueror at gmx.de>  Wed, 09 Apr 2008 21:04:04 +0200
+  [Matthias Klose]
+  * (Build-)depend on default-jre/-jdk.
 
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 15:26:51 +0000
+
 jsch (0.1.37-3) unstable; urgency=low
 
   * Add OSGi manifest patch. Thanks to Roberto Jimenoca. Closes: #471209.

Modified: trunk/jsch/debian/control
===================================================================
--- trunk/jsch/debian/control	2008-07-30 15:26:32 UTC (rev 6778)
+++ trunk/jsch/debian/control	2008-07-30 15:31:48 UTC (rev 6779)
@@ -4,7 +4,7 @@
 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: java-gcj-compat-dev, ant (>= 1.6.5)
+Build-Depends-Indep: default-jdk, ant (>= 1.6.5)
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jsch
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jsch
@@ -13,7 +13,7 @@
 Package: libjsch-java
 Architecture: all
 Section: libs
-Depends: java-gcj-compat | java-virtual-machine
+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.

Modified: trunk/jsch/debian/rules
===================================================================
--- trunk/jsch/debian/rules	2008-07-30 15:26:32 UTC (rev 6778)
+++ trunk/jsch/debian/rules	2008-07-30 15:31:48 UTC (rev 6779)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME=/usr/lib/jvm/java-gcj
+JAVA_HOME=/usr/lib/jvm/default-java
 
 binary-post-install/libjsch-java::
 	install -m 644 -D dist/lib/jsch-*.jar debian/libjsch-java/usr/share/java/jsch-$(DEB_UPSTREAM_VERSION).jar