[pkg-java] r5343 - in trunk/eclipse/debian: . extra

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-01-08 22:29:26 +0000 (Tue, 08 Jan 2008)
New Revision: 5343

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/control
   trunk/eclipse/debian/control.in
   trunk/eclipse/debian/extra/java_home
Log:
* Updated debian/patches/eclipse-jsch-sftpexception.dpatch for jsch 0.1.36.
* Updated (Build-)Depends on libjsch-java (>= 0.1.36).
* Added JAVA_HOME for icedtea to debian/extra/java_home.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2008-01-08 09:06:01 UTC (rev 5342)
+++ trunk/eclipse/debian/changelog	2008-01-08 22:29:26 UTC (rev 5343)
@@ -7,6 +7,9 @@
   * Added Homepage, Vcs-Svn and Vcs-Browser fields.
   * Updated Standards-Version to 3.7.3.
   * debian/eclipse-rcp.dirs. Removed, unneeded.
+  * Updated debian/patches/eclipse-jsch-sftpexception.dpatch for jsch 0.1.36.
+  * Updated (Build-)Depends on libjsch-java (>= 0.1.36).
+  * Added JAVA_HOME for icedtea to debian/extra/java_home.
 
  -- Michael Koch <konqueror at gmx.de>  Sun, 30 Dec 2007 17:53:29 +0100
 

Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control	2008-01-08 09:06:01 UTC (rev 5342)
+++ trunk/eclipse/debian/control	2008-01-08 22:29:26 UTC (rev 5343)
@@ -3,7 +3,7 @@
 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>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), junit4, libjsch-java (>= 0.1.28), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, libxul-dev
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), junit4, libjsch-java (>= 0.1.36), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, libxul-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/eclipse
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/eclipse
@@ -56,7 +56,7 @@
 
 Package: eclipse-platform
 Architecture: any
-Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.34), libtomcat5.5-java, ${shlibs:Depends}
+Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.36), libtomcat5.5-java, ${shlibs:Depends}
 Recommends: eclipse-platform-gcj, eclipse
 Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
 Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common

Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in	2008-01-08 09:06:01 UTC (rev 5342)
+++ trunk/eclipse/debian/control.in	2008-01-08 22:29:26 UTC (rev 5343)
@@ -3,7 +3,7 @@
 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>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), junit4, libjsch-java (>= 0.1.28), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev at BUILD_DEPS@
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), junit4, libjsch-java (>= 0.1.36), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev at BUILD_DEPS@
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/eclipse
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/eclipse
@@ -56,7 +56,7 @@
 
 Package: eclipse-platform
 Architecture: any
-Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.34), @TOMCAT_DEP@, @MOZILLA_DEP@
+Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.36), @TOMCAT_DEP@, @MOZILLA_DEP@
 Recommends: eclipse-platform-gcj, eclipse
 Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
 Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common

Modified: trunk/eclipse/debian/extra/java_home
===================================================================
--- trunk/eclipse/debian/extra/java_home	2008-01-08 09:06:01 UTC (rev 5342)
+++ trunk/eclipse/debian/extra/java_home	2008-01-08 22:29:26 UTC (rev 5343)
@@ -2,6 +2,7 @@
 # compatible JAVA_HOME. This setting may be overridden on a per-user basis by
 # altering the JAVA_HOME setting in ~/.eclipse/eclipserc.
 
+/usr/lib/jvm/java-7-icedtea
 /usr/lib/jvm/java-gcj
 /usr/lib/kaffe/pthreads
 /usr/lib/jvm/java-6-sun