[SCM] eclipse-adt packaging branch, master, updated. upstream/20.0.3-12-gcdebb11

[Jakub Adam]

The following commit has been merged in the master branch:
commit cdebb11fcff6fc53fcea1bcf6757e069676805ef
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Jan 4 19:34:22 2013 +0100

    Package hierarchyviewer integration

diff --git a/debian/control b/debian/control
index af8d6e2..d5dad55 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 9),
                eclipse-pde,
                javahelper (>= 0.31~),
                androidsdk-uiautomatorviewer,
+               libandroidsdk-hierarchyviewerlib-java,
                libandroidsdk-sdkstats-java,
                libandroidsdk-ddmuilib-java,
                libguava-java (>= 13.0.1),
@@ -32,3 +33,16 @@ Description: integrates Dalvik Debug Monitor into Eclipse IDE
  .
  This package allows one to use Dalvik Debug Monitor debugging and
  performance analysis tool from within Eclipse.
+
+Package: eclipse-adt-hierarchyviewer
+Architecture: all
+Depends: eclipse-adt-ddms,
+         ${orbit:Depends},
+         ${misc:Depends}
+Description: integrates Android SDK Hierarchy Viewer into Eclipse IDE
+ Android Development Tools (ADT) is a plugin for the Eclipse IDE that is
+ designed to give you a powerful, integrated environment in which to build
+ Android applications.
+ .
+ This package allows one to use Android SDK Hierarchy viewer from within
+ Eclipse.
diff --git a/debian/eclipse-adt-hierarchyviewer.eh-install b/debian/eclipse-adt-hierarchyviewer.eh-install
new file mode 100644
index 0000000..e1641c6
--- /dev/null
+++ b/debian/eclipse-adt-hierarchyviewer.eh-install
@@ -0,0 +1 @@
+com.android.ide.eclipse.hierarchyviewer
diff --git a/debian/eclipse.features b/debian/eclipse.features
index 582d505..8fc9db5 100644
--- a/debian/eclipse.features
+++ b/debian/eclipse.features
@@ -1 +1,2 @@
 com.android.ide.eclipse.ddms
+com.android.ide.eclipse.hierarchyviewer
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
index 5b7defe..96113e0 100644
--- a/debian/eclipse.orbitdeps
+++ b/debian/eclipse.orbitdeps
@@ -1,4 +1,5 @@
 androidsdk-common
+androidsdk-hierarchyviewerlib
 androidsdk-sdkstats
 androidsdk-uiautomatorviewer
 androidsdk-ddmlib
diff --git a/debian/patches/hierarchyviewer-replace-bundled-libs.patch b/debian/patches/hierarchyviewer-replace-bundled-libs.patch
new file mode 100644
index 0000000..6cb87cb
--- /dev/null
+++ b/debian/patches/hierarchyviewer-replace-bundled-libs.patch
@@ -0,0 +1,42 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Fri, 4 Jan 2013 19:57:09 +0100
+Subject: hierarchyviewer-replace-bundled-libs
+
+---
+ features/com.android.ide.eclipse.hierarchyviewer/feature.xml    |    7 +++++++
+ .../META-INF/MANIFEST.MF                                        |    5 ++---
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/features/com.android.ide.eclipse.hierarchyviewer/feature.xml b/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
+index 28f446e..8d7d850 100644
+--- a/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
++++ b/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
+@@ -230,6 +230,13 @@
+    </requires>
+ 
+    <plugin
++         id="com.android.hierarchyviewerlib"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
+          id="com.android.ide.eclipse.hierarchyviewer"
+          download-size="0"
+          install-size="0"
+diff --git a/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF b/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
+index 29f8e7b..9c63e7c 100644
+--- a/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
++++ b/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
+@@ -10,8 +10,7 @@ Bundle-ActivationPolicy: lazy
+ Require-Bundle: org.eclipse.ui,
+  org.eclipse.core.runtime,
+  org.eclipse.ui.console,
+- com.android.ide.eclipse.ddms
+-Bundle-ClassPath: .,
+- libs/hierarchyviewerlib.jar
++ com.android.ide.eclipse.ddms,
++ com.android.hierarchyviewerlib
+ Export-Package: com.android.ide.eclipse.hierarchyviewer
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/debian/patches/series b/debian/patches/series
index dd5b4bb..f3f2285 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 ddms-replace-bundled-libs.patch
+hierarchyviewer-replace-bundled-libs.patch

-- 
eclipse-adt packaging