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

[Jakub Adam]

The following commit has been merged in the master branch:
commit 3c7a1802edb15a3f2342a39a55bae1c9afdaee60
Author: Jakub Adam <jakub.adam at tieto.com>
Date:   Fri Mar 15 11:46:32 2013 +0100

    d/orig-tar.sh update files to delete according to new source structure

diff --git a/debian/README.source b/debian/README.source
index cb1d735..0957e82 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -11,20 +11,19 @@ where the following files and directories have been deleted:
     - hierarchyviewer2
     - traceview
     - uiautomatorviewer
- - common/tests
- - sdkmanager/libs/sdklib/tests
- - ddms/libs/ddmlib/tests
+ - common/src/test
+ - sdkmanager/libs/sdklib/src/test
+ - ddms/libs/ddmlib/src/test
  - ddms/libs/ddmuilib/tests
- - all directories/ files in sdkmanager/libs/sdklib/src/com/android/sdklib/ except
+ - all directories/ files in sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/ except
     - build
     - internal/build
     - util
     - SdkConstants.java
     - ISdkLog.java
    (we don't want to update the sdk through the android package system)
- - sdkmanager/libs/sdklib/sdc/com/android/sdklib/internal/build/MakeIdentity.java
+ - sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/MakeIdentity.java
    (this file contains a reference to a file for which I cannot find the sources)
  - all directories starting with '.' (except '.' itself)
 
 The script 'orig-tar.sh' can be used to generate the source archive.
-
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 329acd7..f3c7c4d 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -18,14 +18,14 @@ VERSION=`git --git-dir=androidsdk-tools/.git log -1 --format=%cd~%h --date=short
 echo "Version "$VERSION
 echo "Deleting not needed files ..."
 rm -fr `find androidsdk-tools -maxdepth 1 -type d ! -name androidsdk-tools ! -name common ! -name sdkmanager ! -name sdkstats ! -name swtmenubar ! -name ddms ! -name hierarchyviewer2 ! -name traceview ! -name uiautomatorviewer`
-rm -fr androidsdk-tools/common/tests
-rm -fr androidsdk-tools/sdkmanager/libs/sdklib/tests
+rm -fr androidsdk-tools/common/src/test
+rm -fr androidsdk-tools/sdkmanager/libs/sdklib/src/test
 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
+rm -fr androidsdk-tools/ddms/libs/ddmlib/src/test androidsdk-tools/ddms/libs/ddmuilib/tests
+rm -fr `find androidsdk-tools/sdkmanager/libs/sdklib/src/main/java/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/main/java/com/android/sdklib/internal -type d ! -name internal ! -name build`
+rm -fr androidsdk-tools/sdkmanager/libs/sdklib/src/main/java/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/sdkmanager/.gitignore
 rm -fr androidsdk-tools/sdkmanager/libs/sdklib/.settings
@@ -35,8 +35,6 @@ rm -fr androidsdk-tools/common/.classpath
 rm -fr androidsdk-tools/common/.project
 rm -fr androidsdk-tools/common/.settings
 rm -fr androidsdk-tools/common/.gitignore
-rm -fr androidsdk-tools/common/tests/.project
-rm -fr androidsdk-tools/common/tests/.classpath
 rm -fr androidsdk-tools/.gitignore
 
 echo "Packaging archive into ../android-sdk-tools_$REVISION+git$VERSION.orig.tar.gz ..."

-- 
androidsdk-tools packaging