[pkg-java] r16394 - trunk/wsdl4j/debian

[Jakub Adam]

Author: xhaakon-guest
Date: 2013-01-23 21:22:40 +0000 (Wed, 23 Jan 2013)
New Revision: 16394

Added:
   trunk/wsdl4j/debian/wsdl4j.bnd
Removed:
   trunk/wsdl4j/debian/manifest
Modified:
   trunk/wsdl4j/debian/changelog
   trunk/wsdl4j/debian/control
   trunk/wsdl4j/debian/rules
Log:
Use bnd to generate OSGi metadata

Modified: trunk/wsdl4j/debian/changelog
===================================================================
--- trunk/wsdl4j/debian/changelog	2013-01-23 21:20:33 UTC (rev 16393)
+++ trunk/wsdl4j/debian/changelog	2013-01-23 21:22:40 UTC (rev 16394)
@@ -16,6 +16,7 @@
     - 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
 

Modified: trunk/wsdl4j/debian/control
===================================================================
--- trunk/wsdl4j/debian/control	2013-01-23 21:20:33 UTC (rev 16393)
+++ trunk/wsdl4j/debian/control	2013-01-23 21:22:40 UTC (rev 16394)
@@ -5,7 +5,7 @@
 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

Deleted: trunk/wsdl4j/debian/manifest
===================================================================
--- trunk/wsdl4j/debian/manifest	2013-01-23 21:20:33 UTC (rev 16393)
+++ trunk/wsdl4j/debian/manifest	2013-01-23 21:22:40 UTC (rev 16394)
@@ -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

Modified: trunk/wsdl4j/debian/rules
===================================================================
--- trunk/wsdl4j/debian/rules	2013-01-23 21:20:33 UTC (rev 16393)
+++ trunk/wsdl4j/debian/rules	2013-01-23 21:22:40 UTC (rev 16394)
@@ -7,6 +7,9 @@
 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

Added: trunk/wsdl4j/debian/wsdl4j.bnd
===================================================================
--- trunk/wsdl4j/debian/wsdl4j.bnd	                        (rev 0)
+++ trunk/wsdl4j/debian/wsdl4j.bnd	2013-01-23 21:22:40 UTC (rev 16394)
@@ -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: *