This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository androidsdk-tools.
commit 5186786c3b4edd300b096758128d8a64c0e50d52 Author: Jakub Adam <[email protected]> Date: Sat Dec 22 21:22:25 2012 +0100 libandroidsdk-androidprefs is now part of libandroidsdk-common --- debian/README.source | 1 - debian/androidsdk-androidprefs.bnd | 5 ----- debian/classpath | 5 ++--- debian/control | 11 ++--------- debian/javabuild | 1 - debian/libandroidsdk-androidprefs-java.install | 1 - debian/orig-tar.sh | 5 +---- debian/rules | 2 +- 8 files changed, 6 insertions(+), 25 deletions(-) diff --git a/debian/README.source b/debian/README.source index 7b869a6..318b071 100644 --- a/debian/README.source +++ b/debian/README.source @@ -3,7 +3,6 @@ The source code has been excerpted from the git repository where the following files and directories have been deleted: - all directories except: - - androidprefs - common - sdkmanager/libs/sdklib - sdkstats diff --git a/debian/androidsdk-androidprefs.bnd b/debian/androidsdk-androidprefs.bnd deleted file mode 100644 index dba3bb2..0000000 --- a/debian/androidsdk-androidprefs.bnd +++ /dev/null @@ -1,5 +0,0 @@ -Bundle-Name: Android preferences library -Bundle-SymbolicName: com.android.prefs -Bundle-Version: 1.0.0 -Bundle-Vendor: Debian.org -Import-Package: * diff --git a/debian/classpath b/debian/classpath index fdab016..f2af91a 100644 --- a/debian/classpath +++ b/debian/classpath @@ -1,7 +1,6 @@ androidsdk-common.jar . -androidsdk-androidprefs.jar . -androidsdk-sdklib.jar androidsdk-common.jar androidsdk-androidprefs.jar -androidsdk-sdkstats.jar androidsdk-androidprefs.jar swt.jar org.eclipse.jface.jar +androidsdk-sdklib.jar androidsdk-common.jar +androidsdk-sdkstats.jar androidsdk-common.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 28e81e9..0d3e89e 100644 --- a/debian/control +++ b/debian/control @@ -17,17 +17,10 @@ Depends: ${java:Depends}, ${misc:Depends} Description: Android sdk tools common library Common library used by other android sdk tools. -Package: libandroidsdk-androidprefs-java -Section: java -Architecture: all -Depends: ${java:Depends}, ${misc:Depends} -Description: Android preferences library - Library for android preferences. - Package: libandroidsdk-sdklib-java Section: java Architecture: all -Depends: ${java:Depends}, ${misc:Depends}, libandroidsdk-common-java, libandroidsdk-androidprefs-java +Depends: ${java:Depends}, ${misc:Depends}, libandroidsdk-common-java Description: Android sdklib The android sdklib contains the resource assembler that compiles the static resource files of an android project. @@ -37,7 +30,7 @@ Description: Android sdklib Package: libandroidsdk-sdkstats-java Section: java Architecture: all -Depends: ${java:Depends}, ${misc:Depends}, libandroidsdk-androidprefs-java +Depends: ${java:Depends}, ${misc:Depends}, libandroidsdk-common-java Description: Sends Android SDK usage statistics to Google This library sends reports about usage of Android SDK to Google server. Information can be used to help improving the software. diff --git a/debian/javabuild b/debian/javabuild index e6c5631..f6fc3b7 100644 --- a/debian/javabuild +++ b/debian/javabuild @@ -1,5 +1,4 @@ androidsdk-common.jar common/src -androidsdk-androidprefs.jar androidprefs/src androidsdk-sdklib.jar sdkmanager/libs/sdklib/src androidsdk-sdkstats.jar sdkstats/src androidsdk-swtmenubar.jar swtmenubar/src diff --git a/debian/libandroidsdk-androidprefs-java.install b/debian/libandroidsdk-androidprefs-java.install deleted file mode 100644 index 634c705..0000000 --- a/debian/libandroidsdk-androidprefs-java.install +++ /dev/null @@ -1 +0,0 @@ -androidsdk-androidprefs.jar usr/share/java/ diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 131bd9a..2b5beb3 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -17,7 +17,7 @@ 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 ! -name ddms` +rm -fr `find androidsdk-tools -maxdepth 1 -type d ! -name androidsdk-tools ! -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 @@ -27,9 +27,6 @@ rm -fr `find androidsdk-tools/sdkmanager/libs/sdklib/src/com/android/sdklib -max 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 # rm -fr `find androidsdk-tools -name ".*"` # this might be too strict in some later versions -rm -fr androidsdk-tools/androidprefs/.classpath -rm -fr androidsdk-tools/androidprefs/.project -rm -fr androidsdk-tools/androidprefs/.gitignore rm -fr androidsdk-tools/sdkmanager/.gitignore rm -fr androidsdk-tools/sdkmanager/libs/sdklib/.settings rm -fr androidsdk-tools/sdkmanager/libs/sdklib/.classpath diff --git a/debian/rules b/debian/rules index 4265ccd..80fd9a1 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-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 +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 common-post-build-indep:: for BNDFILE in debian/*.bnd; do \ -- 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
