This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository android-platform-tools-base.
commit 8996ada2d55e33313fa8e209ddd4cc2ee67b2844 Author: Markus Koschany <[email protected]> Date: Wed Jul 13 21:34:13 2016 +0200 Remove jlibs files and javahelper build-dependency. Make use of maven_repo_helper's --java-lib option instead. --- debian/control | 1 - debian/libandroid-tools-annotations-java.jlibs | 2 -- debian/libandroid-tools-annotations-java.poms | 2 +- debian/libandroid-tools-common-java.jlibs | 2 -- debian/libandroid-tools-common-java.poms | 2 +- debian/rules | 2 +- 6 files changed, 3 insertions(+), 8 deletions(-) diff --git a/debian/control b/debian/control index 5587c65..fc3e21f 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 9), default-jdk, gradle-debian-helper, - javahelper, junit4, libandroid-tools-annotations-java, libandroid-tools-common-java, diff --git a/debian/libandroid-tools-annotations-java.jlibs b/debian/libandroid-tools-annotations-java.jlibs deleted file mode 100644 index 3fad08f..0000000 --- a/debian/libandroid-tools-annotations-java.jlibs +++ /dev/null @@ -1,2 +0,0 @@ -com.android.tools.annotations.jar - diff --git a/debian/libandroid-tools-annotations-java.poms b/debian/libandroid-tools-annotations-java.poms index a4084b0..83133eb 100644 --- a/debian/libandroid-tools-annotations-java.poms +++ b/debian/libandroid-tools-annotations-java.poms @@ -1 +1 @@ -debian/poms/android-tools-annotations-pom.xml --no-parent --usj-name=com.android.tools.annotations --artifact=com.android.tools.annotations.jar +debian/poms/android-tools-annotations-pom.xml --java-lib --no-parent --usj-name=com.android.tools.annotations --artifact=com.android.tools.annotations.jar diff --git a/debian/libandroid-tools-common-java.jlibs b/debian/libandroid-tools-common-java.jlibs deleted file mode 100644 index eb3dc31..0000000 --- a/debian/libandroid-tools-common-java.jlibs +++ /dev/null @@ -1,2 +0,0 @@ -com.android.tools.common.jar - diff --git a/debian/libandroid-tools-common-java.poms b/debian/libandroid-tools-common-java.poms index a77a0d2..2b72663 100644 --- a/debian/libandroid-tools-common-java.poms +++ b/debian/libandroid-tools-common-java.poms @@ -1 +1 @@ -debian/poms/android-tools-common-pom.xml --no-parent --usj-name=com.android.tools.common --artifact=com.android.tools.common.jar +debian/poms/android-tools-common-pom.xml --java-lib --no-parent --usj-name=com.android.tools.common --artifact=com.android.tools.common.jar diff --git a/debian/rules b/debian/rules index 2521765..fdc160b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java %: - dh $@ --parallel --with javahelper,maven_repo_helper --buildsystem=gradle + dh $@ --parallel --with maven_repo_helper --buildsystem=gradle override_dh_auto_build: dh_auto_build -- -x test assemble -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/android-platform-tools-base.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
