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

[gmascellani-guest at alioth.debian.org]

Author: gmascellani-guest
Date: 2009-11-06 23:50:25 +0000 (Fri, 06 Nov 2009)
New Revision: 2591

Added:
   packages/josm/trunk/debian/watch
Modified:
   packages/josm/trunk/debian/control
   packages/josm/trunk/debian/josm.sh
   packages/josm/trunk/debian/rules
Log:
Some minor fixes


Modified: packages/josm/trunk/debian/control
===================================================================
--- packages/josm/trunk/debian/control	2009-11-06 16:26:31 UTC (rev 2590)
+++ packages/josm/trunk/debian/control	2009-11-06 23:50:25 UTC (rev 2591)
@@ -2,9 +2,12 @@
 Section: java
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Andreas Putzo <andreas at putzo.net>, Giovanni Mascellani <mascellani at poisson.phc.unipi.it>, Petter Reinholdtsen <pere at debian.org>
+Uploaders: Andreas Putzo <andreas at putzo.net>,
+ Giovanni Mascellani <mascellani at poisson.phc.unipi.it>,
+ Petter Reinholdtsen <pere at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), gettext, default-jdk, libgettext-commons-java (>= 0.9.6), libmetadata-extractor-java
+Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), gettext, default-jdk,
+ libgettext-commons-java (>= 0.9.6), libmetadata-extractor-java
 Standards-Version: 3.8.3
 Homepage: http://josm.openstreetmap.de
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm/
@@ -12,7 +15,8 @@
 
 Package: josm
 Architecture: all
-Depends:  openjdk-6-jre | sun-java5-jre | sun-java6-jre, libgettext-commons-java (>= 0.9.6), libmetadata-extractor-java, openstreetmap-map-icons-classic, ${misc:Depends}
+Depends:  openjdk-6-jre | sun-java5-jre | sun-java6-jre, libgettext-commons-java (>= 0.9.6),
+ libmetadata-extractor-java, openstreetmap-map-icons-classic, ${misc:Depends}
 Recommends: josm-plugins
 Description: Editor for OpenStreetMap
  JOSM is an editor for OpenStreetMap (OSM) written in Java.

Modified: packages/josm/trunk/debian/josm.sh
===================================================================
--- packages/josm/trunk/debian/josm.sh	2009-11-06 16:26:31 UTC (rev 2590)
+++ packages/josm/trunk/debian/josm.sh	2009-11-06 23:50:25 UTC (rev 2591)
@@ -8,7 +8,7 @@
 JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-sun/bin/java /usr/lib/jvm/java-1.5.0-sun/bin/java"
 
 for jcmd in $JAVA_CMDS; do
-	if [[ "z$ALTERNATIVE_JDK" == "z`readlink -n -f $jcmd`" ]] && [ -z "${JAVACMD}" ]; then
+	if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
         JAVACMD="$jcmd"
     fi
 done

Modified: packages/josm/trunk/debian/rules
===================================================================
--- packages/josm/trunk/debian/rules	2009-11-06 16:26:31 UTC (rev 2590)
+++ packages/josm/trunk/debian/rules	2009-11-06 23:50:25 UTC (rev 2591)
@@ -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-6-openjdk/
+JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME  := /usr/share/ant
 ANT_ARGS := -Ddebian.version=${DEB_VERSION}
 DEB_ANT_BUILD_TARGET := dist

Added: packages/josm/trunk/debian/watch
===================================================================
--- packages/josm/trunk/debian/watch	                        (rev 0)
+++ packages/josm/trunk/debian/watch	2009-11-06 23:50:25 UTC (rev 2591)
@@ -0,0 +1,2 @@
+# Watch file missing, because upstream doesn't make releases.
+# It only produce "tested" SVN revisions, which are not automatically detectable with uscan.