[pkg-java] r7400 - trunk/opennms/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-11-21 00:32:08 +0000 (Fri, 21 Nov 2008)
New Revision: 7400

Modified:
   trunk/opennms/debian/ant.properties
   trunk/opennms/debian/build.xml
   trunk/opennms/debian/control
   trunk/opennms/debian/rules
Log:
build joesnmp only


Modified: trunk/opennms/debian/ant.properties
===================================================================
--- trunk/opennms/debian/ant.properties	2008-11-21 00:20:31 UTC (rev 7399)
+++ trunk/opennms/debian/ant.properties	2008-11-21 00:32:08 UTC (rev 7400)
@@ -7,12 +7,8 @@
 class.dir=classes
 source.dir=source
 
-util.dir=opennms-util
-config.utils.dir=opennms-config-utils
 joesnmp.dir=opennms-joesnmp
 # and more...
 
-util.jar=opennms-util.jar
-config.utils.jar=opennms-config-utils.jar
 joesnmp.jar=opennms-joesnmp.jar
 # and more...

Modified: trunk/opennms/debian/build.xml
===================================================================
--- trunk/opennms/debian/build.xml	2008-11-21 00:20:31 UTC (rev 7399)
+++ trunk/opennms/debian/build.xml	2008-11-21 00:32:08 UTC (rev 7400)
@@ -18,30 +18,7 @@
   </target>
 
   <target name="jar">
-    <mkdir dir="${source.dir}/${util.dir}/${class.dir}"/>
-    <javac srcdir="${source.dir}/${util.dir}"
-      destdir="${source.dir}/${util.dir}/${class.dir}"
-      debug="true">
-      <include name="**/*.java"/>
-      <exclude name="**/RunnableConsumerThreadPool.java"/>
-      <exclude name="**/BeanUtils.java"/>
-    </javac>
-    <jar jarfile="${util.jar}">
-      <fileset dir="${source.dir}/${util.dir}/${class.dir}">
-          <include name="**"/>
-      </fileset>
-    </jar>
 
-    <mkdir dir="${source.dir}/${config.utils.dir}/${class.dir}"/>
-    <javac srcdir="${source.dir}/${config.utils.dir}"
-      destdir="${source.dir}/${config.utils.dir}/${class.dir}"
-      debug="true"/>
-    <jar jarfile="${config.utils.jar}">
-      <fileset dir="${source.dir}/${config.utils.dir}/${class.dir}">
-          <include name="**"/>
-      </fileset>
-    </jar>
-
     <mkdir dir="${source.dir}/${joesnmp.dir}/${class.dir}"/>
     <javac srcdir="${source.dir}/${joesnmp.dir}"
       destdir="${source.dir}/${joesnmp.dir}/${class.dir}"

Modified: trunk/opennms/debian/control
===================================================================
--- trunk/opennms/debian/control	2008-11-21 00:20:31 UTC (rev 7399)
+++ trunk/opennms/debian/control	2008-11-21 00:32:08 UTC (rev 7400)
@@ -4,7 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, java-gcj-compat-dev, junit
+Build-Depends-Indep: ant, java-gcj-compat-dev, junit, libcommons-cli-java,
+ liblog4j1.2-java
 Standards-Version: 3.8.0
 Homepage: http://www.opennms.org/index.php/Main_Page
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/opennms

Modified: trunk/opennms/debian/rules
===================================================================
--- trunk/opennms/debian/rules	2008-11-21 00:20:31 UTC (rev 7399)
+++ trunk/opennms/debian/rules	2008-11-21 00:32:08 UTC (rev 7400)
@@ -7,7 +7,6 @@
 DEB_ANT_BUILD_TARGET := jar
 DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_JARS	     := junit commons-cli log4j-1.2
-DEB_CLASSPATH        := $(DEB_CLASSPATH):$(CURDIR)/source/opennms-util/classes/:$(CURDIR)/source/opennms-config-utils/classes/
 
 ALL_JARS = $(wildcard *.jar)
 DEST_DIR = debian/tmp/usr/share/java