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 bdf6580213b16e8c10d7c01ace7148f11b76ab4c Author: Arnaud Vandyck <[email protected]> Date: Tue Aug 1 08:52:52 2006 +0000 commons-httpclient (3.0.1-0) unstable; urgency=low * New upstream (closes: #340307) * Build with cdbs and java-gcj-compat-dev * Updated to Standards-Version 3.7.2; split build-dep and build-dep-indep. * Added libcommons-codec-java to build-dep. * Using simple-patchsys and no more dpatch -- Arnaud Vandyck <[email protected]> Mon, 31 Jul 2006 17:11:32 +0200 --- debian/ant.properties | 7 +- debian/changelog | 11 ++ debian/control | 9 +- debian/libcommons-httpclient-java.links | 2 +- .../patches/00_build_xml_no_external_links.patch | 11 ++ .../patches/00b_build_xml_dont_copy_lib_dir.patch | 15 +++ .../01_upstream_disable_examples_classes.dpatch | 19 --- .../02_upstream_disable_examples_classes.patch | 12 ++ ...tream_qualify_ConnectionPool_declaration.patch} | 10 +- debian/rules | 128 ++++++--------------- debian/watch | 2 + 11 files changed, 95 insertions(+), 131 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties index b3b6ce5..a306fc0 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -1,6 +1,3 @@ - -# 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 +lib.dir=/usr/shhare/java +#jsse.jar=/usr/share/java/jsse.jar diff --git a/debian/changelog b/debian/changelog index 09a8baa..7f2d932 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +commons-httpclient (3.0.1-0) unstable; urgency=low + + * New upstream (closes: #340307) + * Build with cdbs and java-gcj-compat-dev + * Updated to Standards-Version 3.7.2; split build-dep and + build-dep-indep. + * Added libcommons-codec-java to build-dep. + * Using simple-patchsys and no more dpatch + + -- Arnaud Vandyck <[email protected]> Mon, 31 Jul 2006 17:11:32 +0200 + commons-httpclient (2.0.2-2) unstable; urgency=low * Provide non-version-specific symlink "commons-httpclient.jar" to diff --git a/debian/control b/debian/control index 0883f95..c03ac82 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,15 @@ Source: commons-httpclient Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Barry Hawkins <[email protected]> -Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 1.11), ant (>= 1.6.5-1), libcommons-logging-java, jikes (>= 1.15), kaffe (>= 2:1.1.5-3), junit -Standards-Version: 3.6.2.1 +Uploaders: Barry Hawkins <[email protected]>, Arnaud Vandyck <[email protected]> +Build-Depends: debhelper (>= 4.0.0), cdbs +Build-Depends-Indep: dpatch (>= 1.11), ant (>= 1.6.5-1), libcommons-logging-java, junit, java-gcj-compat-dev, libcommons-codec-java +Standards-Version: 3.7.2 Package: libcommons-httpclient-java Architecture: all Suggests: libcommons-httpclient-java-doc -Depends: kaffe (>=2:1.1.5) | java2-runtime, libcommons-logging-java +Depends: kaffe (>=2:1.1.5) | java-gcj-compat | java2-runtime, libcommons-logging-java, libcommons-codec-java Description: A Java(TM) library for creating HTTP clients The Jakarta Commons HTTPClient library provides an efficient, up-to-date, and feature-rich package implementing the client side of diff --git a/debian/libcommons-httpclient-java.links b/debian/libcommons-httpclient-java.links index 80e7dd9..706590b 100644 --- a/debian/libcommons-httpclient-java.links +++ b/debian/libcommons-httpclient-java.links @@ -1 +1 @@ -usr/share/java/commons-httpclient-2.0.2.jar usr/share/java/commons-httpclient.jar +usr/share/java/commons-httpclient-3.0.1.jar usr/share/java/commons-httpclient.jar diff --git a/debian/patches/00_build_xml_no_external_links.patch b/debian/patches/00_build_xml_no_external_links.patch new file mode 100644 index 0000000..ccbb2a6 --- /dev/null +++ b/debian/patches/00_build_xml_no_external_links.patch @@ -0,0 +1,11 @@ +--- build.xml~ 2006-07-31 15:00:28.000000000 +0000 ++++ build.xml 2006-07-31 15:07:12.000000000 +0000 +@@ -251,8 +251,6 @@ + bottom ="Copyright (c) 1999-2005 - Apache Software Foundation" + > + <classpath refid="test.classpath"/> +- <link href="${javadoc.j2sdk.link}"/> +- <link href="${javadoc.logging.link}"/> + </javadoc> + </target> + diff --git a/debian/patches/00b_build_xml_dont_copy_lib_dir.patch b/debian/patches/00b_build_xml_dont_copy_lib_dir.patch new file mode 100644 index 0000000..45371fb --- /dev/null +++ b/debian/patches/00b_build_xml_dont_copy_lib_dir.patch @@ -0,0 +1,15 @@ +--- build.xml~ 2006-08-01 08:16:13.000000000 +0000 ++++ build.xml 2006-08-01 08:31:01.000000000 +0000 +@@ -158,10 +158,10 @@ + <copy todir="${dist.home}/src" filtering="on"> + <fileset dir="${source.home}"/> + </copy> +- <mkdir dir="${dist.home}/lib"/> ++ <!-- mkdir dir="${dist.home}/lib"/> + <copy todir="${dist.home}/lib"> + <fileset dir="lib"/> +- </copy> ++ </copy --> + </target> + + <!-- ========== Targets: "External" Targets: Clean-up ===================== --> diff --git a/debian/patches/01_upstream_disable_examples_classes.dpatch b/debian/patches/01_upstream_disable_examples_classes.dpatch deleted file mode 100755 index bec500b..0000000 --- a/debian/patches/01_upstream_disable_examples_classes.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /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_disable_examples_classes.patch b/debian/patches/02_upstream_disable_examples_classes.patch new file mode 100644 index 0000000..5137046 --- /dev/null +++ b/debian/patches/02_upstream_disable_examples_classes.patch @@ -0,0 +1,12 @@ +--- commons-httpclient-3.0.1.orig/build.xml ++++ commons-httpclient-3.0.1/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/03_upstream_qualify_ConnectionPool_declaration.patch similarity index 53% rename from debian/patches/02_upstream_qualify_ConnectionPool_declaration.dpatch rename to debian/patches/03_upstream_qualify_ConnectionPool_declaration.patch index 8a0f198..e82d4a1 100755 --- a/debian/patches/02_upstream_qualify_ConnectionPool_declaration.dpatch +++ b/debian/patches/03_upstream_qualify_ConnectionPool_declaration.patch @@ -1,11 +1,5 @@ -#! /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 +--- commons-httpclient-3.0.1.orig/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java ++++ commons-httpclient-3.0.1/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java @@ -834,7 +834,7 @@ private static class ConnectionSource { diff --git a/debian/rules b/debian/rules index 45ca0a4..1169d76 100755 --- a/debian/rules +++ b/debian/rules @@ -1,100 +1,40 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. +# debian/rules for libcommons-httpclient-java (uses CDBS) # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# Include dpatch stuff per the documentation -include /usr/share/dpatch/dpatch.make +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk +#include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +JAVA_HOME := /usr/lib/jvm/java-gcj +DEB_JARS := junit commons-logging commons-codec +DEB_ANT_BUILD_TARGET := dist #compile doc + +DEB_INSTALL_DIRS_ALL := usr/share/java usr/share/sgml/apache/jakarta/validator +DEB_INSTALL_DOCS_ALL := RELEASE_NOTES dist/docs/* + +LIBRARY=commons-httpclient +VERSION=3.0.1 +JARFILE=$(LIBRARY)-${VERSION}.jar + +#debian/ssl-stub/ssl-stub.jar: +# # OK, we need the JSSE for this to compile. But we can't +# # redistribute JSSE, and can't require it for the build. So +# # this is a workaround, creating stub classes for this compilation. +# (cd debian/ssl-stub; $(ANT)) + +#install/lib${LIBRARY}-java:: +# # Add here commands to install the package into debian/commons-httpclient. +# ${JAVA_HOME}/bin/jar cf \ +# $(CURDIR)/debian/lib${LIBRARY}-java/usr/share/java/${JARFILE} \ +# -C target/classes org +# +# # Build the documentation +# mkdir -p $(CURDIR)/debian/lib${PNAME}-java-doc/usr/share/doc/lib${PNAME}-java-doc/ +# cp -aRf dist/docs/api $(CURDIR)/debian/lib${PNAME}-java-doc/usr/share/doc/lib${PNAME}-java-doc/ +# +# dh_movefiles --sourcedir=debian/lib${PNAME}-java -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 - -# Set the invocation of the java command -JAVACMD=$(JAVA_HOME)/bin/java - -JAVA_LIB=/usr/share/java -ANT_HOME=/usr/share/ant -ANT_CLASSPATH=.:$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/commons-logging.jar:$(JAVA_LIB)/junit.jar:/usr/share/kaffe/Klasses.jar - -# Set path to Ant properties file -ANT_PROPS=debian/ant.properties - -# Universal Ant invocation for reliable builds; -# place '-verbose' before -propertyfile to -# obtain detailed build output. -ANT=$(JAVACMD) -classpath $(ANT_CLASSPATH) \ - org.apache.tools.ant.Main -verbose -propertyfile $(ANT_PROPS) - -export JAVAC=jikes - -debian/ssl-stub/ssl-stub.jar: - # OK, we need the JSSE for this to compile. But we can't - # redistribute JSSE, and can't require it for the build. So - # this is a workaround, creating stub classes for this compilation. - (cd debian/ssl-stub; $(ANT)) - -build: build-stamp - -build-stamp: patch-stamp debian/ssl-stub/ssl-stub.jar - dh_testdir - - # Normally we could do just 'ant dist', but this subproject - # doesn't build all by itself. - $(ANT) compile doc - - touch build-stamp - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp - - $(ANT) clean - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/commons-httpclient. - ${JAVA_HOME}/bin/jar cf \ - $(CURDIR)/debian/lib${PNAME}-java/usr/share/java/${JARFILE} \ - -C target/classes org - - # Build the documentation - mkdir -p $(CURDIR)/debian/lib${PNAME}-java-doc/usr/share/doc/lib${PNAME}-java-doc/ - cp -aRf dist/docs/api $(CURDIR)/debian/lib${PNAME}-java-doc/usr/share/doc/lib${PNAME}-java-doc/ - - dh_movefiles --sourcedir=debian/lib${PNAME}-java - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installdocs -i - dh_installexamples -i - dh_installmenu -i - dh_installchangelogs -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: build install -# We have nothing to do by default. - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..95dc659 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://www.apache.org/dist/jakarta/commons/httpclient/source/commons-httpclient-([0-9\.]*)-src\.tar\.gz debian uupdate -- 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
