[osmosis] 15/28: Don't set custom CLASSPATH.

[Bas Couwenberg]

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

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

commit 6a0e64060e34c4cf1964e5ecfab29ec038130e19
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Mar 16 19:11:40 2014 +0100

    Don't set custom CLASSPATH.
---
 debian/lintian-overrides |  3 +++
 debian/rules             | 21 ---------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index d0be4bd..fec7c48 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1 +1,4 @@
 osmosis: duplicate-files usr/share/doc/osmosis/examples/pgsimple_schema_0.6_action.sql usr/share/doc/osmosis/examples/pgsnapshot_schema_0.6_action.sql
+
+# Using plexus to load JARs
+osmosis: missing-classpath *
diff --git a/debian/rules b/debian/rules
index 85635fc..b9b4065 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,26 +2,6 @@
 
 export JAVA_HOME := /usr/lib/jvm/default-java/
 
-DEB_JARS := /usr/share/java/mysql-connector-java.jar
-DEB_JARS += /usr/share/java/postgis.jar
-DEB_JARS += /usr/share/java/postgresql.jar
-DEB_JARS += /usr/share/java/junit4.jar
-DEB_JARS += /usr/share/java/ant-junit.jar
-DEB_JARS += /usr/share/java/spring3-core.jar
-DEB_JARS += /usr/share/java/spring3-jdbc.jar
-DEB_JARS += /usr/share/java/spring3-beans.jar
-DEB_JARS += /usr/share/java/spring3-transaction.jar
-DEB_JARS += /usr/share/java/commons-dbcp.jar
-DEB_JARS += /usr/share/java/jpf.jar
-DEB_JARS += /usr/share/java/commons-compress.jar
-DEB_JARS += /usr/share/java/commons-codec.jar
-DEB_JARS += /usr/share/java/batik-ext.jar
-
-# Plugins for ant
-DEB_JARS += /usr/share/java/ant-nodeps.jar
-
-export CLASSPATH=$(shell echo $(DEB_JARS) | sed -e 's/ /:/g')
-
 DB2MAN := /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
 XP := xsltproc -''-nonet -''-param man.charmap.use.subset "0"
 
@@ -35,7 +15,6 @@ debian/osmosis.1: debian/osmosis.xml
 	dh $@ --parallel
 
 override_dh_auto_build:
-	echo $(CLASSPATH)
 	gradle build
 
 override_dh_clean:

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