[josm-plugins] 08/369: * 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.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm-plugins.

commit 986496e636591d98a84e401a5931a96e98a6522a
Author: Andreas Putzo <andreas at putzo.net>
Date:   Wed Mar 26 19:36:30 2008 +0000

    * 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.
---
 debian/ant.properties | 2 ++
 debian/control        | 6 +++---
 debian/rules          | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 0000000..7385c7f
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1,2 @@
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
diff --git a/debian/control b/debian/control
index 0d45123..4b7cd39 100644
--- a/debian/control
+++ b/debian/control
@@ -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
 
diff --git a/debian/rules b/debian/rules
index 3cf5832..0c336c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 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 @@ get-orig-source:
 	@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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git