[pkg-java] r10339 - in trunk/libjamon-java: . debian

[Torsten Werner]

Author: twerner
Date: 2009-09-11 22:02:24 +0000 (Fri, 11 Sep 2009)
New Revision: 10339

Modified:
   trunk/libjamon-java/build.xml
   trunk/libjamon-java/debian/changelog
   trunk/libjamon-java/debian/control
   trunk/libjamon-java/debian/rules
Log:
* Update of the URLs
* Rename Jakarta Commons to Apache Commons
UNRELEASED (tomcat related errors)
* Switch from kaffe to default-jdk and default-jre.
* Disable compiler warnings.
* Switch to tomcat6.
* Add missing Build-Depends: liblog4j1.2-java.

Modified: trunk/libjamon-java/build.xml
===================================================================
--- trunk/libjamon-java/build.xml	2009-09-11 19:19:36 UTC (rev 10338)
+++ trunk/libjamon-java/build.xml	2009-09-11 22:02:24 UTC (rev 10339)
@@ -11,7 +11,7 @@
   <target name="compile" description="Compile the sources">
     <mkdir dir="${class.dir}"/>
     <javac srcdir="${source.dir}" destdir="${class.dir}"
-      deprecation="true" debug="true" optimize="false"/>
+      deprecation="true" debug="true" optimize="false" nowarn="true"/>
   </target>
 
   <target name="javadoc" description="Creates Javadoc documentation"

Modified: trunk/libjamon-java/debian/changelog
===================================================================
--- trunk/libjamon-java/debian/changelog	2009-09-11 19:19:36 UTC (rev 10338)
+++ trunk/libjamon-java/debian/changelog	2009-09-11 22:02:24 UTC (rev 10339)
@@ -1,19 +1,22 @@
-libjamon-java (2.7-1) UNRELEASED; urgency=low
+libjamon-java (2.7-1) unstable; urgency=low
 
-  UNRELEASED (needs newer jetty)
+  [ Emmanuel Bourg ]
+  * Update of the URLs
+  * Rename Jakarta Commons to Apache Commons
+
+  UNRELEASED (tomcat related errors)
   * new upstream version
   * Move package to Alioth and change Maintainer.
   * Update Vcs and Homepage headers in debian/control.
   * Bump up Standards-Version: 3.7.3 (no changes needed).
-  * Switch from kaffe to java-gcj.
+  * Switch from kaffe to default-jdk and default-jre.
   * Add Build-Depends: glassfish-javaee, jetty.
+  * Disable compiler warnings.
+  * Switch to tomcat6.
+  * Add missing Build-Depends: liblog4j1.2-java.
 
-  [ Emmanuel Bourg ]
-  * Update of the URLs
-  * Rename Jakarta Commons to Apache Commons
+ -- Torsten Werner <twerner at debian.org>  Fri, 11 Sep 2009 23:57:27 +0200
 
- -- Torsten Werner <twerner at debian.org>  Sun, 16 Dec 2007 13:46:39 +0100
-
 libjamon-java (2.5-1) unstable; urgency=low
 
   * Initial release (Closes: #426315)

Modified: trunk/libjamon-java/debian/control
===================================================================
--- trunk/libjamon-java/debian/control	2009-09-11 19:19:36 UTC (rev 10338)
+++ trunk/libjamon-java/debian/control	2009-09-11 22:02:24 UTC (rev 10339)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
 Build-Depends: ant, cdbs, debhelper (>= 5), glassfish-javaee,
- java-gcj-compat-dev, jetty, libservlet2.4-java
+ default-jdk, jetty, liblog4j1.2-java, libservlet2.5-java, libtomcat6-java
 Standards-Version: 3.7.3
 Homepage: http://commons.apache.org/attributes/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjamon-java/
@@ -13,7 +13,7 @@
 Package: libjamon-java
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends},
- java-gcj-compat | java1-runtime | java2-runtime
+ default-jre | java2-runtime
 Description: Java API for easy monitoring production applications
  The Java Application Monitor (JAMon) is a free, simple, high
  performance, thread safe, Java API that allows developers to easily

Modified: trunk/libjamon-java/debian/rules
===================================================================
--- trunk/libjamon-java/debian/rules	2009-09-11 19:19:36 UTC (rev 10338)
+++ trunk/libjamon-java/debian/rules	2009-09-11 22:02:24 UTC (rev 10339)
@@ -3,9 +3,9 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_JARS  := glassfish-javaee jetty servlet-api
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS  := catalina glassfish-javaee jetty jetty-util log4j-1.2 servlet-api-2.5
 
 get-orig-source:
-	-uscan --upstream-version 0
+	uscan --force-download --rename