[pkg-java] r7399 - trunk/opennms/debian
twerner at alioth.debian.org
twerner at alioth.debian.org
Fri Nov 21 00:20:31 UTC 2008
Author: twerner
Date: 2008-11-21 00:20:31 +0000 (Fri, 21 Nov 2008)
New Revision: 7399
Added:
trunk/opennms/debian/watch
Modified:
trunk/opennms/debian/ant.properties
trunk/opennms/debian/build.xml
trunk/opennms/debian/changelog
trunk/opennms/debian/control
trunk/opennms/debian/libopennms-install-java.install
trunk/opennms/debian/libopennms-joesnmp-java.install
trunk/opennms/debian/orig-tar.sh
trunk/opennms/debian/rules
Log:
new upstream release
Modified: trunk/opennms/debian/ant.properties
===================================================================
--- trunk/opennms/debian/ant.properties 2008-11-20 23:01:57 UTC (rev 7398)
+++ trunk/opennms/debian/ant.properties 2008-11-21 00:20:31 UTC (rev 7399)
@@ -1,19 +1,18 @@
-project.name=jbossas
+project.name=opennms
+
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
+build.sysclasspath=first
+
class.dir=classes
-source.dir=src
+source.dir=source
-core.dir=core
-install.dir=install
-joesnmp.dir=joesnmp
-postgresql.dir=postgresql
-report.dir=report
-services.dir=services
-web.dir=web
+util.dir=opennms-util
+config.utils.dir=opennms-config-utils
+joesnmp.dir=opennms-joesnmp
+# and more...
-core.jar=opennms-core.jar
-install.jar=opennms-install.jar
+util.jar=opennms-util.jar
+config.utils.jar=opennms-config-utils.jar
joesnmp.jar=opennms-joesnmp.jar
-postgresql.jar=opennms-postgresql.jar
-report.jar=opennms-report.jar
-services.jar=opennms-services.jar
-web.jar=opennms-web.jar
+# and more...
Modified: trunk/opennms/debian/build.xml
===================================================================
--- trunk/opennms/debian/build.xml 2008-11-20 23:01:57 UTC (rev 7398)
+++ trunk/opennms/debian/build.xml 2008-11-21 00:20:31 UTC (rev 7399)
@@ -18,22 +18,36 @@
</target>
<target name="jar">
- <mkdir dir="${source.dir}/${joesnmp.dir}/${class.dir}"/>
- <javac srcdir="${source.dir}/${joesnmp.dir}" destdir="${source.dir}/${joesnmp.dir}/${class.dir}"
+ <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="${joesnmp.jar}">
- <fileset dir="${source.dir}/${joesnmp.dir}/${class.dir}">
+ <jar jarfile="${config.utils.jar}">
+ <fileset dir="${source.dir}/${config.utils.dir}/${class.dir}">
<include name="**"/>
</fileset>
</jar>
- <mkdir dir="${source.dir}/${install.dir}/${class.dir}"/>
- <javac srcdir="${source.dir}/${install.dir}" destdir="${source.dir}/${install.dir}/${class.dir}"
+ <mkdir dir="${source.dir}/${joesnmp.dir}/${class.dir}"/>
+ <javac srcdir="${source.dir}/${joesnmp.dir}"
+ destdir="${source.dir}/${joesnmp.dir}/${class.dir}"
debug="true"/>
-
- <jar jarfile="${install.jar}">
- <fileset dir="${source.dir}/${install.dir}/${class.dir}">
+ <jar jarfile="${joesnmp.jar}">
+ <fileset dir="${source.dir}/${joesnmp.dir}/${class.dir}">
<include name="**"/>
</fileset>
</jar>
Modified: trunk/opennms/debian/changelog
===================================================================
--- trunk/opennms/debian/changelog 2008-11-20 23:01:57 UTC (rev 7398)
+++ trunk/opennms/debian/changelog 2008-11-21 00:20:31 UTC (rev 7399)
@@ -1,5 +1,6 @@
-opennms (1.2.9-1) UNRELEASED; urgency=low
+opennms (1.6.1-1) UNRELEASED; urgency=low
+ [ Varun Hiremath ]
* Initial release (Closes: #450615)
- -- Varun Hiremath <varunhiremath at gmail.com> Tue, 24 Apr 2007 17:19:10 +0530
+ -- Torsten Werner <twerner at debian.org> Fri, 21 Nov 2008 00:31:06 +0100
Modified: trunk/opennms/debian/control
===================================================================
--- trunk/opennms/debian/control 2008-11-20 23:01:57 UTC (rev 7398)
+++ trunk/opennms/debian/control 2008-11-21 00:20:31 UTC (rev 7399)
@@ -5,7 +5,7 @@
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
-Standards-Version: 3.7.2
+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
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/opennms
@@ -26,18 +26,18 @@
.
This package ships the opennms-joesnmp classes.
-Package: libopennms-install-java
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
-Description: Open-source Network Management
- OpenNMS is a highly-customizable network management platform. It
- provides three main functional areas:
- * Service Polling: the system monitors services on the network and
- reports on their "service level".
- * Performance: data is collected from the remote systems via SNMP in
- order to measure the performance of the network.
- * Event Management and Notifications: OpenNMS includes a robust
- notification system, including escalations, that can be generated by
- network events.
- .
- This package ships the opennms-install classes.
+#Package: libopennms-install-java
+#Architecture: all
+#Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+#Description: Open-source Network Management
+# OpenNMS is a highly-customizable network management platform. It
+# provides three main functional areas:
+# * Service Polling: the system monitors services on the network and
+# reports on their "service level".
+# * Performance: data is collected from the remote systems via SNMP in
+# order to measure the performance of the network.
+# * Event Management and Notifications: OpenNMS includes a robust
+# notification system, including escalations, that can be generated by
+# network events.
+# .
+# This package ships the opennms-install classes.
Modified: trunk/opennms/debian/libopennms-install-java.install
===================================================================
--- trunk/opennms/debian/libopennms-install-java.install 2008-11-20 23:01:57 UTC (rev 7398)
+++ trunk/opennms/debian/libopennms-install-java.install 2008-11-21 00:20:31 UTC (rev 7399)
@@ -1 +1 @@
-debian/tmp/usr/share/java/opennms-install*
+#debian/tmp/usr/share/java/opennms-install*
Modified: trunk/opennms/debian/libopennms-joesnmp-java.install
===================================================================
--- trunk/opennms/debian/libopennms-joesnmp-java.install 2008-11-20 23:01:57 UTC (rev 7398)
+++ trunk/opennms/debian/libopennms-joesnmp-java.install 2008-11-21 00:20:31 UTC (rev 7399)
@@ -1 +1 @@
-debian/tmp/usr/share/java/opennms-joesnmp*
+debian/tmp/usr/share/java/opennms-*
Modified: trunk/opennms/debian/orig-tar.sh
===================================================================
--- trunk/opennms/debian/orig-tar.sh 2008-11-20 23:01:57 UTC (rev 7398)
+++ trunk/opennms/debian/orig-tar.sh 2008-11-21 00:20:31 UTC (rev 7399)
@@ -1,23 +1,16 @@
-#!/bin/sh -e
+#!/bin/sh
-# $1 = version
-TAR=../opennms_$1.orig.tar.gz
-DIR=opennms-$1.orig
-VERSION=`echo $1 | sed -e 's/\./_/g'`
-echo $VERSION
+DIR=opennms-*
# clean up the upstream tarball
-mkdir $DIR
-(cd $DIR;\
-svn export https://opennms.svn.sourceforge.net/svnroot/opennms/opennms/tags/OPENNMS_${VERSION}_RELEASE/src src;\
-svn export https://opennms.svn.sourceforge.net/svnroot/opennms/opennms/tags/OPENNMS_${VERSION}_RELEASE/CHANGELOG)
-GZIP=--best tar -c -z -f $TAR $DIR
+tar -x -z -f $3
+GZIP=--best tar -c -z -f $3 --exclude '*.jar' $DIR
rm -rf $DIR
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
. .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
+ mv $3 $origDir
+ echo "moved $3 to $origDir"
fi
Modified: trunk/opennms/debian/rules
===================================================================
--- trunk/opennms/debian/rules 2008-11-20 23:01:57 UTC (rev 7398)
+++ trunk/opennms/debian/rules 2008-11-21 00:20:31 UTC (rev 7399)
@@ -3,13 +3,14 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_ANT_BUILD_TARGET := jar
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS := junit
+JAVA_HOME := /usr/lib/jvm/java-gcj
+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 = $(DEB_DESTDIR)/usr/share/java
+DEST_DIR = debian/tmp/usr/share/java
common-install-prehook-indep::
for jar in $(ALL_JARS); do \
Added: trunk/opennms/debian/watch
===================================================================
--- trunk/opennms/debian/watch (rev 0)
+++ trunk/opennms/debian/watch 2008-11-21 00:20:31 UTC (rev 7399)
@@ -0,0 +1,3 @@
+version=3
+http://sf.net/opennms/ opennms-source-(\d)\.(\d)\.(\d).*\.tar\.gz \
+ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list