[SCM] androidsdk-tools packaging branch, master, updated. b876b8f97a349e14ec1ceeb009187a3ff254aec5

Sun Oct 21 10:43:25 UTC 2012

The following commit has been merged in the master branch:
commit 7bd3b05ab0bba3d48093ec47c58b493722c15144
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Oct 7 00:47:29 2012 +0200

    Package ddms libraries

diff --git a/debian/README.source b/debian/README.source
index 1a7c0f4..7b869a6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -8,8 +8,11 @@ where the following files and directories have been deleted:
     - sdkmanager/libs/sdklib
     - sdkstats
     - swtmenubar
+    - ddms
  - common/tests
  - sdkmanager/libs/sdklib/tests
+ - ddms/libs/ddmlib/tests
+ - ddms/libs/ddmuilib/tests
  - all directories/ files in sdkmanager/libs/sdklib/src/com/android/sdklib/ except
     - build
     - internal/build
diff --git a/debian/androidsdk-ddmlib.bnd b/debian/androidsdk-ddmlib.bnd
new file mode 100644
index 0000000..6e9af38
--- /dev/null
+++ b/debian/androidsdk-ddmlib.bnd
@@ -0,0 +1,5 @@
+Bundle-Name: Dalvik Debug Monitor Server
+Bundle-SymbolicName: com.android.ddmlib
+Bundle-Version: 1.0.0
+Bundle-Vendor: Debian.org
+Import-Package: *
diff --git a/debian/androidsdk-ddmuilib.bnd b/debian/androidsdk-ddmuilib.bnd
new file mode 100644
index 0000000..3631a62
--- /dev/null
+++ b/debian/androidsdk-ddmuilib.bnd
@@ -0,0 +1,5 @@
+Bundle-Name: Dalvik Debug Monitor Server UI library
+Bundle-SymbolicName: com.android.ddmuilib
+Bundle-Version: 1.0.0
+Bundle-Vendor: Debian.org
+Import-Package: *
diff --git a/debian/classpath b/debian/classpath
index 9e37a7b..88fe888 100644
--- a/debian/classpath
+++ b/debian/classpath
@@ -3,3 +3,5 @@ androidsdk-androidprefs.jar .
 androidsdk-sdklib.jar androidsdk-common.jar androidsdk-androidprefs.jar
 androidsdk-sdkstats.jar androidsdk-androidprefs.jar swt.jar
 androidsdk-swtmenubar.jar swt.jar
+androidsdk-ddmlib.jar .
+androidsdk-ddmuilib.jar androidsdk-ddmlib.jar jfreechart.jar jfreechart-swt.jar
diff --git a/debian/control b/debian/control
index e64a69f..d0b4f60 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stefan Handschuh <handschuh.stefan at googlemail.com>
 Build-Depends: debhelper (>=9), javahelper, default-jdk, cdbs, bnd, libswt-gtk-3-java,
- eclipse-rcp
+ libjfreechart-swt-java, eclipse-rcp
 Standards-Version: 3.9.3
 Homepage: http://developer.android.com/tools/help/index.html
 Vcs-Git: git://anonscm.debian.org/git/pkg-java/androidsdk-tools.git
@@ -54,3 +54,21 @@ Description: Android SDK OS menubar hook library
  .
  Typically, an SWT Menu named "Tools" should be provided into which the
  library will add About and Options menu items.
+
+Package: libandroidsdk-ddmlib-java
+Section: java
+Architecture: all
+Depends: android-tools-adb, ${java:Depends}, ${misc:Depends}
+Description: Library for communicaton with connected Android devices
+ Dalvik Debug Monitor Server provides a way to communicate via adb with
+ Android devices connected through USB or running in emulator.
+
+Package: libandroidsdk-ddmuilib-java
+Section: java
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}, libandroidsdk-ddmlib-java
+Description: User interface library for ddmlib
+ Dalvik Debug Monitor Server provides a way to communicate via adb with
+ Android devices connected through USB or running in emulator.
+ .
+ This library provies UI components for use with ddmlib.
diff --git a/debian/javabuild b/debian/javabuild
index b6304a8..147c220 100644
--- a/debian/javabuild
+++ b/debian/javabuild
@@ -3,3 +3,5 @@ androidsdk-androidprefs.jar androidprefs/src
 androidsdk-sdklib.jar sdkmanager/libs/sdklib/src
 androidsdk-sdkstats.jar sdkstats/src
 androidsdk-swtmenubar.jar swtmenubar/src
+androidsdk-ddmlib.jar ddms/libs/ddmlib/src
+androidsdk-ddmuilib.jar ddms/libs/ddmuilib/src
diff --git a/debian/libandroidsdk-ddmlib-java.install b/debian/libandroidsdk-ddmlib-java.install
new file mode 100644
index 0000000..2f98713
--- /dev/null
+++ b/debian/libandroidsdk-ddmlib-java.install
@@ -0,0 +1 @@
+androidsdk-ddmlib.jar usr/share/java/
diff --git a/debian/libandroidsdk-ddmuilib-java.install b/debian/libandroidsdk-ddmuilib-java.install
new file mode 100644
index 0000000..7759ae5
--- /dev/null
+++ b/debian/libandroidsdk-ddmuilib-java.install
@@ -0,0 +1 @@
+androidsdk-ddmuilib.jar usr/share/java/
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 9dbc326..e8279a6 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -17,11 +17,12 @@ git clone -b tools_r$REVISION https://android.googlesource.com/platform/sdk andr
 VERSION=`git --git-dir=androidsdk-tools/.git log -1 --format=%cd~%h --date=short | sed s/-//g`
 echo "Version "$VERSION
 echo "Deleting not needed files ..."
-rm -fr `find androidsdk-tools -maxdepth 1 -type d ! -name androidsdk-tools ! -name androidprefs ! -name common ! -name sdkmanager ! -name sdkstats ! -name swtmenubar`
+rm -fr `find androidsdk-tools -maxdepth 1 -type d ! -name androidsdk-tools ! -name androidprefs ! -name common ! -name sdkmanager ! -name sdkstats ! -name swtmenubar ! -name ddms`
 rm -fr androidsdk-tools/common/tests
 rm -fr androidsdk-tools/sdkmanager/libs/sdklib/tests
 rm -fr androidsdk-tools/sdkmanager/app
 rm -fr androidsdk-tools/sdkmanager/libs/sdkuilib
+rm -fr androidsdk-tools/ddms/libs/ddmlib/tests androidsdk-tools/ddms/libs/ddmuilib/tests
 rm -fr `find androidsdk-tools/sdkmanager/libs/sdklib/src/com/android/sdklib -maxdepth 1 ! -name sdklib ! -name build ! -name util ! -name internal ! -name SdkConstants.java ! -name ISdkLog.java`
 rm -fr `find androidsdk-tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal -type d ! -name internal ! -name build`
 rm -fr androidsdk-tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/MakeIdentity.java
diff --git a/debian/rules b/debian/rules
index 97307cf..f1b3246 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,14 @@ include /usr/share/cdbs/1/class/javahelper.mk
 
 ECLIPSE_JFACE_JAR := $(shell find /usr/lib/eclipse/plugins/org.eclipse.jface_*.jar)
 ECLIPSE_COMMANDS_JAR := $(shell find /usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar)
+ECLIPSE_EQUINOX_COMMON_JAR := $(shell find /usr/lib/eclipse/plugins/org.eclipse.equinox.common_*.jar)
 
-export CLASSPATH := androidsdk-common.jar:androidsdk-androidprefs.jar:/usr/share/java/swt.jar:$(ECLIPSE_JFACE_JAR):$(ECLIPSE_COMMANDS_JAR)
+export CLASSPATH := androidsdk-common.jar:androidsdk-androidprefs.jar:androidsdk-ddmlib.jar:/usr/share/java/swt.jar:/usr/share/java/jfreechart.jar:/usr/share/java/jfreechart-swt.jar:$(ECLIPSE_JFACE_JAR):$(ECLIPSE_COMMANDS_JAR):$(ECLIPSE_EQUINOX_COMMON_JAR)
 
 common-post-build-indep::
 	for BNDFILE in debian/*.bnd; do \
 		JARNAME=`basename $$BNDFILE .bnd`.jar; \
 		bnd wrap -properties $$BNDFILE -output $$JARNAME $$JARNAME; \
 	done
+
+	jar uf androidsdk-ddmuilib.jar -C ddms/libs/ddmuilib/src images

-- 
androidsdk-tools packaging

