[pkg-java] r18731 - trunk/axis/debian

[Markus Koschany]

Author: apo-guest
Date: 2015-06-04 17:42:23 +0000 (Thu, 04 Jun 2015)
New Revision: 18731

Modified:
   trunk/axis/debian/changelog
   trunk/axis/debian/rules
Log:
Transition to bnd 2.1.0


Modified: trunk/axis/debian/changelog
===================================================================
--- trunk/axis/debian/changelog	2015-06-04 07:35:52 UTC (rev 18730)
+++ trunk/axis/debian/changelog	2015-06-04 17:42:23 UTC (rev 18731)
@@ -1,3 +1,11 @@
+axis (1.4-23) unstable; urgency=medium
+
+  * Team upload.
+  * debian/rules: Update BND parameters due to the transition to bnd version
+    2.1.0 and fix build failures.
+
+ -- Markus Koschany <apo at gambaru.de>  Thu, 04 Jun 2015 15:46:21 +0200
+
 axis (1.4-22) unstable; urgency=medium
 
   * Updated the dependency on the Servlet API (3.0 -> 3.1)

Modified: trunk/axis/debian/rules
===================================================================
--- trunk/axis/debian/rules	2015-06-04 07:35:52 UTC (rev 18730)
+++ trunk/axis/debian/rules	2015-06-04 17:42:23 UTC (rev 18731)
@@ -13,14 +13,14 @@
 common-post-build-indep::
 	for BNDFILE in debian/*.bnd; do \
 		JARPATH=build/lib/`basename $$BNDFILE .bnd`.jar; \
-		bnd wrap -properties $$BNDFILE -output $$JARPATH $$JARPATH; \
+		bnd wrap --properties $$BNDFILE --output debian/tmp/`basename $$BNDFILE .bnd`.jar $$JARPATH; \
 	done
 
 install/libaxis-java::
 	mh_installpoms -plibaxis-java -e$(DEB_UPSTREAM_VERSION)
-	mh_installjar -plibaxis-java -l debian/poms/axis.xml build/lib/axis.jar
-	mh_installjar -plibaxis-java -l debian/poms/saaj.xml build/lib/saaj.jar
-	mh_installjar -plibaxis-java -l debian/poms/jaxrpc.xml build/lib/jaxrpc.jar
+	mh_installjar -plibaxis-java -l debian/poms/axis.xml debian/tmp/axis.jar
+	mh_installjar -plibaxis-java -l debian/poms/saaj.xml debian/tmp/saaj.jar
+	mh_installjar -plibaxis-java -l debian/poms/jaxrpc.xml debian/tmp/jaxrpc.jar
 	mh_installjar -plibaxis-java -l debian/poms/ant.xml build/lib/axis-ant.jar
 
 install/libaxis-java-doc::