[pkg-java] r16208 - in trunk/libjamon-java: . debian debian/patches
Miguel Landaeta
nomadium-guest at alioth.debian.org
Mon Jun 25 19:39:56 UTC 2012
Author: nomadium-guest
Date: 2012-06-25 19:39:56 +0000 (Mon, 25 Jun 2012)
New Revision: 16208
Added:
trunk/libjamon-java/debian/patches/build.diff
trunk/libjamon-java/debian/patches/java7-compat.diff
Removed:
trunk/libjamon-java/build.properties
trunk/libjamon-java/build.xml
Modified:
trunk/libjamon-java/debian/changelog
trunk/libjamon-java/debian/control
trunk/libjamon-java/debian/patches/series
Log:
* Team upload.
* Rename ant build files patch.
* Fix FTBFS with OpenJDK7.
* Bump Standards-Version to 3.9.3. No changes were required.
Deleted: trunk/libjamon-java/build.properties
===================================================================
--- trunk/libjamon-java/build.properties 2012-06-25 08:20:15 UTC (rev 16207)
+++ trunk/libjamon-java/build.properties 2012-06-25 19:39:56 UTC (rev 16208)
@@ -1,5 +0,0 @@
-class.dir=build
-source.dir=src/java
-jar.name=jamon.jar
-doc.dir=docs
-doc.packagenames=com.*
Deleted: trunk/libjamon-java/build.xml
===================================================================
--- trunk/libjamon-java/build.xml 2012-06-25 08:20:15 UTC (rev 16207)
+++ trunk/libjamon-java/build.xml 2012-06-25 19:39:56 UTC (rev 16208)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="jar" name="jamon" basedir=".">
- <property file="build.properties"/>
-
- <target name="clean" description="Clean up">
- <delete dir="${class.dir}"/>
- <delete file="${jar.name}"/>
- </target>
-
- <target name="compile" description="Compile the sources">
- <mkdir dir="${class.dir}"/>
- <javac srcdir="${source.dir}" destdir="${class.dir}"
- deprecation="true" debug="true" optimize="false" nowarn="true"/>
- </target>
-
- <target name="javadoc" description="Creates Javadoc documentation"
- depends="jar">
- <mkdir dir="${doc.dir}"/>
- <javadoc packagenames="${doc.packagenames}"
- classpath="${class.dir}/${jar.name}"
- sourcepath="${source.dir}" destdir="${doc.dir}"/>
- </target>
-
- <target name="jar" description="Create the jar" depends="compile">
- <jar jarfile="${jar.name}" basedir="${class.dir}"/>
- </target>
-
- <target name="install" depends="jar">
- <mkdir dir="${destdir}/usr/share/java/" />
- <copy file="${jar.name}" todir="${destdir}/usr/share/java/"/>
- </target>
-</project>
Modified: trunk/libjamon-java/debian/changelog
===================================================================
--- trunk/libjamon-java/debian/changelog 2012-06-25 08:20:15 UTC (rev 16207)
+++ trunk/libjamon-java/debian/changelog 2012-06-25 19:39:56 UTC (rev 16208)
@@ -1,3 +1,12 @@
+libjamon-java (2.7-3) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Rename ant build files patch.
+ * Fix FTBFS with OpenJDK7.
+ * Bump Standards-Version to 3.9.3. No changes were required.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Mon, 25 Jun 2012 19:25:20 -0430
+
libjamon-java (2.7-2) unstable; urgency=low
* Switch to source format 3.0.
Modified: trunk/libjamon-java/debian/control
===================================================================
--- trunk/libjamon-java/debian/control 2012-06-25 08:20:15 UTC (rev 16207)
+++ trunk/libjamon-java/debian/control 2012-06-25 19:39:56 UTC (rev 16208)
@@ -5,7 +5,7 @@
Uploaders: Torsten Werner <twerner at debian.org>, Luke Cycon <lcycon at gmail.com>
Build-Depends: ant, quilt, cdbs, debhelper (>= 5),
default-jdk, libgeronimo-interceptor-3.0-spec-java, libjetty-java, liblog4j1.2-java, libservlet2.5-java, libtomcat6-java
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
Homepage: http://commons.apache.org/attributes/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjamon-java/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjamon-java
Added: trunk/libjamon-java/debian/patches/build.diff
===================================================================
--- trunk/libjamon-java/debian/patches/build.diff (rev 0)
+++ trunk/libjamon-java/debian/patches/build.diff 2012-06-25 19:39:56 UTC (rev 16208)
@@ -0,0 +1,48 @@
+--- a/build.xml
++++ b/build.xml
+@@ -0,0 +1,33 @@
++<?xml version="1.0" encoding="UTF-8"?>
++
++<project default="jar" name="jamon" basedir=".">
++ <property file="build.properties"/>
++
++ <target name="clean" description="Clean up">
++ <delete dir="${class.dir}"/>
++ <delete file="${jar.name}"/>
++ </target>
++
++ <target name="compile" description="Compile the sources">
++ <mkdir dir="${class.dir}"/>
++ <javac srcdir="${source.dir}" destdir="${class.dir}"
++ deprecation="true" debug="true" optimize="false" nowarn="true"/>
++ </target>
++
++ <target name="javadoc" description="Creates Javadoc documentation"
++ depends="jar">
++ <mkdir dir="${doc.dir}"/>
++ <javadoc packagenames="${doc.packagenames}"
++ classpath="${class.dir}/${jar.name}"
++ sourcepath="${source.dir}" destdir="${doc.dir}"/>
++ </target>
++
++ <target name="jar" description="Create the jar" depends="compile">
++ <jar jarfile="${jar.name}" basedir="${class.dir}"/>
++ </target>
++
++ <target name="install" depends="jar">
++ <mkdir dir="${destdir}/usr/share/java/" />
++ <copy file="${jar.name}" todir="${destdir}/usr/share/java/"/>
++ </target>
++</project>
+--- a/build.properties 2012-06-14 08:15:53.674554881 -0430
++++ b/build.properties 2012-06-25 15:02:20.000000000 -0430
+@@ -0,0 +1,9 @@
++class.dir=build
++source.dir=src/java
++jar.name=jamon.jar
++doc.dir=docs
++doc.packagenames=com.*
++# Ensure that source and target are 1.5
++# For backwards compat on Java 7
++ant.build.javac.source=1.5
++ant.build.javac.target=1.5
Added: trunk/libjamon-java/debian/patches/java7-compat.diff
===================================================================
--- trunk/libjamon-java/debian/patches/java7-compat.diff (rev 0)
+++ trunk/libjamon-java/debian/patches/java7-compat.diff 2012-06-25 19:39:56 UTC (rev 16208)
@@ -0,0 +1,27 @@
+This patch fixes API updates in Java 7.
+The package can be built with Java 7 with this patch.
+--- a/src/java/com/jamonapi/proxy/JAMonDataSource.java
++++ b/src/java/com/jamonapi/proxy/JAMonDataSource.java
+@@ -77,5 +77,9 @@
+ public Reference getReference() throws NamingException {
+ return ((Referenceable)realDataSource).getReference();
+ }
++
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++ throw new UnsupportedOperationException("getParentLogger");
++ }
+
+ }
+--- a/src/java/com/jamonapi/proxy/JAMonDriver.java
++++ b/src/java/com/jamonapi/proxy/JAMonDriver.java
+@@ -245,6 +245,10 @@
+
+ }
+
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++ throw new UnsupportedOperationException("getParentLogger");
++ }
++
+
+ }
+
Modified: trunk/libjamon-java/debian/patches/series
===================================================================
--- trunk/libjamon-java/debian/patches/series 2012-06-25 08:20:15 UTC (rev 16207)
+++ trunk/libjamon-java/debian/patches/series 2012-06-25 19:39:56 UTC (rev 16208)
@@ -1 +1,3 @@
api-fix.diff
+build.diff
+java7-compat.diff
More information about the pkg-java-commits
mailing list