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

[Jakub Adam]

The following commit has been merged in the master branch:
commit b876b8f97a349e14ec1ceeb009187a3ff254aec5
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Oct 7 21:08:05 2012 +0200

    Use Eclipse libraries exposed in /usr/share/java

diff --git a/debian/classpath b/debian/classpath
index 279bc2e..fdab016 100644
--- a/debian/classpath
+++ b/debian/classpath
@@ -1,7 +1,7 @@
 androidsdk-common.jar .
 androidsdk-androidprefs.jar .
 androidsdk-sdklib.jar androidsdk-common.jar androidsdk-androidprefs.jar
-androidsdk-sdkstats.jar androidsdk-androidprefs.jar swt.jar
+androidsdk-sdkstats.jar androidsdk-androidprefs.jar swt.jar org.eclipse.jface.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 6bb1303..28e81e9 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,
- libjfreechart-swt-java, eclipse-rcp
+ libjfreechart-swt-java, eclipse-rcp (>= 3.8.1)
 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
diff --git a/debian/rules b/debian/rules
index 6d8467b..4265ccd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,7 @@
 
 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:androidsdk-ddmlib.jar:androidsdk-ddmuilib.jar:androidsdk-sdkstats.jar:androidsdk-swtmenubar.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)
+export CLASSPATH := androidsdk-common.jar:androidsdk-androidprefs.jar:androidsdk-ddmlib.jar:androidsdk-ddmuilib.jar:androidsdk-sdkstats.jar:androidsdk-swtmenubar.jar:/usr/share/java/swt.jar:/usr/share/java/jfreechart.jar:/usr/share/java/jfreechart-swt.jar:/usr/share/java/org.eclipse.jface.jar:/usr/share/java/org.eclipse.core.commands.jar:/usr/share/java/org.eclipse.equinox.common.jar
 
 common-post-build-indep::
 	for BNDFILE in debian/*.bnd; do \

-- 
androidsdk-tools packaging