diff -Nru android-platform-tools-base-2.2.2/debian/android-platform-tools-base.bash-completion android-platform-tools-base-2.2.2/debian/android-platform-tools-base.bash-completion --- android-platform-tools-base-2.2.2/debian/android-platform-tools-base.bash-completion 1970-01-01 00:00:00.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/android-platform-tools-base.bash-completion 2018-02-28 15:40:52.000000000 +0000 @@ -0,0 +1 @@ +debian/bash-completion/screenshot2 diff -Nru android-platform-tools-base-2.2.2/debian/android-platform-tools-base.docs android-platform-tools-base-2.2.2/debian/android-platform-tools-base.docs --- android-platform-tools-base-2.2.2/debian/android-platform-tools-base.docs 1970-01-01 00:00:00.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/android-platform-tools-base.docs 2018-02-28 15:34:41.000000000 +0000 @@ -0,0 +1 @@ +misc/screenshot2/NOTICE diff -Nru android-platform-tools-base-2.2.2/debian/bash-completion/screenshot2 android-platform-tools-base-2.2.2/debian/bash-completion/screenshot2 --- android-platform-tools-base-2.2.2/debian/bash-completion/screenshot2 1970-01-01 00:00:00.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/bash-completion/screenshot2 2018-02-28 15:40:52.000000000 +0000 @@ -0,0 +1,65 @@ + +function _screenshot2() +{ + local cur prev opts cmds device_selected + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + prevprev="${COMP_WORDS[COMP_CWORD-2]}" + opts="-d -e -l -s" + device_selected="" + + # if there are multiple devices plugged in, prompt the user to specify which + # so that the list of installed packaged can be fetched from the device + + case "${prev}" in + -d|-e) + device_selected="${prev}" + ;; + esac + + # use device set by serial number + case "${prevprev}" in + -s) + device_selected="-s ${prev}" + ;; + esac + + if [ -z "$device_selected" ] && [ "$prev" != "-s" ]; then + local num_devices=$(( $(adb devices 2>/dev/null|wc -l) - 2 )) + if [ "$num_devices" -gt "1" ]; then + # With multiple devices, you must choose a device first. + COMPREPLY=( $(compgen -W "-s" -- ${cur}) ) + return 0 + fi + fi + + case "${cur}" in + -*) + COMPREPLY=( $(compgen -W "$opts" -- ${cur}) ) + return 0 + ;; + esac + + case "${prev}" in + -s) + if [ -z "$device_selected" ]; then + # Use 'adb devices' to list serial numbers. + COMPREPLY=( $(compgen -W "$(adb devices|grep 'device$'|cut -f1)" -- ${cur} ) ) + return 0 + fi + ;; + esac + + COMPREPLY=( $(compgen -o dirnames -- ${cur}) ) + return 0 +} +complete -F _screenshot2 screenshot2 + +# Local variables: +# mode: shell-script +# sh-basic-offset: 4 +# sh-indent-comment: t +# indent-tabs-mode: nil +# End: +# ex: ts=4 sw=4 et filetype=sh diff -Nru android-platform-tools-base-2.2.2/debian/changelog android-platform-tools-base-2.2.2/debian/changelog --- android-platform-tools-base-2.2.2/debian/changelog 2017-02-28 11:37:48.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/changelog 2018-02-28 15:40:52.000000000 +0000 @@ -1,3 +1,14 @@ +android-platform-tools-base (2.2.2-3) unstable; urgency=medium + + * use minimal proguard packages to avoid pulling in GUI + * point Vcs tags to salsa.debian.org + * Standards-Version: 4.1.3 no changes + * make license check a warning instead of an error (Closes: #883074) + * fix launcher shell script for screenshot2 command + * fix missing-notice-file-for-apache-license + + -- Hans-Christoph Steiner Wed, 28 Feb 2018 16:40:52 +0100 + android-platform-tools-base (2.2.2-2) unstable; urgency=medium * New using_Debian_Android_SDK.patch: When using Debian's Android SDK, the @@ -14,7 +25,7 @@ [ Hans-Christoph Steiner ] * New upstream release (Closes: #850997) * Team upload - + [ Kai-Chung Yan ] * New BDs: * libbatik-java diff -Nru android-platform-tools-base-2.2.2/debian/control android-platform-tools-base-2.2.2/debian/control --- android-platform-tools-base-2.2.2/debian/control 2017-02-28 11:35:11.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/control 2018-02-28 15:40:52.000000000 +0000 @@ -2,10 +2,11 @@ Section: java Priority: optional Maintainer: Android Tools Maintainers -Uploaders: - Kai-Chung Yan +Uploaders: Hans-Christoph Steiner , + Kai-Chung Yan , Build-Depends: antlr3, + bash-completion, debhelper (>= 10), default-jdk-headless (>= 2:1.8), gradle-debian-helper, @@ -37,13 +38,13 @@ liblog4j1.2-java, liblombok-ast-java, liboro-java, + libproguard-java, libsnappy-java, maven-debian-helper, maven-repo-helper, - proguard -Standards-Version: 3.9.8 -Vcs-Browser: https://anonscm.debian.org/cgit/android-tools/android-platform-tools-base.git -Vcs-Git: https://anonscm.debian.org/git/android-tools/android-platform-tools-base.git +Standards-Version: 4.1.3 +Vcs-Browser: https://salsa.debian.org/android-tools-team/android-platform-tools-base +Vcs-Git: https://salsa.debian.org/android-tools-team/android-platform-tools-base.git Homepage: https://android.googlesource.com/platform/tools/base/ Package: android-platform-tools-base @@ -115,7 +116,7 @@ liblog4j1.2-java, liblombok-ast-java, liboro-java, - proguard, + proguard-cli, ${misc:Depends} Breaks: android-platform-tools-base (<< 2.0.0-1) Replaces: android-platform-tools-base (<< 2.0.0-1) diff -Nru android-platform-tools-base-2.2.2/debian/copyright android-platform-tools-base-2.2.2/debian/copyright --- android-platform-tools-base-2.2.2/debian/copyright 2017-02-22 13:44:35.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/copyright 2018-02-28 15:28:39.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Android Platform Tools Base Source: https://android.googlesource.com/platform/tools/base/ Files-Excluded: diff -Nru android-platform-tools-base-2.2.2/debian/libandroid-ddms-java.docs android-platform-tools-base-2.2.2/debian/libandroid-ddms-java.docs --- android-platform-tools-base-2.2.2/debian/libandroid-ddms-java.docs 1970-01-01 00:00:00.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/libandroid-ddms-java.docs 2018-02-28 15:35:55.000000000 +0000 @@ -0,0 +1 @@ +ddmlib/NOTICE diff -Nru android-platform-tools-base-2.2.2/debian/libandroid-layoutlib-api-java.docs android-platform-tools-base-2.2.2/debian/libandroid-layoutlib-api-java.docs --- android-platform-tools-base-2.2.2/debian/libandroid-layoutlib-api-java.docs 1970-01-01 00:00:00.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/libandroid-layoutlib-api-java.docs 2018-02-28 15:36:33.000000000 +0000 @@ -0,0 +1 @@ +layoutlib-api/NOTICE diff -Nru android-platform-tools-base-2.2.2/debian/libandroid-tools-annotations-java.docs android-platform-tools-base-2.2.2/debian/libandroid-tools-annotations-java.docs --- android-platform-tools-base-2.2.2/debian/libandroid-tools-annotations-java.docs 1970-01-01 00:00:00.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/libandroid-tools-annotations-java.docs 2018-02-28 15:36:13.000000000 +0000 @@ -0,0 +1 @@ +annotations/NOTICE diff -Nru android-platform-tools-base-2.2.2/debian/libandroid-tools-common-java.docs android-platform-tools-base-2.2.2/debian/libandroid-tools-common-java.docs --- android-platform-tools-base-2.2.2/debian/libandroid-tools-common-java.docs 2017-02-22 13:44:35.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/libandroid-tools-common-java.docs 2018-02-28 15:37:31.000000000 +0000 @@ -1 +1,2 @@ -common/README.txt \ No newline at end of file +common/README.txt +common/NOTICE diff -Nru android-platform-tools-base-2.2.2/debian/libandroid-tools-dvlib-java.docs android-platform-tools-base-2.2.2/debian/libandroid-tools-dvlib-java.docs --- android-platform-tools-base-2.2.2/debian/libandroid-tools-dvlib-java.docs 1970-01-01 00:00:00.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/libandroid-tools-dvlib-java.docs 2018-02-28 15:38:43.000000000 +0000 @@ -0,0 +1 @@ +device_validator/dvlib/NOTICE diff -Nru android-platform-tools-base-2.2.2/debian/libandroid-tools-repository-java.docs android-platform-tools-base-2.2.2/debian/libandroid-tools-repository-java.docs --- android-platform-tools-base-2.2.2/debian/libandroid-tools-repository-java.docs 1970-01-01 00:00:00.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/libandroid-tools-repository-java.docs 2018-02-28 15:39:04.000000000 +0000 @@ -0,0 +1 @@ +repository/NOTICE diff -Nru android-platform-tools-base-2.2.2/debian/libandroid-tools-sdklib-java.docs android-platform-tools-base-2.2.2/debian/libandroid-tools-sdklib-java.docs --- android-platform-tools-base-2.2.2/debian/libandroid-tools-sdklib-java.docs 1970-01-01 00:00:00.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/libandroid-tools-sdklib-java.docs 2018-02-28 15:03:13.000000000 +0000 @@ -0,0 +1 @@ +sdklib/NOTICE diff -Nru android-platform-tools-base-2.2.2/debian/libgradle-android-plugin-java-doc.docs android-platform-tools-base-2.2.2/debian/libgradle-android-plugin-java-doc.docs --- android-platform-tools-base-2.2.2/debian/libgradle-android-plugin-java-doc.docs 1970-01-01 00:00:00.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/libgradle-android-plugin-java-doc.docs 2018-02-28 15:01:42.000000000 +0000 @@ -0,0 +1 @@ +build-system/gradle/NOTICE diff -Nru android-platform-tools-base-2.2.2/debian/libgradle-android-plugin-java.docs android-platform-tools-base-2.2.2/debian/libgradle-android-plugin-java.docs --- android-platform-tools-base-2.2.2/debian/libgradle-android-plugin-java.docs 1970-01-01 00:00:00.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/libgradle-android-plugin-java.docs 2018-02-28 15:01:38.000000000 +0000 @@ -0,0 +1 @@ +build-system/gradle/NOTICE diff -Nru android-platform-tools-base-2.2.2/debian/patches/fix-screenshot2-shell-script.patch android-platform-tools-base-2.2.2/debian/patches/fix-screenshot2-shell-script.patch --- android-platform-tools-base-2.2.2/debian/patches/fix-screenshot2-shell-script.patch 1970-01-01 00:00:00.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/patches/fix-screenshot2-shell-script.patch 2018-02-28 15:40:52.000000000 +0000 @@ -0,0 +1,45 @@ +--- a/misc/screenshot2/etc/screenshot2 ++++ b/misc/screenshot2/etc/screenshot2 +@@ -33,41 +33,7 @@ + prog="${progdir}"/`basename "${prog}"` + cd "${oldwd}" + +-jarfile=screenshot2.jar +-frameworkdir="$progdir" +-libdir="$progdir" +-if [ ! -r "$frameworkdir/$jarfile" ] +-then +- frameworkdir=`dirname "$progdir"`/tools/lib +- libdir=`dirname "$progdir"`/tools/lib +-fi +-if [ ! -r "$frameworkdir/$jarfile" ] +-then +- frameworkdir=`dirname "$progdir"`/framework +- libdir=`dirname "$progdir"`/lib +-fi +-if [ ! -r "$frameworkdir/$jarfile" ] +-then +- echo `basename "$prog"`": can't find $jarfile" +- exit 1 +-fi +- +- +-# Check args. +-if [ debug = "$1" ]; then +- # add this in for debugging +- java_debug=-agentlib:jdwp=transport=dt_socket,server=y,address=8050,suspend=y +- shift 1 +-else +- java_debug= +-fi +- +-if [ "$OSTYPE" = "cygwin" ] ; then +- jarpath=`cygpath -w "$frameworkdir/$jarfile"` +- progdir=`cygpath -w "$progdir"` +-else +- jarpath="$frameworkdir/$jarfile" +-fi ++jarpath=/usr/share/java/com.android.tools.screenshot2.jar + + classpath="`cat /usr/share/android-platform-tools-base/screenshot2.classpath`:$jarpath" + mainclass=com.android.screenshot.Screenshot diff -Nru android-platform-tools-base-2.2.2/debian/patches/Inception-Date.patch android-platform-tools-base-2.2.2/debian/patches/Inception-Date.patch --- android-platform-tools-base-2.2.2/debian/patches/Inception-Date.patch 2017-02-22 13:44:35.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/patches/Inception-Date.patch 2018-02-28 15:40:52.000000000 +0000 @@ -3,7 +3,7 @@ Description: Remove the dynamic Inception-Date attributes Some JAR's manifest includes a dynamic "Inception-Date" attributes which are set as the date when the package is built. For reproducibility, the date is - manually set at when the code of this version of Gradle Plugin is commited. + manually set at when the code of this version of Gradle Plugin is committed. The date is read from . --- a/build-system/gradle-experimental/build.gradle +++ b/build-system/gradle-experimental/build.gradle diff -Nru android-platform-tools-base-2.2.2/debian/patches/make-license-check-a-warning.patch android-platform-tools-base-2.2.2/debian/patches/make-license-check-a-warning.patch --- android-platform-tools-base-2.2.2/debian/patches/make-license-check-a-warning.patch 1970-01-01 00:00:00.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/patches/make-license-check-a-warning.patch 2018-02-28 15:40:52.000000000 +0000 @@ -0,0 +1,47 @@ +--- a/build-system/builder/src/main/java/com/android/builder/sdk/DefaultSdkLoader.java ++++ b/build-system/builder/src/main/java/com/android/builder/sdk/DefaultSdkLoader.java +@@ -145,7 +145,7 @@ + installTarget(targetHash, repoManager, downloader, stdOutputProgress)); + } + +- checkResults(installResults); ++ checkResults(installResults, progress); + + repoManager.loadSynchronously(0, progress, null, null); + +@@ -416,7 +416,7 @@ + } + + // Check to see if we failed because of some license not being accepted. +- checkResults(installResults); ++ checkResults(installResults, new LoggerProgressIndicatorWrapper(logger)); + + // If we can't find some of the remote packages or some install failed + // we resort to installing/updating the old big repositories. +@@ -487,7 +487,7 @@ + repositoriesBuilder.add(androidRepo); + } + } +- checkResults(installResults); ++ checkResults(installResults, new LoggerProgressIndicatorWrapper(logger)); + } + + return repositoriesBuilder.build(); +@@ -499,7 +499,7 @@ + * + * @throws RuntimeException if some packages could not be installed. + */ +- private void checkResults(Map installResults) { ++ private void checkResults(Map installResults, ProgressIndicator progress) { + Function> find = + resultType -> + installResults +@@ -511,7 +511,7 @@ + + List unlicensedPackages = find.apply(InstallResultType.LICENSE_FAIL); + if (!unlicensedPackages.isEmpty()) { +- throw new RuntimeException( ++ progress.logWarning( + "You have not accepted the license agreements of the following SDK components:\n" + + unlicensedPackages.toString() + + ".\nBefore building your project, you need to accept the license agreements " diff -Nru android-platform-tools-base-2.2.2/debian/patches/series android-platform-tools-base-2.2.2/debian/patches/series --- android-platform-tools-base-2.2.2/debian/patches/series 2017-02-22 13:46:08.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/patches/series 2018-02-28 15:40:52.000000000 +0000 @@ -11,3 +11,5 @@ use_additionalSrc.patch disable_lint-cli_psi.patch using_Debian_Android_SDK.patch +make-license-check-a-warning.patch +fix-screenshot2-shell-script.patch diff -Nru android-platform-tools-base-2.2.2/debian/rules android-platform-tools-base-2.2.2/debian/rules --- android-platform-tools-base-2.2.2/debian/rules 2017-02-22 13:44:35.000000000 +0000 +++ android-platform-tools-base-2.2.2/debian/rules 2018-02-28 15:40:52.000000000 +0000 @@ -6,7 +6,7 @@ export ANDROID_HOME=/usr/lib/android-sdk %: - dh $@ --with maven_repo_helper --buildsystem=gradle + dh $@ --with maven_repo_helper --buildsystem=gradle --with bash-completion override_dh_auto_build: $(foreach patch,$(shell cat debian/additionalSrc/patches/series),patch --batch --fuzz=0 --forward -p1 --unified --version-control=never < debian/additionalSrc/patches/$(patch);)