[androidsdk-tools] 01/01: Transition to bnd 2.1.0.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository androidsdk-tools.

commit 6ce3d84f9715d3c8067521571b5e845bc8d4e169
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Jun 4 20:21:44 2015 +0200

    Transition to bnd 2.1.0.
    
    Switch to new bnd parameter syntax.
---
 debian/androidsdk-uiautomatorviewer.install          | 2 +-
 debian/changelog                                     | 8 ++++++++
 debian/libandroidsdk-common-java.install             | 2 +-
 debian/libandroidsdk-ddmlib-java.install             | 2 +-
 debian/libandroidsdk-ddmuilib-java.install           | 2 +-
 debian/libandroidsdk-hierarchyviewerlib-java.install | 2 +-
 debian/libandroidsdk-sdklib-java.install             | 2 +-
 debian/libandroidsdk-sdkstats-java.install           | 2 +-
 debian/rules                                         | 3 ++-
 9 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/debian/androidsdk-uiautomatorviewer.install b/debian/androidsdk-uiautomatorviewer.install
index 9629986..88da2f0 100644
--- a/debian/androidsdk-uiautomatorviewer.install
+++ b/debian/androidsdk-uiautomatorviewer.install
@@ -1,2 +1,2 @@
-androidsdk-uiautomatorviewer.jar usr/share/java
+debian/tmp/bnd/androidsdk-uiautomatorviewer.jar usr/share/java
 uiautomatorviewer/etc/uiautomatorviewer usr/bin
diff --git a/debian/changelog b/debian/changelog
index b15696c..5a871b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+androidsdk-tools (22.2+git20130830~92d25d6-2) unstable; urgency=medium
+
+  * Transition to bnd 2.1.0.
+    debian/rules: Switch to new bnd parameter syntax and change output
+    directory to debian/tmp/bnd to prevent a FTBFS.
+
+ -- Markus Koschany <apo at gambaru.de>  Thu, 04 Jun 2015 20:22:17 +0200
+
 androidsdk-tools (22.2+git20130830~92d25d6-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/libandroidsdk-common-java.install b/debian/libandroidsdk-common-java.install
index 47c2a23..cb9f44c 100644
--- a/debian/libandroidsdk-common-java.install
+++ b/debian/libandroidsdk-common-java.install
@@ -1 +1 @@
-androidsdk-common.jar usr/share/java/
+debian/tmp/bnd/androidsdk-common.jar usr/share/java/
diff --git a/debian/libandroidsdk-ddmlib-java.install b/debian/libandroidsdk-ddmlib-java.install
index 2f98713..617c547 100644
--- a/debian/libandroidsdk-ddmlib-java.install
+++ b/debian/libandroidsdk-ddmlib-java.install
@@ -1 +1 @@
-androidsdk-ddmlib.jar usr/share/java/
+debian/tmp/bnd/androidsdk-ddmlib.jar usr/share/java/
diff --git a/debian/libandroidsdk-ddmuilib-java.install b/debian/libandroidsdk-ddmuilib-java.install
index 7759ae5..287682d 100644
--- a/debian/libandroidsdk-ddmuilib-java.install
+++ b/debian/libandroidsdk-ddmuilib-java.install
@@ -1 +1 @@
-androidsdk-ddmuilib.jar usr/share/java/
+debian/tmp/bnd/androidsdk-ddmuilib.jar usr/share/java/
diff --git a/debian/libandroidsdk-hierarchyviewerlib-java.install b/debian/libandroidsdk-hierarchyviewerlib-java.install
index c4afa03..294921c 100644
--- a/debian/libandroidsdk-hierarchyviewerlib-java.install
+++ b/debian/libandroidsdk-hierarchyviewerlib-java.install
@@ -1 +1 @@
-androidsdk-hierarchyviewerlib.jar usr/share/java
+debian/tmp/bnd/androidsdk-hierarchyviewerlib.jar usr/share/java
diff --git a/debian/libandroidsdk-sdklib-java.install b/debian/libandroidsdk-sdklib-java.install
index cd82bc3..9628165 100644
--- a/debian/libandroidsdk-sdklib-java.install
+++ b/debian/libandroidsdk-sdklib-java.install
@@ -1 +1 @@
-androidsdk-sdklib.jar usr/share/java/
+debian/tmp/bnd/androidsdk-sdklib.jar usr/share/java/
diff --git a/debian/libandroidsdk-sdkstats-java.install b/debian/libandroidsdk-sdkstats-java.install
index 46e8238..fafc50a 100644
--- a/debian/libandroidsdk-sdkstats-java.install
+++ b/debian/libandroidsdk-sdkstats-java.install
@@ -1 +1 @@
-androidsdk-sdkstats.jar usr/share/java/
+debian/tmp/bnd/androidsdk-sdkstats.jar usr/share/java/
diff --git a/debian/rules b/debian/rules
index 8fb6ac3..47334a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,10 @@ export CLASSPATH := androidsdk-common.jar:androidsdk-ddmlib.jar:androidsdk-ddmui
 POD2MAN := pod2man --center "Android SDK Tools" -r "Debian"
 
 common-post-build-indep::
+	mkdir -p debian/tmp/bnd
 	for BNDFILE in debian/*.bnd; do \
 		JARNAME=`basename $$BNDFILE .bnd`.jar; \
-		bnd wrap -properties $$BNDFILE -output $$JARNAME $$JARNAME; \
+		bnd wrap --properties $$BNDFILE --output debian/tmp/bnd/`basename $$BNDFILE .bnd`.jar $$JARNAME; \
 	done
 
 	jar uf androidsdk-ddmuilib.jar -C ddms/ddmuilib/src/main/java images

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