diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-29 13:22:43 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-29 13:22:43 +0000 |
| commit | 9301524c500e7e7567d5da54b3f3d7d07e53d921 (patch) | |
| tree | 0840563df149cb2a60cb681962759b94c2d5a19c /doc/meta.xml | |
| parent | 1b25d01703414cc61f3e540905bedad92612e82c (diff) | |
* Fontconfig updated to 2.7.3. Use /etc/fonts as the default
configuration directory so that users on other distributions don't
need to set $FONTCONFIG_FILE (NIXPKGS-29). Also use
/var/cache/fontconfig for the cache to prevent programs run by root
from writing into the Nix store.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18021
Diffstat (limited to 'doc/meta.xml')
| -rw-r--r-- | doc/meta.xml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/meta.xml b/doc/meta.xml index 691bb4019bde..91f5f20498e5 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -165,6 +165,18 @@ following: </varlistentry> <varlistentry> + <term><varname>bsd</varname></term> + <listitem><para>Catch-all for licenses that are essentially + similar to <link + xlink:href="http://www.gnu.org/licenses/license-list.html#ModifiedBSD">the + original BSD license with the advertising clause removed</link>, + i.e. permissive non-copyleft free software licenses. This + includes the <link + xlink:href="http://www.gnu.org/licenses/license-list.html#X11License">X11 + (“MIT”) License</link>.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>free</varname></term> <listitem><para>Catch-all for free software licenses not listed above.</para></listitem> |