[commons-httpclient] 14/66: Added patches to accommodate and remove modifications to original source code.

[Emmanuel Bourg]

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 abba68265c33cccca4622576a00ffe98c1b4a89e
Author: Barry Hawkins <barry.hawkins at gmail.com>
Date:   Wed Sep 14 04:11:08 2005 +0000

    Added patches to accommodate and remove modifications to original source code.
---
 debian/ant.properties                                 |  3 +++
 debian/changelog                                      |  3 +--
 debian/libcommons-httpclient-java-doc.doc-base        |  6 ++----
 debian/patches/00list                                 |  1 +
 .../01_upstream_disable_examples_classes.dpatch       | 19 +++++++++++++++++++
 ...upstream_qualify_ConnectionPool_declaration.dpatch | 17 +++++++++++++++++
 debian/rules                                          | 10 ++++++----
 7 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index 749b8c9..b3b6ce5 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,3 +1,6 @@
 
+# Compiler to be used by Ant during build
 build.compiler=jikes
+
+# JSSE stub classes required for build
 jsse.jar=debian/ssl-stub/ssl-stub.jar
diff --git a/debian/changelog b/debian/changelog
index 0045ce2..717da8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ commons-httpclient (2.0.2-1) unstable; urgency=low
   * Package updated to reflect maintainership under Debian Java 
     Maintainers
 
- -- Barry Hawkins <barry at bytemason.org>  Fri, 02 Sep 2005 02:17:52 -0400
+ -- Barry Hawkins <barry at bytemason.org>  Tue, 13 Sep 2005 23:14:01 -0400
 
 commons-httpclient (2.0a1+20020904-1) unstable; urgency=low
 
@@ -18,4 +18,3 @@ commons-httpclient (2.0a1-1) unstable; urgency=low
   * Initial Release.
 
  -- Stephen Peters <portnoy at portnoy.org>  Wed,  1 May 2002 13:31:44 -0400
-  
diff --git a/debian/libcommons-httpclient-java-doc.doc-base b/debian/libcommons-httpclient-java-doc.doc-base
index c74ed0d..bd4c7ce 100644
--- a/debian/libcommons-httpclient-java-doc.doc-base
+++ b/debian/libcommons-httpclient-java-doc.doc-base
@@ -5,7 +5,5 @@ Abstract: This is the API Javadoc for the.Apache Jakarta Commons HttpClient Libr
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libcommons-httpclient-java/api/index.html
-Files: /usr/share/doc/libcommons-httpclient-java/api/*.html
-
-  
+Index: /usr/share/doc/libcommons-httpclient-java-doc/api/index.html
+Files: /usr/share/doc/libcommons-httpclient-java-doc/api/*.html
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..d3542d7
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+01_upstream_disable_examples_classes
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 <barry at bytemason.org>
+##
+## 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 <barry at bytemason.org>
+##
+## 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;
diff --git a/debian/rules b/debian/rules
index 9426736..1bf2de6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Include dpatch stuff per the documentation
+include /usr/share/dpatch/dpatch.make
+
 PNAME=commons-httpclient
 VERSION=2.0.2
 JARFILE=$(PNAME)-${VERSION}.jar
 BUILDFILE=build.xml
 
-
 # Set the JAVA_HOME to be used for Java commands
 JAVA_HOME=/usr/lib/kaffe
 
@@ -39,7 +41,8 @@ debian/ssl-stub/ssl-stub.jar:
 	(cd debian/ssl-stub; $(ANT))
 
 build: build-stamp
-build-stamp: debian/ssl-stub/ssl-stub.jar
+
+build-stamp: patch-stamp debian/ssl-stub/ssl-stub.jar
 	dh_testdir
 
 	# Normally we could do just 'ant dist', but this subproject
@@ -48,13 +51,12 @@ build-stamp: debian/ssl-stub/ssl-stub.jar
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
 
 	$(ANT) clean
-
 	dh_clean
 
 install: build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-httpclient.git