[commons-httpclient] 01/10: Fix Manifest file and add missing OSGi metadata.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository commons-httpclient.

commit 80c2869b6f62682a120f7c48f5fe3344c20ac620
Author: Markus Koschany <apo at debian.org>
Date:   Thu Feb 1 21:13:23 2018 +0100

    Fix Manifest file and add missing OSGi metadata.
    
    Closes: #871142
---
 debian/control                             |  1 +
 debian/libcommons-httpclient-java.manifest | 24 ++++++++++++++++++++++++
 debian/patches/05_osgi_metadata            | 26 --------------------------
 debian/patches/series                      |  1 -
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/debian/control b/debian/control
index a56c255..a24a2c5 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Uploaders:
 Build-Depends:
  debhelper (>= 10),
  default-jdk,
+ javahelper,
  junit,
  libcommons-codec-java,
  libcommons-logging-java,
diff --git a/debian/libcommons-httpclient-java.manifest b/debian/libcommons-httpclient-java.manifest
new file mode 100644
index 0000000..abd2bb6
--- /dev/null
+++ b/debian/libcommons-httpclient-java.manifest
@@ -0,0 +1,24 @@
+usr/share/java/commons-httpclient.jar:
+ Implementation-Vendor: Apache Software Foundation
+ Implementation-Version: 1.8
+ 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/05_osgi_metadata b/debian/patches/05_osgi_metadata
deleted file mode 100644
index 71e8636..0000000
--- a/debian/patches/05_osgi_metadata
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
index 82e5c72..e585422 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
 02_upstream_disable_examples_classes.patch
 03_upstream_qualify_ConnectionPool_declaration.patch
 04_fix_classpath.patch
-05_osgi_metadata
 06_fix_CVE-2012-5783.patch
 CVE-2014-3577.patch
 CVE-2015-5262.patch

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