[android-platform-tools-base] 02/03: Install classpaths into /usr/share/android-platform-tools-base instead of /usr/share/doc/android-platform-tool-base as relying on files in /usr/share/doc voilates Debian Policy
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Jul 27 08:14:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository android-platform-tools-base.
commit 3e103cec4f29162727d9d50df54475ee58db2373
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Wed Jul 27 16:09:32 2016 +0800
Install classpaths into /usr/share/android-platform-tools-base instead of /usr/share/doc/android-platform-tool-base as relying on files in /usr/share/doc voilates Debian Policy
---
debian/android-platform-tools-base.docs | 2 --
debian/android-platform-tools-base.install | 8 +++++---
debian/patches/set_classpaths.patch | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/android-platform-tools-base.docs b/debian/android-platform-tools-base.docs
deleted file mode 100644
index 84920ec..0000000
--- a/debian/android-platform-tools-base.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-lint/cli/build/lint.classpaths
-misc/screenshot2/build/screenshot2.classpaths
\ No newline at end of file
diff --git a/debian/android-platform-tools-base.install b/debian/android-platform-tools-base.install
index dbb13b4..3a454a0 100644
--- a/debian/android-platform-tools-base.install
+++ b/debian/android-platform-tools-base.install
@@ -1,3 +1,5 @@
-draw9patch/etc/draw9patch usr/lib/android-sdk/tools
-lint/cli/etc/lint usr/lib/android-sdk/tools
-misc/screenshot2/etc/screenshot2 usr/lib/android-sdk/tools
\ No newline at end of file
+draw9patch/etc/draw9patch usr/lib/android-sdk/tools
+lint/cli/build/lint.classpaths usr/share/android-platform-tools-base
+lint/cli/etc/lint usr/lib/android-sdk/tools
+misc/screenshot2/build/screenshot2.classpaths usr/share/android-platform-tools-base
+misc/screenshot2/etc/screenshot2 usr/lib/android-sdk/tools
\ No newline at end of file
diff --git a/debian/patches/set_classpaths.patch b/debian/patches/set_classpaths.patch
index df66628..f763fd0 100644
--- a/debian/patches/set_classpaths.patch
+++ b/debian/patches/set_classpaths.patch
@@ -10,7 +10,7 @@ Description: Set Class-Paths
jarpath="$frameworkdir/$jarfile"
fi
-+classpaths=`cat /usr/share/doc/android-platform-tools-base/screenshot2.classpaths`:$jarpath
++classpaths=`cat /usr/share/android-platform-tools-base/screenshot2.classpaths`:$jarpath
+mainclass=com.android.screenshot.Screenshot
+
# need to use "java.ext.dirs" because "-jar" causes classpath to be ignored
@@ -23,7 +23,7 @@ Description: Set Class-Paths
jarpath="$frameworkdir/$jarfile"
-+classpaths=`cat /usr/share/doc/android-platform-tools-base/lint.classpaths`:$jarpath
++classpaths=`cat /usr/share/android-platform-tools-base/lint.classpaths`:$jarpath
+
exec "$javaCmd" \
-Xmx1024m $os_opts $java_debug \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/android-platform-tools-base.git
More information about the pkg-java-commits
mailing list