This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository androidsdk-tools.
commit b9134dc51f6ce0965b16b9bc76df499e558ff0da Author: Jakub Adam <[email protected]> Date: Fri Mar 15 12:12:38 2013 +0100 Refreshed d/patches --- debian/patches/fix-ddms-script-paths.patch | 20 +++++++++++++------- .../patches/fix-hierarchyviewer-script-paths.patch | 16 ++++++++-------- debian/patches/fix-traceview-script-paths.patch | 14 +++++++------- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/debian/patches/fix-ddms-script-paths.patch b/debian/patches/fix-ddms-script-paths.patch index e7e9523..603baf0 100644 --- a/debian/patches/fix-ddms-script-paths.patch +++ b/debian/patches/fix-ddms-script-paths.patch @@ -1,13 +1,14 @@ -From: Jakub Adam <[email protected]> -Date: Sat, 22 Dec 2012 21:46:13 +0100 -Subject: fix-ddms-script-paths +From 58bd8bf92acdb6538e5565cfdb14d9a3bf5d6ae4 Mon Sep 17 00:00:00 2001 +From: Jakub Adam <[email protected]> +Date: Fri, 15 Mar 2013 12:11:29 +0100 +Subject: [PATCH] fix-ddms-script-paths --- ddms/app/etc/ddms | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/ddms/app/etc/ddms b/ddms/app/etc/ddms -index d698ec3..8390aff 100755 +index 79b93f9..b27b8d9 100755 --- a/ddms/app/etc/ddms +++ b/ddms/app/etc/ddms @@ -34,7 +34,7 @@ prog="${progdir}"/`basename "${prog}"` @@ -19,7 +20,7 @@ index d698ec3..8390aff 100755 libdir="$progdir" if [ ! -r "$frameworkdir/$jarfile" ] then -@@ -77,33 +77,10 @@ fi +@@ -77,29 +77,6 @@ fi jarpath="$frameworkdir/$jarfile:$frameworkdir/swtmenubar.jar" @@ -46,11 +47,16 @@ index d698ec3..8390aff 100755 - exit 1 -fi - - echo "The standalone version of DDMS is deprecated." - echo "Please use Android Device Monitor (tools/monitor) instead." + if [ -x $progdir/monitor ]; then + echo "The standalone version of DDMS is deprecated." + echo "Please use Android Device Monitor (tools/monitor) instead." +@@ -107,5 +84,5 @@ fi exec "$javaCmd" \ -Xmx256M $os_opts $java_debug \ -Dcom.android.ddms.bindir="$progdir" \ - -classpath "$jarpath:$swtpath/swt.jar" \ + -classpath "$jarpath" \ com.android.ddms.Main "$@" +-- +1.7.10.4 + diff --git a/debian/patches/fix-hierarchyviewer-script-paths.patch b/debian/patches/fix-hierarchyviewer-script-paths.patch index 2908cb1..74bdbd9 100644 --- a/debian/patches/fix-hierarchyviewer-script-paths.patch +++ b/debian/patches/fix-hierarchyviewer-script-paths.patch @@ -1,6 +1,6 @@ -From 539a85ea22cdd91106b8a669bbc75e7e54c11cdb Mon Sep 17 00:00:00 2001 -From: Jakub Adam <[email protected]> -Date: Sat, 22 Dec 2012 23:10:49 +0100 +From 465d2f18b59f855983b3c9259447c379d47d2a03 Mon Sep 17 00:00:00 2001 +From: Jakub Adam <[email protected]> +Date: Fri, 15 Mar 2013 12:22:11 +0100 Subject: [PATCH] fix-hierarchyviewer-script-paths --- @@ -8,7 +8,7 @@ Subject: [PATCH] fix-hierarchyviewer-script-paths 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/hierarchyviewer2/app/etc/hierarchyviewer b/hierarchyviewer2/app/etc/hierarchyviewer -index 7ed10e0..da1ed29 100755 +index a0cc5f9..76ff55f 100755 --- a/hierarchyviewer2/app/etc/hierarchyviewer +++ b/hierarchyviewer2/app/etc/hierarchyviewer @@ -35,7 +35,7 @@ prog="${progdir}"/`basename "${prog}"` @@ -47,10 +47,10 @@ index 7ed10e0..da1ed29 100755 - exit 1 -fi - - # need to use "java.ext.dirs" because "-jar" causes classpath to be ignored - # might need more memory, e.g. -Xmx128M - echo "The standalone version of hieararchyviewer is deprecated." -@@ -108,5 +85,5 @@ echo "Please use Android Device Monitor (tools/monitor) instead." + if [ -x $progdir/monitor ]; then + echo "The standalone version of hieararchyviewer is deprecated." + echo "Please use Android Device Monitor (tools/monitor) instead." +@@ -110,5 +87,5 @@ fi exec "$javaCmd" \ -Xmx512M $os_opts $java_debug \ -Dcom.android.hierarchyviewer.bindir="$progdir" \ diff --git a/debian/patches/fix-traceview-script-paths.patch b/debian/patches/fix-traceview-script-paths.patch index 55bf5ad..25e6e9e 100644 --- a/debian/patches/fix-traceview-script-paths.patch +++ b/debian/patches/fix-traceview-script-paths.patch @@ -1,6 +1,6 @@ -From 15b77af5052722a3a8b2b9e03f81d100e0be0cab Mon Sep 17 00:00:00 2001 -From: Jakub Adam <[email protected]> -Date: Sun, 23 Dec 2012 22:08:23 +0100 +From a34f30a3a3eff137c0cc2d6ef16798dfbb4510ff Mon Sep 17 00:00:00 2001 +From: Jakub Adam <[email protected]> +Date: Fri, 15 Mar 2013 12:29:29 +0100 Subject: [PATCH] fix-traceview-script-paths --- @@ -8,7 +8,7 @@ Subject: [PATCH] fix-traceview-script-paths 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/traceview/etc/traceview b/traceview/etc/traceview -index bf0bd3b..83a556c 100755 +index cd4a25f..5c73534 100755 --- a/traceview/etc/traceview +++ b/traceview/etc/traceview @@ -36,7 +36,7 @@ prog="${progdir}"/"${progname}" @@ -50,9 +50,9 @@ index bf0bd3b..83a556c 100755 - exit 1 -fi - - echo "The standalone version of traceview is deprecated." - echo "Please use Android Device Monitor (tools/monitor) instead." - exec "${javaCmd}" $javaOpts -Djava.ext.dirs="$frameworkdir" -Dcom.android.traceview.toolsdir="$progdir" -jar "$jarpath" "$@" + if [ -x $progdir/monitor ]; then + echo "The standalone version of traceview is deprecated." + echo "Please use Android Device Monitor (tools/monitor) instead." -- 1.7.10.4 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/androidsdk-tools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
