[SCM] httpcomponents-client: HTTP/1.1 compliant HTTP agent Java implementation branch, master, updated. debian/4.2.5-1-1-g54e3e1c

[Jakub Adam]

The following commit has been merged in the master branch:
commit 54e3e1c2bdd97a64aaa64e09b07e0dfe02424e8c
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Jul 2 14:13:44 2013 +0200

    Fix OSGi metadata generation

diff --git a/debian/changelog b/debian/changelog
index ea904b6..bb8af87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+httpcomponents-client (4.2.5-2) UNRELEASED; urgency=low
+
+  * Fix OSGi metadata generation.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 02 Jul 2013 14:12:53 +0200
+
 httpcomponents-client (4.2.5-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/01-generate_osgi_metadata.patch b/debian/patches/01-generate_osgi_metadata.patch
index 0f1e29e..ff108ec 100644
--- a/debian/patches/01-generate_osgi_metadata.patch
+++ b/debian/patches/01-generate_osgi_metadata.patch
@@ -3,9 +3,11 @@ Date: Wed, 28 Mar 2012 22:20:33 +0200
 Subject: generate-osgi-metadata
 
 ---
- httpclient/pom.xml |   67 ++++++++++++++++++++++++++++++++++++++++++++++-----
- 1 files changed, 60 insertions(+), 7 deletions(-)
+ httpclient/pom.xml |   39 ++++++++++++++++++++++++++++++++-------
+ 1 file changed, 32 insertions(+), 7 deletions(-)
 
+diff --git a/httpclient/pom.xml b/httpclient/pom.xml
+index 9f95614..e780c9a 100644
 --- a/httpclient/pom.xml
 +++ b/httpclient/pom.xml
 @@ -103,13 +103,11 @@
@@ -27,7 +29,7 @@ Subject: generate-osgi-metadata
        </plugin>
        <plugin>
          <groupId>com.atlassian.maven.plugins</groupId>
-@@ -129,6 +127,61 @@
+@@ -129,6 +127,33 @@
            </execution>
          </executions>
        </plugin>
@@ -50,37 +52,9 @@ Subject: generate-osgi-metadata
 +            <Bundle-Name>Apache ${project.name}</Bundle-Name>
 +            <Bundle-SymbolicName>${project.groupId}.httpclient</Bundle-SymbolicName>
 +            <Bundle-Version>${debian.originalVersion}</Bundle-Version>
-+            <_exportcontents>
-+            org.apache.http.auth.*;version=${debian.originalVersion},
-+            org.apache.http.cookie.*;version=${debian.originalVersion},
-+            org.apache.http.conn.*;version=${debian.originalVersion},
-+            org.apache.http.client.*;version=${debian.originalVersion},
-+            org.apache.http.entity.mime.*;version=${debian.originalVersion},
-+            org.apache.http.impl.auth.*;version=${debian.originalVersion},
-+            org.apache.http.impl.cookie.*;version=${debian.originalVersion},
-+            org.apache.http.impl.conn.*;version=${debian.originalVersion},
-+            org.apache.http.impl.client.*;version=${debian.originalVersion}
-+            </_exportcontents>
-+            <Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
-+            <Import-Package>
-+            javax.crypto,
-+            javax.crypto.spec,
-+            javax.net.ssl,javax.security.auth.x500,
-+            org.ietf.jgss,
-+            org.apache.commons.logging,
-+            org.apache.http,
-+            org.apache.http.entity,
-+            org.apache.http.io,
-+            org.apache.http.message,
-+            org.apache.http.params,
-+            org.apache.http.protocol,
-+            org.apache.http.util,
-+            org.apache.http.impl,
-+            org.apache.http.impl.entity,
-+            org.apache.http.impl.io,
-+            net.sf.ehcache.*;resolution:=optional,
-+            net.spy.memcached.*;resolution:=optional
-+            </Import-Package>
++            <Export-Package>org.apache.http.auth.*,org.apache.http.client.*,org.apache.http.conn.*,org.apache.http.cookie.*,org.apache.http.impl.auth*,org.apache.http.impl.client*,org.apache.http.impl.conn*,org.apache.http.impl.cookie*</Export-Package>
++            <Private-Package></Private-Package>
++            <_nouses>true</_nouses>
 +            <!-- Stop the JAVA_1_n_HOME variables from being treated as headers by Bnd -->
 +            <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME</_removeheaders>
 +          </instructions>

-- 
httpcomponents-client: HTTP/1.1 compliant HTTP agent Java implementation