mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-10-05 17:01:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

BSD license disambiguation

Browse source
This commit is contained in:
Ciaran Gultnieks 2012-08-21 21:59:28 +01:00
parent 55e38dbe1c
commit 2ed55dc233
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -1,3 +1,5 @@
For documentation, please see the docs directory. For documentation, please see the docs directory.
Alternatively, visit http://f-droid.org/manual/

8
docs/fdroid.texi
View file

@ -484,7 +484,11 @@ MIT X11 license
@item @item
@samp{BSD} @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 @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 Some things may not work properly yet. Talk to CiaranG if you're trying to use
this and have problems. 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 a Vagrant-compatible Debian Squeeze base box called 'debian6-32'. You can
create one of these for yourself from standard Debian installation media, as 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 the specification for what's required to be Vagrant-compatible is very well

4
wp-fdroid/wp-fdroid.php
View file

@ -120,8 +120,10 @@ class FDroid
switch($license) { switch($license) {
case 'MIT': case 'MIT':
return 'http://www.gnu.org/licenses/license-list.html#X11License'; return 'http://www.gnu.org/licenses/license-list.html#X11License';
case 'BSD': case 'NewBSD':
return 'http://www.gnu.org/licenses/license-list.html#ModifiedBSD'; 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':
case 'GPLv3+': case 'GPLv3+':
return 'http://www.gnu.org/licenses/license-list.html#GNUGPL'; return 'http://www.gnu.org/licenses/license-list.html#GNUGPL';