From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 21 Aug 2012 20:59:28 +0000 (+0100)
Subject: BSD license disambiguation
X-Git-Tag: 0.1~787
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2ed55dc2331a6ce0e9c3521861893f21c861db9d;p=fdroidserver.git

BSD license disambiguation
---

diff --git a/README b/README
index d56e5dc3..4aad1d08 100644
--- a/README
+++ b/README
@@ -1,3 +1,5 @@
 
 For documentation, please see the docs directory.
 
+Alternatively, visit http://f-droid.org/manual/
+
diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 5a7fb5bd..3a328cd4 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -484,7 +484,11 @@ MIT X11 license
 
 @item
 @samp{BSD}
-BSD license. Some disambiguation is needed here, regarding original versions modfied versions of this license.
+BSD license - the original '4-clause' version.
+
+@item
+@samp{NewBSD}
+BSD license - the new, or modified, version.
 
 @end itemize
 
@@ -966,7 +970,7 @@ Integrating the build server setup into the main scripts is a work in progress.
 Some things may not work properly yet. Talk to CiaranG if you're trying to use
 this and have problems.
 
-In addition to the basic setup sets previously described, you will also need
+In addition to the basic setup previously described, you will also need
 a Vagrant-compatible Debian Squeeze base box called 'debian6-32'. You can
 create one of these for yourself from standard Debian installation media, as
 the specification for what's required to be Vagrant-compatible is very well
diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php
index 29884e1b..0ef5df59 100644
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@ -120,8 +120,10 @@ class FDroid
 	    switch($license) {
         	    case 'MIT':
 			return 'http://www.gnu.org/licenses/license-list.html#X11License';
-		    case 'BSD':
+		    case 'NewBSD':
 			return 'http://www.gnu.org/licenses/license-list.html#ModifiedBSD';
+		    case 'BSD':
+			return 'http://www.gnu.org/licenses/license-list.html#OriginalBSD';
 		    case 'GPLv3':
 		    case 'GPLv3+':
 			return 'http://www.gnu.org/licenses/license-list.html#GNUGPL';