This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository commons-httpclient.
commit 2820a5277a2e5f984c207e049594faf0404cb033 Author: Barry Hawkins <[email protected]> Date: Wed Sep 14 06:20:57 2005 +0000 Pulled patch files back out of the attic; they were needed after all; I wasn't originally smoking crack. --- debian/patches/00list | 2 ++ .../01_upstream_disable_examples_classes.dpatch | 19 +++++++++++++++++++ ...upstream_qualify_ConnectionPool_declaration.dpatch | 17 +++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/debian/patches/00list b/debian/patches/00list index e69de29..3c8ffbc 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -0,0 +1,2 @@ +01_upstream_disable_examples_classes +02_upstream_qualify_ConnectionPool_declaration diff --git a/debian/patches/01_upstream_disable_examples_classes.dpatch b/debian/patches/01_upstream_disable_examples_classes.dpatch new file mode 100755 index 0000000..bec500b --- /dev/null +++ b/debian/patches/01_upstream_disable_examples_classes.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_upstream_disable_examples_classes.dpatch by Barry Hawkins <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add directives to exclude the compilation of problematic classes +## DP: shipped as part of the examples for this library. + +--- commons-httpclient-2.0.2.orig/build.xml ++++ commons-httpclient-2.0.2/build.xml +@@ -236,7 +236,8 @@ + destdir ="${build.home}/examples" + debug ="${compile.debug}" + deprecation ="${compile.deprecation}" +- optimize ="${compile.optimize}"> ++ optimize ="${compile.optimize}" ++ excludes ="MultipartFileUploadApp.java,ClientApp.java"> + <classpath refid="compile.classpath"/> + </javac> + </target> diff --git a/debian/patches/02_upstream_qualify_ConnectionPool_declaration.dpatch b/debian/patches/02_upstream_qualify_ConnectionPool_declaration.dpatch new file mode 100755 index 0000000..8a0f198 --- /dev/null +++ b/debian/patches/02_upstream_qualify_ConnectionPool_declaration.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_upstream_qualify_ConnectionPool_declaration.dpatch by Barry Hawkins <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add full qualification to declaration of ConnectionPool class. + +--- commons-httpclient-2.0.2.orig/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java ++++ commons-httpclient-2.0.2/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java +@@ -834,7 +834,7 @@ + private static class ConnectionSource { + + /** The connection pool that created the connection */ +- public ConnectionPool connectionPool; ++ public MultiThreadedHttpConnectionManager.ConnectionPool connectionPool; + + /** The connection's host configuration */ + public HostConfiguration hostConfiguration; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-httpclient.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
