Download markdown version of the license from GNU and rename to `COPY…

…ING.md` From https://www.gnu.org/licenses/old-licenses/gpl-2.0.md
jgm · Oct 19, 2016 · 4b51ed3 · 4b51ed3
1 parent be5bd22
commit 4b51ed3
Show file tree

Hide file tree

Showing 7 changed files with 366 additions and 351 deletions.
diff --git a/COPYING b/COPYING
diff --git a/COPYING.md b/COPYING.md
diff --git a/COPYRIGHT b/COPYRIGHT
@@ -17,7 +17,7 @@ This code is released under the [GPL], version 2 or later:
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-The GNU General Public License is available in the file COPYING in
+The GNU General Public License is available in the file COPYING.md in
 the source distribution.  On Debian systems, the complete text of the
 GPL can be found in `/usr/share/common-licenses/GPL`.
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -38,7 +38,7 @@ after_test:
   - cd windows
   - 7z a "pandoc.zip" pandoc.exe
   - .\pandoc.exe -s -S --toc ..\MANUAL.txt -o MANUAL.html
-  - .\pandoc.exe -s -S ..\COPYING -o COPYING.rtf
+  - .\pandoc.exe -s -S ..\COPYING.md -o COPYING.rtf
   - copy ..\COPYRIGHT COPYRIGHT.txt
   - |
       set VERSION=

diff --git a/make_osx_package.sh b/make_osx_package.sh
@@ -49,7 +49,7 @@ cp man/pandoc.1 $DEST/share/man/man1/
 chown -R $ME:staff $DIST
 
 echo Copying license...
-$OSX/pandoc --data data -t html5 -s COPYING -o $RESOURCES/license.html
+$OSX/pandoc --data data -t html5 -s COPYING.md -o $RESOURCES/license.html
 
 # Removing executable signing because of a problem that arose in El Capitan
 # "source=obsolete resource envelope"

diff --git a/pandoc.cabal b/pandoc.cabal
@@ -3,7 +3,7 @@ Version:         1.17.3
 Cabal-Version:   >= 1.10
 Build-Type:      Custom
 License:         GPL
-License-File:    COPYING
+License-File:    COPYING.md
 Copyright:       (c) 2006-2016 John MacFarlane
 Author:          John MacFarlane <jgm@berkeley.edu>
 Maintainer:      John MacFarlane <jgm@berkeley.edu>

diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat
@@ -4,7 +4,7 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 for /f "delims=" %%a in ('stack path --local-bin-path') do @set BINPATH=%%a
 %BINPATH%\pandoc.exe -s -S --toc ..\MANUAL.txt -o MANUAL.html
 if %errorlevel% neq 0 exit /b %errorlevel%
-%BINPATH%\pandoc.exe -s ..\COPYING -t rtf -S -o COPYING.rtf
+%BINPATH%\pandoc.exe -s ..\COPYING.md -t rtf -S -o COPYING.rtf
 if %errorlevel% neq 0 exit /b %errorlevel%
 copy ..\COPYRIGHT COPYRIGHT.txt
 for /f "tokens=1-2 delims= " %%a in ('%BINPATH%\pandoc.exe --version') do (