From b3759bbb7d1108b3193394b941eeee982f15b739 Mon Sep 17 00:00:00 2001 From: Alexander Kojevnikov Date: Sun, 15 Jan 2023 12:32:49 -0800 Subject: [PATCH] Fix distcheck --- .gitignore | 1 + CREDITS.md | 1 + MANUAL.md | 2 +- Makefile.am | 3 ++- dist/osx/bundle.sh | 3 ++- dist/win/bundle.sh | 3 ++- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a11ac7c..b1b2b14 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ compile config.* configure data/spek.desktop +data/spek.metainfo.xml depcomp dist/osx/Info.plist dist/osx/Spek.app diff --git a/CREDITS.md b/CREDITS.md index b9bc74c..0b51ba9 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -21,6 +21,7 @@ Contributors: * Jonathan Gonzalez V * Matteo Bini * Mike Wang +* Nils Fürniß * Simon Ruderich * Stefan Kost * Thibault North diff --git a/MANUAL.md b/MANUAL.md index 676eb73..f85a04b 100644 --- a/MANUAL.md +++ b/MANUAL.md @@ -76,7 +76,7 @@ On OS X use the Command key instead of Ctrl. # AUTHORS Alexander Kojevnikov . Other contributors are listed -in the LICENCE.md file distributed with the source code. +in the CREDITS.md file distributed with the source code. # DISTRIBUTION diff --git a/Makefile.am b/Makefile.am index 7fed23f..d4de932 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,8 +6,9 @@ SUBDIRS = \ tests EXTRA_DIST = \ + CREDITS.md \ INSTALL.md \ - LICENCE.md \ + LICENSE \ MANUAL.md \ README.md \ lic/Expat \ diff --git a/dist/osx/bundle.sh b/dist/osx/bundle.sh index 91d7736..c35f76a 100755 --- a/dist/osx/bundle.sh +++ b/dist/osx/bundle.sh @@ -17,7 +17,8 @@ mv ../../src/spek Spek.app/Contents/MacOS/Spek cp Info.plist Spek.app/Contents/ cp Spek.icns Spek.app/Contents/Resources/ cp *.png Spek.app/Contents/Resources/ -cp ../../LICENCE.md Spek.app/Contents/Resources/ +cp ../../CREDITS.md Spek.app/Contents/Resources/ +cp ../../LICENSE Spek.app/Contents/Resources/ cp ../../README.md Spek.app/Contents/Resources/ mkdir Spek.app/Contents/Resources/lic cp ../../lic/* Spek.app/Contents/Resources/lic/ diff --git a/dist/win/bundle.sh b/dist/win/bundle.sh index 9982a12..141dc9e 100755 --- a/dist/win/bundle.sh +++ b/dist/win/bundle.sh @@ -45,7 +45,8 @@ LDFLAGS="-mconsole" ./autogen.sh \ cd dist/win rm -fr Spek && mkdir Spek cp build/bin/spek.exe Spek/ -cp ../../LICENCE.md Spek/ +cp ../../CREDITS.md Spek/ +cp ../../LICENSE Spek/ cp ../../README.md Spek/ mkdir Spek/lic cp ../../lic/* Spek/lic/