[wsdl4j] 19/33: Use bnd to generate OSGi metadata

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository wsdl4j.

commit 9b7570dbe8c0e5a6d3daf2a4a190a925ea876727
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Jan 23 21:22:40 2013 +0000

    Use bnd to generate OSGi metadata
---
 debian/changelog  | 1 +
 debian/control    | 2 +-
 debian/manifest   | 8 --------
 debian/rules      | 3 +++
 debian/wsdl4j.bnd | 5 +++++
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f85d7ad..3932d9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ wsdl4j (1.6.2-5) UNRELEASED; urgency=low
     - Running 'compile' and 'dist' in sequence caused that JARs were
       built two times. Invoking 'compile' and 'javadocs' targets creates
       all the artefacts we need for out packaging.
+  * Use bnd to generate OSGi metadata.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 21 Jan 2013 19:21:12 +0100
 
diff --git a/debian/control b/debian/control
index acd4f81..6e553a8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Steffen Moeller <steffen_moeller at gmx.de>,
  Torsten Werner <twerner at debian.org>, Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: debhelper (>= 7), cdbs
-Build-Depends-Indep: ant, default-jdk, javahelper
+Build-Depends-Indep: ant, bnd, default-jdk, javahelper
 Standards-Version: 3.9.3
 Homepage: http://wsdl4j.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/wsdl4j
diff --git a/debian/manifest b/debian/manifest
deleted file mode 100644
index 7c599a4..0000000
--- a/debian/manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/share/java/wsdl4j.jar:
- Bundle-ManifestVersion: 2
- Bundle-SymbolicName: javax.wsdl
- Bundle-Version: 1.6
- Bundle-Vendor: IBM Corporation
- Bundle-Name: Web Services Description Language for Java
- Export-Package: javax.wsdl,javax.wsdl.extensions,javax.wsdl.extensions.http,javax.wsdl.extensions.mime,javax.wsdl.extensions.schema,javax.wsdl.extensions.soap,javax.wsdl.extensions.soap12,javax.wsdl.factory,javax.wsdl.xml,com.ibm.wsdl,com.ibm.wsdl.extensions,com.ibm.wsdl.extensions.http,com.ibm.wsdl.extensions.mime,com.ibm.wsdl.extensions.schema,com.ibm.wsdl.extensions.soap,com.ibm.wsdl.extensions.soap12,com.ibm.wsdl.factory,com.ibm.wsdl.util,com.ibm.wsdl.util.xml,com.ibm.wsdl.xml
- Require-Bundle: javax.xml
diff --git a/debian/rules b/debian/rules
index 5edbe7e..c47c4c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,9 @@ include /usr/share/cdbs/1/class/ant.mk
 JAVA_HOME 		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET	:= compile javadocs
 
+common-post-build-indep::
+	bnd wrap -properties debian/wsdl4j.bnd -output build/lib/wsdl4j.jar build/lib/wsdl4j.jar
+
 install/libwsdl4j-java::
 	install -m 644 -D build/lib/wsdl4j.jar debian/libwsdl4j-java/usr/share/java/wsdl4j-$(DEB_UPSTREAM_VERSION).jar
 	dh_link /usr/share/java/wsdl4j-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/wsdl4j.jar
diff --git a/debian/wsdl4j.bnd b/debian/wsdl4j.bnd
new file mode 100644
index 0000000..2a48fed
--- /dev/null
+++ b/debian/wsdl4j.bnd
@@ -0,0 +1,5 @@
+Bundle-Name: Web Services Description Language for Java
+Bundle-SymbolicName: javax.wsdl
+Bundle-Version: 1.6
+Bundle-Vendor: Debian.org
+Import-Package: *

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