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

Jakub Adam jakub.adam at ktknet.cz
Sat Dec 22 21:23:42 UTC 2012


The following commit has been merged in the master branch:
commit 0a12d94b76d278b6bd12b004215291ee105eea32
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Dec 22 21:31:44 2012 +0100

    androidsdk-sdklib.jar now requires guava.jar

diff --git a/debian/classpath b/debian/classpath
index f2af91a..fb01375 100644
--- a/debian/classpath
+++ b/debian/classpath
@@ -1,5 +1,5 @@
 androidsdk-common.jar .
-androidsdk-sdklib.jar androidsdk-common.jar
+androidsdk-sdklib.jar androidsdk-common.jar guava.jar
 androidsdk-sdkstats.jar androidsdk-common.jar swt.jar org.eclipse.jface.jar
 androidsdk-swtmenubar.jar swt.jar
 androidsdk-ddmlib.jar .
diff --git a/debian/control b/debian/control
index 0d3e89e..bf20199 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 (>= 3.8.1)
+ libjfreechart-swt-java, eclipse-rcp (>= 3.8.1), libguava-java (>= 13.0.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 80fd9a1..333689e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/class/javahelper.mk
 
-export CLASSPATH := androidsdk-common.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
+export CLASSPATH := androidsdk-common.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:/usr/share/java/guava.jar
 
 common-post-build-indep::
 	for BNDFILE in debian/*.bnd; do \

-- 
androidsdk-tools packaging



More information about the pkg-java-commits mailing list