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

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2007-09-10 13:07:43 +0000 (Mon, 10 Sep 2007)
New Revision: 1070

Modified:
   packages/josm/trunk/debian/control
   packages/josm/trunk/debian/rules
Log:
* Use java-6-sun until libmetadata-extractor is build with java-1.5.0.


Modified: packages/josm/trunk/debian/control
===================================================================
--- packages/josm/trunk/debian/control	2007-09-10 12:42:15 UTC (rev 1069)
+++ packages/josm/trunk/debian/control	2007-09-10 13:07:43 UTC (rev 1070)
@@ -3,12 +3,12 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Andreas Putzo <andreas at putzo.net>
-Build-Depends: cdbs, dpatch, debhelper (>= 5), sun-java5-jdk, libgettext-commons-java, libmetadata-extractor-java
+Build-Depends: cdbs, dpatch, debhelper (>= 5), sun-java6-jdk, libgettext-commons-java, libmetadata-extractor-java
 Standards-Version: 3.7.2
 
 Package: josm
 Architecture: all
-Depends: sun-java5-jre | java2-runtime, libgettext-commons-java, libmetadata-extractor-java
+Depends: sun-java6-jre | java2-runtime, libgettext-commons-java, libmetadata-extractor-java
 Recommends: josm-plugins
 Description: Editor for OpenStreetMap
  JOSM is an editor for OpenStreetMap (OSM) written in Java.

Modified: packages/josm/trunk/debian/rules
===================================================================
--- packages/josm/trunk/debian/rules	2007-09-10 12:42:15 UTC (rev 1069)
+++ packages/josm/trunk/debian/rules	2007-09-10 13:07:43 UTC (rev 1070)
@@ -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-1.5.0-sun/
+JAVA_HOME := /usr/lib/jvm/java-6-sun/
 ANT_HOME  := /usr/share/ant
 DEB_ANT_BUILD_TARGET := dist
 # Dependencies