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 9397af1b73bb510b8916d7a5c808266cde210b96 Author: Damien Raude-Morvan <[email protected]> Date: Sun Nov 29 00:29:21 2009 +0000 * Add myself to Uploaders * Use quilt as patch system - Build-Depends on quilt - Add debian/README.source - Use CDBS patchsys-quilt.mk * New debian/patches/05_osgi_metadata.diff to include OSGi metadata in JAR (Closes: #558182) --- debian/README.source | 5 +++++ debian/changelog | 12 ++++++++++ debian/control | 7 ++++-- .../patches/00_build_xml_no_external_links.patch | 6 ++--- debian/patches/00list | 0 debian/patches/01_build_xml_version_jar.patch | 5 ++--- .../02_upstream_disable_examples_classes.patch | 5 ++--- ...stream_qualify_ConnectionPool_declaration.patch | 6 ++--- debian/patches/04_fix_classpath.patch | 5 ++--- debian/patches/05_osgi_metadata | 26 ++++++++++++++++++++++ debian/patches/series | 6 +++++ debian/rules | 2 +- 12 files changed, 67 insertions(+), 18 deletions(-) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..9dc3fca --- /dev/null +++ b/debian/README.source @@ -0,0 +1,5 @@ +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. + +See /usr/share/doc/quilt/README.source for a detailed explanation. diff --git a/debian/changelog b/debian/changelog index 436b342..274d5cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +commons-httpclient (3.1-9) unstable; urgency=low + + * Add myself to Uploaders + * Use quilt as patch system + - Build-Depends on quilt + - Add debian/README.source + - Use CDBS patchsys-quilt.mk + * New debian/patches/05_osgi_metadata.diff to include OSGi metadata + in JAR (Closes: #558182) + + -- Damien Raude-Morvan <[email protected]> Sun, 29 Nov 2009 01:06:18 +0100 + commons-httpclient (3.1-8) unstable; urgency=low [Damien Raude-Morvan] diff --git a/debian/control b/debian/control index 24ac2a2..942da59 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,11 @@ Source: commons-httpclient Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Barry Hawkins <[email protected]>, Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]>, Kumar Appaiah <[email protected]>, Varun Hiremath <[email protected]>, Torsten Werner <[email protected]> -Build-Depends: debhelper (>= 7), cdbs +Uploaders: Barry Hawkins <[email protected]>, Arnaud Vandyck <[email protected]>, + Michael Koch <[email protected]>, Kumar Appaiah <[email protected]>, + Varun Hiremath <[email protected]>, Torsten Werner <[email protected]>, + Damien Raude-Morvan <[email protected]> +Build-Depends: debhelper (>= 7), cdbs, quilt Build-Depends-Indep: maven-repo-helper, ant, default-jdk, libcommons-codec-java, libcommons-logging-java, junit Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-httpclient diff --git a/debian/patches/00_build_xml_no_external_links.patch b/debian/patches/00_build_xml_no_external_links.patch index ccbb2a6..81f2ed9 100644 --- a/debian/patches/00_build_xml_no_external_links.patch +++ b/debian/patches/00_build_xml_no_external_links.patch @@ -1,6 +1,6 @@ ---- build.xml~ 2006-07-31 15:00:28.000000000 +0000 -+++ build.xml 2006-07-31 15:07:12.000000000 +0000 -@@ -251,8 +251,6 @@ +--- a/build.xml ++++ b/build.xml +@@ -250,8 +250,6 @@ bottom ="Copyright (c) 1999-2005 - Apache Software Foundation" > <classpath refid="test.classpath"/> diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index e69de29..0000000 diff --git a/debian/patches/01_build_xml_version_jar.patch b/debian/patches/01_build_xml_version_jar.patch index 241103d..95b7a5e 100644 --- a/debian/patches/01_build_xml_version_jar.patch +++ b/debian/patches/01_build_xml_version_jar.patch @@ -1,6 +1,5 @@ -diff -Nur commons-httpclient-3.1/build.xml commons-httpclient-3.1.new/build.xml ---- commons-httpclient-3.1/build.xml 2007-08-18 14:32:14.000000000 +0530 -+++ commons-httpclient-3.1.new/build.xml 2007-09-19 11:12:49.000000000 +0530 +--- a/build.xml ++++ b/build.xml @@ -149,7 +149,7 @@ <copy file="build.xml" todir="${dist.home}"/> <copy file="build.properties.sample" todir="${dist.home}"/> diff --git a/debian/patches/02_upstream_disable_examples_classes.patch b/debian/patches/02_upstream_disable_examples_classes.patch index dc8812a..dc795c5 100644 --- a/debian/patches/02_upstream_disable_examples_classes.patch +++ b/debian/patches/02_upstream_disable_examples_classes.patch @@ -1,6 +1,5 @@ -diff -Nur commons-httpclient-3.1/build.xml commons-httpclient-3.1.new/build.xml ---- commons-httpclient-3.1/build.xml 2007-09-19 11:14:00.000000000 +0530 -+++ commons-httpclient-3.1.new/build.xml 2007-09-19 11:15:15.000000000 +0530 +--- a/build.xml ++++ b/build.xml @@ -188,7 +188,8 @@ destdir ="${build.home}/examples" debug ="${compile.debug}" diff --git a/debian/patches/03_upstream_qualify_ConnectionPool_declaration.patch b/debian/patches/03_upstream_qualify_ConnectionPool_declaration.patch index e82d4a1..557f5c0 100755 --- a/debian/patches/03_upstream_qualify_ConnectionPool_declaration.patch +++ b/debian/patches/03_upstream_qualify_ConnectionPool_declaration.patch @@ -1,6 +1,6 @@ ---- 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 @@ +--- a/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java ++++ b/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java +@@ -1025,7 +1025,7 @@ private static class ConnectionSource { /** The connection pool that created the connection */ diff --git a/debian/patches/04_fix_classpath.patch b/debian/patches/04_fix_classpath.patch index 453a32e..9ec0905 100644 --- a/debian/patches/04_fix_classpath.patch +++ b/debian/patches/04_fix_classpath.patch @@ -1,6 +1,5 @@ -diff -Nur -x '*.orig' -x '*~' commons-httpclient-3.1/src/conf/MANIFEST.MF commons-httpclient-3.1.new/src/conf/MANIFEST.MF ---- commons-httpclient-3.1/src/conf/MANIFEST.MF 2007-08-18 14:32:14.000000000 +0530 -+++ commons-httpclient-3.1.new/src/conf/MANIFEST.MF 2009-11-05 09:52:00.000000000 +0530 +--- a/src/conf/MANIFEST.MF ++++ b/src/conf/MANIFEST.MF @@ -3,4 +3,4 @@ Specification-Version: 1.0 Implementation-Vendor: Apache Software Foundation diff --git a/debian/patches/05_osgi_metadata b/debian/patches/05_osgi_metadata new file mode 100644 index 0000000..71e8636 --- /dev/null +++ b/debian/patches/05_osgi_metadata @@ -0,0 +1,26 @@ +--- a/src/conf/MANIFEST.MF ++++ b/src/conf/MANIFEST.MF +@@ -4,3 +4,23 @@ + Implementation-Vendor: Apache Software Foundation + Implementation-Version: @version@ + Class-Path: commons-codec.jar commons-logging.jar commons-logging-api.jar commons-logging-adapters.jar ++Bundle-Vendor: HTTPClient ++Bundle-Localization: plugin ++Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.2 ++Bundle-Name: HTTPClient ++Bundle-SymbolicName: org.apache.commons.httpclient ++Export-Package: org.apache.commons.httpclient;version="3.1.0",org.apac ++ he.commons.httpclient.auth;version="3.1.0",org.apache.commons.httpcli ++ ent.cookie;version="3.1.0",org.apache.commons.httpclient.methods;vers ++ ion="3.1.0",org.apache.commons.httpclient.methods.multipart;version=" ++ 3.1.0",org.apache.commons.httpclient.params;version="3.1.0",org.apach ++ e.commons.httpclient.protocol;version="3.1.0",org.apache.commons.http ++ client.util;version="3.1.0" ++Bundle-Version: 3.1.0 ++Bundle-ManifestVersion: 2 ++Import-Package: javax.crypto;resolution:=optional,javax.crypto.spec;re ++ solution:=optional,javax.net;resolution:=optional,javax.net.ssl;resol ++ ution:=optional,org.apache.commons.codec;version="[1.2.0,2.0.0)",org. ++ apache.commons.codec.binary;version="[1.2.0,2.0.0)",org.apache.common ++ s.codec.net;version="[1.2.0,2.0.0)",org.apache.commons.logging;versio ++ n="[1.0.4,2.0.0)" diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..2b408aa --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,6 @@ +00_build_xml_no_external_links.patch +01_build_xml_version_jar.patch +02_upstream_disable_examples_classes.patch +03_upstream_qualify_ConnectionPool_declaration.patch +04_fix_classpath.patch +05_osgi_metadata diff --git a/debian/rules b/debian/rules index a652498..c869621 100755 --- a/debian/rules +++ b/debian/rules @@ -2,8 +2,8 @@ # debian/rules for libcommons-httpclient-java (uses CDBS) include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) -- 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
