[pkg-java] r11159 - in trunk/commons-httpclient/debian: . patches

Damien Raude-Morvan drazzib at alioth.debian.org
Sun Nov 29 00:29:21 UTC 2009 

Author: drazzib
Date: 2009-11-29 00:29:21 +0000 (Sun, 29 Nov 2009)
New Revision: 11159

Added:
   trunk/commons-httpclient/debian/README.source
   trunk/commons-httpclient/debian/patches/05_osgi_metadata
   trunk/commons-httpclient/debian/patches/series
Removed:
   trunk/commons-httpclient/debian/patches/00list
Modified:
   trunk/commons-httpclient/debian/changelog
   trunk/commons-httpclient/debian/control
   trunk/commons-httpclient/debian/patches/00_build_xml_no_external_links.patch
   trunk/commons-httpclient/debian/patches/01_build_xml_version_jar.patch
   trunk/commons-httpclient/debian/patches/02_upstream_disable_examples_classes.patch
   trunk/commons-httpclient/debian/patches/03_upstream_qualify_ConnectionPool_declaration.patch
   trunk/commons-httpclient/debian/patches/04_fix_classpath.patch
   trunk/commons-httpclient/debian/rules
Log:
* 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)

Added: trunk/commons-httpclient/debian/README.source
===================================================================
--- trunk/commons-httpclient/debian/README.source	                        (rev 0)
+++ trunk/commons-httpclient/debian/README.source	2009-11-29 00:29:21 UTC (rev 11159)
@@ -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.

Modified: trunk/commons-httpclient/debian/changelog
===================================================================
--- trunk/commons-httpclient/debian/changelog	2009-11-29 00:29:17 UTC (rev 11158)
+++ trunk/commons-httpclient/debian/changelog	2009-11-29 00:29:21 UTC (rev 11159)
@@ -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 <drazzib at debian.org>  Sun, 29 Nov 2009 01:06:18 +0100
+
 commons-httpclient (3.1-8) unstable; urgency=low
 
   [Damien Raude-Morvan]

Modified: trunk/commons-httpclient/debian/control
===================================================================
--- trunk/commons-httpclient/debian/control	2009-11-29 00:29:17 UTC (rev 11158)
+++ trunk/commons-httpclient/debian/control	2009-11-29 00:29:21 UTC (rev 11159)
@@ -2,8 +2,11 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Barry Hawkins <barry at alltc.com>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Kumar Appaiah <akumar at debian.org>, Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 7), cdbs
+Uploaders: Barry Hawkins <barry at alltc.com>, Arnaud Vandyck <avdyk at debian.org>,
+ Michael Koch <konqueror at gmx.de>, Kumar Appaiah <akumar at debian.org>,
+ Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>,
+ Damien Raude-Morvan <drazzib at debian.org>
+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

Modified: trunk/commons-httpclient/debian/patches/00_build_xml_no_external_links.patch
===================================================================
--- trunk/commons-httpclient/debian/patches/00_build_xml_no_external_links.patch	2009-11-29 00:29:17 UTC (rev 11158)
+++ trunk/commons-httpclient/debian/patches/00_build_xml_no_external_links.patch	2009-11-29 00:29:21 UTC (rev 11159)
@@ -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"/>

Modified: trunk/commons-httpclient/debian/patches/01_build_xml_version_jar.patch
===================================================================
--- trunk/commons-httpclient/debian/patches/01_build_xml_version_jar.patch	2009-11-29 00:29:17 UTC (rev 11158)
+++ trunk/commons-httpclient/debian/patches/01_build_xml_version_jar.patch	2009-11-29 00:29:21 UTC (rev 11159)
@@ -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}"/>

Modified: trunk/commons-httpclient/debian/patches/02_upstream_disable_examples_classes.patch
===================================================================
--- trunk/commons-httpclient/debian/patches/02_upstream_disable_examples_classes.patch	2009-11-29 00:29:17 UTC (rev 11158)
+++ trunk/commons-httpclient/debian/patches/02_upstream_disable_examples_classes.patch	2009-11-29 00:29:21 UTC (rev 11159)
@@ -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}"

Modified: trunk/commons-httpclient/debian/patches/03_upstream_qualify_ConnectionPool_declaration.patch
===================================================================
--- trunk/commons-httpclient/debian/patches/03_upstream_qualify_ConnectionPool_declaration.patch	2009-11-29 00:29:17 UTC (rev 11158)
+++ trunk/commons-httpclient/debian/patches/03_upstream_qualify_ConnectionPool_declaration.patch	2009-11-29 00:29:21 UTC (rev 11159)
@@ -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 */

Modified: trunk/commons-httpclient/debian/patches/04_fix_classpath.patch
===================================================================
--- trunk/commons-httpclient/debian/patches/04_fix_classpath.patch	2009-11-29 00:29:17 UTC (rev 11158)
+++ trunk/commons-httpclient/debian/patches/04_fix_classpath.patch	2009-11-29 00:29:21 UTC (rev 11159)
@@ -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

Added: trunk/commons-httpclient/debian/patches/05_osgi_metadata
===================================================================
--- trunk/commons-httpclient/debian/patches/05_osgi_metadata	                        (rev 0)
+++ trunk/commons-httpclient/debian/patches/05_osgi_metadata	2009-11-29 00:29:21 UTC (rev 11159)
@@ -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)"

Added: trunk/commons-httpclient/debian/patches/series
===================================================================
--- trunk/commons-httpclient/debian/patches/series	                        (rev 0)
+++ trunk/commons-httpclient/debian/patches/series	2009-11-29 00:29:21 UTC (rev 11159)
@@ -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

Modified: trunk/commons-httpclient/debian/rules
===================================================================
--- trunk/commons-httpclient/debian/rules	2009-11-29 00:29:17 UTC (rev 11158)
+++ trunk/commons-httpclient/debian/rules	2009-11-29 00:29:21 UTC (rev 11159)
@@ -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)

More information about the pkg-java-commits mailing list