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

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2008-03-11 22:01:54 +0000 (Tue, 11 Mar 2008)
New Revision: 1397

Modified:
   packages/josm/trunk/debian/control
   packages/josm/trunk/debian/rules
Log:
remove sun from depdendencies, change section.
minor changes to debian/rules


Modified: packages/josm/trunk/debian/control
===================================================================
--- packages/josm/trunk/debian/control	2008-03-02 18:55:49 UTC (rev 1396)
+++ packages/josm/trunk/debian/control	2008-03-11 22:01:54 UTC (rev 1397)
@@ -1,16 +1,15 @@
 Source: josm
-Section: contrib/utils
+Section: utils
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Andreas Putzo <andreas at putzo.net>
-Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), sun-java6-jdk, libgettext-commons-java, libmetadata-extractor-java
-Standards-Version: 3.7.2
+Uploaders: Andreas Putzo <andreas at putzo.net>, 
+Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev, libgettext-commons-java, libmetadata-extractor-java
+Standards-Version: 3.7.3
 Homepage: http://josm.openstreetmap.de
 
 Package: josm
 Architecture: all
-Depends: sun-java6-jre | java2-runtime, libgettext-commons-java, libmetadata-extractor-java
-Recommends: josm-plugins
+Depends:  java-gcj-compat | java2-runtime, libgettext-commons-java, libmetadata-extractor-java
 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-03-02 18:55:49 UTC (rev 1396)
+++ packages/josm/trunk/debian/rules	2008-03-11 22:01:54 UTC (rev 1397)
@@ -5,16 +5,15 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 
-#JAVA_HOME := /usr/lib/jvm/java-6-sun/
 JAVA_HOME := /usr/lib/jvm/java-gcj/
-
 ANT_HOME  := /usr/share/ant
 DEB_ANT_BUILD_TARGET := dist
+
 # Dependencies
 DEB_JARS := /usr/share/java/gettext-commons.jar
 DEB_JARS += /usr/share/java/metadata-extractor.jar
 # Docs are already included in the jar file and can be accessed from within josm.
-DEB_INSTALL_DOCS_ALL :=
+#DEB_INSTALL_DOCS_ALL :=
 
 SVNREPO := http://josm.openstreetmap.de/svn/trunk
 DATE := $(shell date +%Y%m%d)
@@ -38,7 +37,7 @@
 	@echo Downloading josm from ${SVNREPO}
 	svn export ${SVNREPO} ../tarballs/josm-0.0.0.${DATE}
 	@echo Removing jar files and test data
-	find ../tarballs/josm-0.0.0.${DATE} -name "*.jar" -exec rm {} \;
+	find ../tarballs/josm-0.0.0.${DATE} -name "*.jar" -exec rm -v {} \;
 	rm -f ../tarballs/josm-0.0.0.${DATE}/data/*
 	@echo Building snapshot tarball																	
 	tar czf ../tarballs/josm_0.0.0.${DATE}.orig.tar.gz -C ../tarballs josm-0.0.0.${DATE}