From: David Black <david8black@gmail.com>
Date: Sun, 14 Jul 2013 14:58:57 +0000 (+0100)
Subject: improvements to Requirements section of manual
X-Git-Tag: 0.1~508
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=48d05917b4edaeab761704e21d0baf7639bc3b17;p=fdroidserver.git

improvements to Requirements section of manual
---

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index d01c77a9..ce0478c6 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -9,6 +9,7 @@ This manual is for the F-Droid repository server tools.
 
 Copyright @copyright{} 2010, 2011, 2012, 2013 Ciaran Gultnieks
 Copyright @copyright{} 2011 Henrik Tunedal, Michael Haas, John Sullivan
+Copyright @copyright{} 2013 David Black
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -77,7 +78,12 @@ GNU/Linux
 @item
 Python 2.x
 @item
-The Android SDK
+The Android SDK Tools and Build-tools. 
+Note that F-Droid does not assume that you have the Android SDK in your 
+@code{PATH}: these directories will be specified in your repository 
+configuration. Recent revisions of the SDK have @code{aapt} located in 
+android-sdk/build-tools/ and it may be necessary to make a symlink to it in 
+android-sdk/platform-tools/
 @end itemize
 
 If you intend to build applications from source you'll also need most, if not
@@ -85,23 +91,34 @@ all, of the following:
 
 @itemize @bullet
 @item
-All available SDK platforms and tools installed in the Android SDK, but *not*
-the proprietary components.
+All SDK platforms requested by the apps you want to build
+(The Android SDK is made available by Google under a proprietary license but
+within that, the SDK platforms, support library and some other components are 
+under the Apache license and source code is provided. 
+Google APIs, used for building apps using Google Maps, are free to the extent 
+that the library comes pre-installed on the device.
+Google Play Services, Google Admob and others are proprietary and shouldn't be
+included in the main F-Droid repository.)
 @item
-The Android NDK
+A version of the Android NDK
 @item
 Ant
 @item
 Ant Contrib Tasks (Debian package ant-contrib)
 @item
-Maven (Debian package maven2)
+Maven (Debian package maven)
 @item
 JavaCC (Debian package javacc)
 @item
-JDK (Debian package openjdk-6-jdk)
+JDK (Debian package openjdk-6-jdk): openjdk-6 is recommended though openjdk-7
+should work too
 @item
 VCS clients: svn, git, git-svn, hg, bzr
 @item
+Miscellaneous packages listed in 
+buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+of the F-Droid server repository
+@item
 A keystore for holding release keys. (Safe, secure and well backed up!)
 @end itemize