[DebianGIS-dev] r1455 - packages/josm-plugins/trunk/debian

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2008-03-26 19:36:30 +0000 (Wed, 26 Mar 2008)
New Revision: 1455

Added:
   packages/josm-plugins/trunk/debian/ant.properties
Modified:
   packages/josm-plugins/trunk/debian/control
   packages/josm-plugins/trunk/debian/rules
Log:
* Move package to main. Change build-dep, etc. accordingly.
* Add ant.properties.
* Added myself among uploaders.
* Remove jar files in the get-orig-source target.


Added: packages/josm-plugins/trunk/debian/ant.properties
===================================================================
--- packages/josm-plugins/trunk/debian/ant.properties	                        (rev 0)
+++ packages/josm-plugins/trunk/debian/ant.properties	2008-03-26 19:36:30 UTC (rev 1455)
@@ -0,0 +1,2 @@
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5

Modified: packages/josm-plugins/trunk/debian/control
===================================================================
--- packages/josm-plugins/trunk/debian/control	2008-03-26 18:43:59 UTC (rev 1454)
+++ packages/josm-plugins/trunk/debian/control	2008-03-26 19:36:30 UTC (rev 1455)
@@ -1,9 +1,9 @@
 Source: josm-plugins
-Section: contrib/utils
+Section: utils
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Giovanni Mascellani <g.mascellani at gmail.com>
-Build-Depends: debhelper (>= 5), cdbs, dpatch, josm, gettext, libgettext-commons-java
+Uploaders: Giovanni Mascellani <g.mascellani at gmail.com>, Andreas Putzo <andreas at putzo.net>
+Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev
 Standards-Version: 3.7.3
 Homepage: http://josm.openstreetmap.de
 

Modified: packages/josm-plugins/trunk/debian/rules
===================================================================
--- packages/josm-plugins/trunk/debian/rules	2008-03-26 18:43:59 UTC (rev 1454)
+++ packages/josm-plugins/trunk/debian/rules	2008-03-26 19:36:30 UTC (rev 1455)
@@ -5,7 +5,8 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 
-JAVA_HOME_DIRS := /usr/lib/jvm/java-6-sun/ /usr/lib/jvm/java-1.5.0-sun/
+JAVA_HOME := /usr/lib/jvm/java-gcj/
+ANT_HOME  := /usr/share/ant
 DEB_ANT_BUILD_TARGET := dist
 DEB_ANT_CLEAN_TARGET := clean
 
@@ -18,9 +19,8 @@
 	@echo Downloading josm-plugins from ${SVNREPO}
 	svn export -r HEAD ${SVNREPO} ../tarballs/josm-plugins-0.0.0.${DATE}
 	svn info --xml http://svn.openstreetmap.org/applications/editors/josm/plugins/ > ../tarballs/josm-plugins-0.0.0.${DATE}/svn-info.xml
-	#@echo Removing jar files and test data
-	#find ../tarballs/josm-plugins-0.0.0.${DATE} -name "*.jar" -exec rm {} \;
-	#rm -f ../tarballs/josm-plugins-0.0.0.${DATE}/data/*
+	@echo Removing jar files
+	find ../tarballs/josm-plugins-0.0.0.${DATE} -name "*.jar" -exec rm -v {} \;
 	@echo Building snapshot tarball																	
 	tar czf ../tarballs/josm-plugins_0.0.0.${DATE}.orig.tar.gz -C ../tarballs josm-plugins-0.0.0.${DATE}
 	@echo Cleaning up