[axis] 51/60: Transition to bnd 2.1.0

[Emmanuel Bourg]

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

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

commit 6b8fb695ab07178b63e3b124fe3591a040c65fe2
Author: Markus Koschany <apo at debian.org>
Date:   Thu Jun 4 17:42:23 2015 +0000

    Transition to bnd 2.1.0
---
 debian/changelog | 8 ++++++++
 debian/rules     | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8e876b..7ed003e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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)
diff --git a/debian/rules b/debian/rules
index 268fcbf..6a631f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,14 +13,14 @@ DEB_INSTALL_CHANGELOGS_ALL := changelog.html
 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::

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