Rename lgpl.txt to LICENSE.txt

- Move and rename gfdl.txt to doc/LICENSE.txt
- Clarify which license is for what part of the software
- Minor fixes to include correct licenses into ZIP files

README.md

@@ -46,9 +46,13 @@ can be found [here][C2].
 Licenses
 --------
 
-This software is distributed under the terms of the Free Software Foundation [Lesser GNU Public License (LGPL), version 2.1][D1] (see lgpl.txt).
+- This software is distributed under the terms of the Free Software Foundation [Lesser GNU Public License (LGPL), version 2.1][D1] (see [LICENSE.txt][D2]).
+- The documentation for this software is distributed under the terms of the Free Software Foundation [GNU Free Documentation License (GNU FDL), version 1.1][D3] (see [doc/LICENSE.txt][D4]).
 
 [D1]: http://www.gnu.org/licenses/lgpl-2.1-standalone.html
+[D2]: LICENSE.txt
+[D3]: http://www.gnu.org/licenses/old-licenses/fdl-1.1-standalone.html
+[D4]: doc/LICENSE.txt
 
 Credits
 -------

default.build

@@ -78,8 +78,6 @@
 		<foreach item="String" delim=" " property="framework" in="${supported.frameworks}">
 			<call target="set-${framework}-framework-configuration" />
 			<call target="build" />
-			<!-- Copy and rename the license -->
-			<copy file="lgpl.txt" tofile="${bin.dir}/NHibernate.license.txt"  />
 		</foreach>
 
 		<!-- Reset the current framework to the saved value -->
@@ -124,10 +122,9 @@
 				<include name="build-common/**" />
 
 				<include name="*.build" />
-				<include name="gfdl.txt" />
-				<include name="lgpl.txt" />
+				<include name="LICENSE.txt" />
 				<include name="releasenotes.txt" />
-				<include name="readme.html" />
+				<include name="README.md" />
 
 				<!-- exclude ReSharper stuff -->
 				<exclude name="**/_ReSharper*/**" />
@@ -170,8 +167,7 @@
 		<property name="bin-pack.tests" value="${bin-pack.tmpdir}/Tests" />
 
 		<copy file="releasenotes.txt" todir="${bin-pack.tmpdir}"/>
-		<copy file="lgpl.txt" todir="${bin-pack.tmpdir}/NHibernate.license.txt"/>
-		<copy file="gfdl.txt" todir="${bin-pack.tmpdir}"/>
+		<copy file="LICENSE.txt" todir="${bin-pack.tmpdir}"/>
 		<copy file="HowInstall.txt" todir="${bin-pack.tmpdir}"/>
 
 		<exec program="CScript.exe"

doc/documentation.build

@@ -26,6 +26,7 @@
 
 	<target name="manual" depends="init">
 		<property name="lang" value="en" />
+		<copy file="LICENSE.txt" todir="${doc.out.dir}"/>
 		<nant target="build" buildfile="reference/reference.build">
 			<properties>
 				<property name="lang" value="${lang}" />

src/NHibernate.Everything.sln

@@ -35,9 +35,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NAnt Build", "NAnt Build",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Information", "Information", "{1631B0BA-59AC-4F0D-B300-3F64CC7579C9}"
 	ProjectSection(SolutionItems) = preProject
-		..\gfdl.txt = ..\gfdl.txt
-		..\lgpl.txt = ..\lgpl.txt
-		..\readme.html = ..\readme.html
+		..\LICENSE.txt = ..\LICENSE.txt
+		..\README.md = ..\README.md
 		..\releasenotes.txt = ..\releasenotes.txt
 		..\sample build commands.txt = ..\sample build commands.txt
 		..\ShowBuildMenu.bat = ..\ShowBuildMenu.bat

src/NHibernate/NHibernate.build

@@ -23,7 +23,7 @@
     <copy file="${bin.dir}/NHibernate.xml" todir="${nuget.workingdir}"/>
     <copy file="${root.dir}/releasenotes.txt" tofile="${nuget.workingdir}/NHibernate.releasenotes.txt"/>
     <exec program="CScript.exe" commandline="${root.dir}/Tools/showdown/showdown.wsf ${root.dir}/README.md ${nuget.workingdir}/NHibernate.readme.html"/>
-    <copy file="${root.dir}/lgpl.txt" tofile="${nuget.workingdir}/NHibernate.license.txt"/>
+    <copy file="${root.dir}/LICENSE.txt" tofile="${nuget.workingdir}/NHibernate.license.txt"/>
     <copy todir="${nuget.workingdir}">
       <fileset basedir="${root.dir}/src/NHibernate">
         <include name="*.xsd" />

src/NHibernate/NHibernate.nuspec.template

@@ -20,8 +20,8 @@
     <projectUrl>
       http://nhibernate.info
     </projectUrl>
-    <iconUrl>https://raw.github.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</iconUrl>
-    <licenseUrl>https://raw.github.com/nhibernate/nhibernate-core/master/lgpl.txt</licenseUrl>
+    <iconUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</iconUrl>
+    <licenseUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/LICENSE.txt</licenseUrl>
   </metadata>
   <files>
     <file src="NHibernate.dll" target="lib\net461" />