[pkg-java] r10351 - in trunk/libjamon-java/debian: . patches
Luke Cycon
lcycon-guest at alioth.debian.org
Mon Sep 14 00:28:34 UTC 2009
Author: lcycon-guest
Date: 2009-09-14 00:28:33 +0000 (Mon, 14 Sep 2009)
New Revision: 10351
Added:
trunk/libjamon-java/debian/README.source
trunk/libjamon-java/debian/patches/
trunk/libjamon-java/debian/patches/api-fix.diff
trunk/libjamon-java/debian/patches/series
Modified:
trunk/libjamon-java/debian/changelog
trunk/libjamon-java/debian/control
trunk/libjamon-java/debian/copyright
trunk/libjamon-java/debian/rules
Log:
Fixed a FTBFS caused by an API update in bot Tomcat and Java
Look in debian/changelog for more details
Added: trunk/libjamon-java/debian/README.source
===================================================================
--- trunk/libjamon-java/debian/README.source (rev 0)
+++ trunk/libjamon-java/debian/README.source 2009-09-14 00:28:33 UTC (rev 10351)
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
Modified: trunk/libjamon-java/debian/changelog
===================================================================
--- trunk/libjamon-java/debian/changelog 2009-09-14 00:03:59 UTC (rev 10350)
+++ trunk/libjamon-java/debian/changelog 2009-09-14 00:28:33 UTC (rev 10351)
@@ -4,19 +4,31 @@
* Update of the URLs
* Rename Jakarta Commons to Apache Commons
+ [ Torsten Werner ]
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 default-jdk and default-jre.
* Add Build-Depends: glassfish-javaee, jetty.
* Disable compiler warnings.
* Switch to tomcat6.
* Add missing Build-Depends: liblog4j1.2-java.
- -- Torsten Werner <twerner at debian.org> Fri, 11 Sep 2009 23:57:27 +0200
+ [ Luke Cycon ]
+ * Added new patch (api-fix.diff)
+ - Fix issues to allow building by Java 1.6
+ - Fix issues caused be recenct tomcat API updates
+ * Bump Standards-Version: 3.8.3. No changes.
+ * Updated Vcs address in debian/control/ svn+ssh:// to svn://
+ * Add build depends: quilt
+ * Updated copyright to comply with Debian Stadards
+ * Moved package to correct section ( java )
+ * Added debian/README.source
+ * Added myself to uploaders
+ -- Luke Cycon <lcycon at gmail.com> Sun, 13 Sep 2009 10:33:36 -0700
+
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-14 00:03:59 UTC (rev 10350)
+++ trunk/libjamon-java/debian/control 2009-09-14 00:28:33 UTC (rev 10351)
@@ -1,14 +1,14 @@
Source: libjamon-java
-Section: libs
+Section: java
Priority: extra
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,
+Uploaders: Torsten Werner <twerner at debian.org>, Luke Cycon <lcycon at gmail.com>
+Build-Depends: ant, quilt, cdbs, debhelper (>= 5), glassfish-javaee,
default-jdk, jetty, liblog4j1.2-java, libservlet2.5-java, libtomcat6-java
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
Homepage: http://commons.apache.org/attributes/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjamon-java/
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjamon-java
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjamon-java
Package: libjamon-java
Architecture: all
Modified: trunk/libjamon-java/debian/copyright
===================================================================
--- trunk/libjamon-java/debian/copyright 2009-09-14 00:03:59 UTC (rev 10350)
+++ trunk/libjamon-java/debian/copyright 2009-09-14 00:28:33 UTC (rev 10351)
@@ -14,7 +14,7 @@
Jack Shirazi
Java Ranch
-Copyright: (c) 2002 Steve Souza <admin at jamonapi.com>. All rights reserved.
+Copyright: Copyright (c) 2002 Steve Souza <admin at jamonapi.com>. All rights reserved.
License:
Redistribution in binary form, with or without modifications, are permitted
@@ -42,5 +42,5 @@
DAMAGE.
-The Debian packaging is (C) 2007, Torsten Werner <twerner at debian.org> and
+The Debian packaging is copyright (C) 2007, Torsten Werner <twerner at debian.org> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: trunk/libjamon-java/debian/patches/api-fix.diff
===================================================================
--- trunk/libjamon-java/debian/patches/api-fix.diff (rev 0)
+++ trunk/libjamon-java/debian/patches/api-fix.diff 2009-09-14 00:28:33 UTC (rev 10351)
@@ -0,0 +1,40 @@
+This patch fixes several API ubdates in Java 1.6 and Tomcat 6.
+The package can be built with Java 1.6 with this patch.
+--- a/src/java/com/jamonapi/proxy/JAMonDataSource.java
++++ b/src/java/com/jamonapi/proxy/JAMonDataSource.java
+@@ -45,9 +45,15 @@
+
+ public Connection getConnection(String userName, String passWord) throws SQLException {
+ return MonProxyFactory.monitor(realDataSource.getConnection(userName, passWord));
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ return null;
+ }
+
+-
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ return false;
++ }
+
+ public int getLoginTimeout() throws SQLException {
+ return realDataSource.getLoginTimeout();
+--- a/src/java/com/jamontomcat/JAMonTomcat4Valve.java
++++ b/src/java/com/jamontomcat/JAMonTomcat4Valve.java
+@@ -56,14 +56,13 @@
+ * test xml - read property
+ */
+
+- public void invoke(Request request, Response response, ValveContext valveContext) throws IOException, ServletException {
++ public void invoke(org.apache.catalina.connector.Request request, org.apache.catalina.connector.Response response) throws IOException, ServletException {
+ HttpMon httpMon=null;
+ try {
+ httpMon=httpMonFactory.start(request, response);
+
+ // tomcat 4/5
+- if (valveContext!=null)
+- valveContext.invokeNext(request, response);
++ this.getNext().invoke(request, response);
+
+ } catch (Throwable e) {
+ httpMon.throwException(e);
Added: trunk/libjamon-java/debian/patches/series
===================================================================
--- trunk/libjamon-java/debian/patches/series (rev 0)
+++ trunk/libjamon-java/debian/patches/series 2009-09-14 00:28:33 UTC (rev 10351)
@@ -0,0 +1 @@
+api-fix.diff
Modified: trunk/libjamon-java/debian/rules
===================================================================
--- trunk/libjamon-java/debian/rules 2009-09-14 00:03:59 UTC (rev 10350)
+++ trunk/libjamon-java/debian/rules 2009-09-14 00:28:33 UTC (rev 10351)
@@ -2,6 +2,7 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := catalina glassfish-javaee jetty jetty-util log4j-1.2 servlet-api-2.5
More information about the pkg-java-commits
mailing list