[DebianGIS-dev] r1714 - packages/josm/trunk/debian

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2008-07-13 19:44:43 +0000 (Sun, 13 Jul 2008)
New Revision: 1714

Modified:
   packages/josm/trunk/debian/control
   packages/josm/trunk/debian/rules
Log:
switch to openjdk, drop support for classpath based jvm's,
which is currently only jamvm that works with josm.


Modified: packages/josm/trunk/debian/control
===================================================================
--- packages/josm/trunk/debian/control	2008-07-13 16:29:21 UTC (rev 1713)
+++ packages/josm/trunk/debian/control	2008-07-13 19:44:43 UTC (rev 1714)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Andreas Putzo <andreas at putzo.net>, Giovanni Mascellani <g.mascellani at gmail.com>, Petter Reinholdtsen <pere at debian.org>
-Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev, libgettext-commons-java, libmetadata-extractor-java
+Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), openjdk-6-jdk, libgettext-commons-java, libmetadata-extractor-java
 Standards-Version: 3.8.0
 Homepage: http://josm.openstreetmap.de
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm/
@@ -11,8 +11,8 @@
 
 Package: josm
 Architecture: all
-Depends:  jamvm | gij-4.1 | java2-runtime, libgettext-commons-java, libmetadata-extractor-java, openstreetmap-map-icons-classic
-Recommends: jamvm | gij-4.1, josm-plugins
+Depends:  openjdk-6-jre, libgettext-commons-java, libmetadata-extractor-java, openstreetmap-map-icons-classic
+Recommends: josm-plugins
 Description: Editor for OpenStreetMap
  JOSM is an editor for OpenStreetMap (OSM) written in Java.
  The current version supports stand alone GPX tracks, GPX track data

Modified: packages/josm/trunk/debian/rules
===================================================================
--- packages/josm/trunk/debian/rules	2008-07-13 16:29:21 UTC (rev 1713)
+++ packages/josm/trunk/debian/rules	2008-07-13 19:44:43 UTC (rev 1714)
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj/
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk/
 ANT_HOME  := /usr/share/ant
 DEB_ANT_BUILD_TARGET := dist