[httpcomponents-client] 03/09: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon May 11 13:50:14 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag debian/4.4.1-1
in repository httpcomponents-client.

commit 041ea663c8c55bbddcd674eb73658c78f658d6de
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 11 14:17:26 2015 +0200

    Refreshed the patches
---
 debian/changelog                               | 7 +++++++
 debian/patches/00-fix_build.patch              | 3 ++-
 debian/patches/01-generate_osgi_metadata.patch | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e25e08..de2504b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+httpcomponents-client (4.4.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 04 May 2015 15:06:59 +0200
+
 httpcomponents-client (4.3.5-2) unstable; urgency=medium
 
   * Fix FTBFS due to new artifact version for libmaven-bundle-plugin-java.
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
index d666a2d..d955e65 100644
--- a/debian/patches/00-fix_build.patch
+++ b/debian/patches/00-fix_build.patch
@@ -3,11 +3,12 @@ Author: David Paleino <dapal at debian.org>
 Forwarded: no
 --- a/pom.xml
 +++ b/pom.xml
-@@ -165,8 +165,6 @@
+@@ -153,9 +153,6 @@
      <module>httpclient</module>
      <module>httpmime</module>
      <module>fluent-hc</module>
 -    <module>httpclient-cache</module>
+-    <module>httpclient-win</module>
 -    <module>httpclient-osgi</module>
    </modules>
  
diff --git a/debian/patches/01-generate_osgi_metadata.patch b/debian/patches/01-generate_osgi_metadata.patch
index d899264..13c2e22 100644
--- a/debian/patches/01-generate_osgi_metadata.patch
+++ b/debian/patches/01-generate_osgi_metadata.patch
@@ -8,7 +8,7 @@ Subject: generate-osgi-metadata
 
 --- a/httpclient/pom.xml
 +++ b/httpclient/pom.xml
-@@ -98,13 +98,38 @@
+@@ -117,13 +117,38 @@
        </plugin>
        <plugin>
          <artifactId>maven-jar-plugin</artifactId>

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



More information about the pkg-java-commits mailing list