[androidsdk-tools] 01/01: Imported Debian patch 22.2+git20130830~92d25d6-3

[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 2e4720e0de86e82ff2a508102206615c5687a1e0
Author: Markus Koschany <apo at debian.org>
Date:   Wed Dec 9 21:12:34 2015 +0100

    Imported Debian patch 22.2+git20130830~92d25d6-3
---
 debian/changelog | 9 +++++++++
 debian/rules     | 8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e6c4602..273095b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+androidsdk-tools (22.2+git20130830~92d25d6-3) unstable; urgency=medium
+
+  * Team upload.
+  * debian/rules: Readd missing images to jar files and fix RunTimeException
+    with androidsdk-ddms.
+    Thanks to Oleksandr Gavenko for the report. (Closes: #807504)
+
+ -- Markus Koschany <apo at debian.org>  Wed, 09 Dec 2015 21:12:34 +0100
+
 androidsdk-tools (22.2+git20130830~92d25d6-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 47334a8..0871b32 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,20 +13,20 @@ common-post-build-indep::
 		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
+	jar uf debian/tmp/bnd/androidsdk-ddmuilib.jar -C ddms/ddmuilib/src/main/java images
 
 	jar uf androidsdk-ddms.jar -C ddms/app/src/main/resources images
 	jh_manifest -m com.android.ddms.Main androidsdk-ddms.jar
 
-	jar uf androidsdk-hierarchyviewerlib.jar -C hierarchyviewer2/hierarchyviewer2lib/src/main/java images
+	jar uf debian/tmp/bnd/androidsdk-hierarchyviewerlib.jar -C hierarchyviewer2/hierarchyviewer2lib/src/main/java images
 
 	jh_manifest -m com.android.hierarchyviewer.HierarchyViewerApplication androidsdk-hierarchyviewer.jar
 
 	jar uf androidsdk-traceview.jar -C traceview/src/main/resources icons
 	jh_manifest -m com.android.traceview.MainWindow androidsdk-traceview.jar
 
-	jar uf androidsdk-uiautomatorviewer.jar -C uiautomatorviewer/src/main/java images
-	jh_manifest -m com.android.uiautomator.UiAutomatorViewer androidsdk-uiautomatorviewer.jar
+	jar uf debian/tmp/bnd/androidsdk-uiautomatorviewer.jar -C uiautomatorviewer/src/main/java images
+	jh_manifest -m com.android.uiautomator.UiAutomatorViewer debian/tmp/bnd/androidsdk-uiautomatorviewer.jar
 
 	for man in debian/*.pod; do \
 		$(POD2MAN) -s 1 $$man $$(basename $$man .pod).1; \

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