gregorio-6.0.0 sources

git-svn-id: svn://tug.org/texlive/trunk@58336 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 25 insertions, 31 deletions

diff --git a/Build/source/texk/gregorio/ChangeLog b/Build/source/texk/gregorio/ChangeLog
index 4dcce2fad83..e8e1c03d406 100644
--- a/Build/source/texk/gregorio/ChangeLog
+++ b/Build/source/texk/gregorio/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-14  Karl Berry  <karl@tug.org>
+
+	* Import gregorio-6.0.0.
+	* version.ac: Adapted.
+
 2021-03-04  Karl Berry  <karl@tug.org>
 
 	* Import gregorio-6.0.0-beta2.
diff --git a/Build/source/texk/gregorio/TLpatches/TL-Changes b/Build/source/texk/gregorio/TLpatches/TL-Changes
index 86e84932de5..d64a29704ec 100644
--- a/Build/source/texk/gregorio/TLpatches/TL-Changes
+++ b/Build/source/texk/gregorio/TLpatches/TL-Changes
@@ -1,5 +1,5 @@
 Changes applied to the gregorio source tree as obtained from:
-	CTAN/support/gregoriotex/gregorio-6.2.2-beta2.zip
+	CTAN/support/gregoriotex/gregorio-6.0.0.zip
 
 Remove:
 	Makefile.in
diff --git a/Build/source/texk/gregorio/configure b/Build/source/texk/gregorio/configure
index 542ef92b0b1..4a1c5935561 100755
--- a/Build/source/texk/gregorio/configure
+++ b/Build/source/texk/gregorio/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 6.0.0-beta2.
+# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 6.0.0.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Gregorio (TeX Live)'
 PACKAGE_TARNAME='gregorio--tex-live-'
-PACKAGE_VERSION='6.0.0-beta2'
-PACKAGE_STRING='Gregorio (TeX Live) 6.0.0-beta2'
+PACKAGE_VERSION='6.0.0'
+PACKAGE_STRING='Gregorio (TeX Live) 6.0.0'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL='http://gregorio-project.github.io/'
 
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Gregorio (TeX Live) 6.0.0-beta2 to adapt to many kinds of systems.
+\`configure' configures Gregorio (TeX Live) 6.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1401,7 +1401,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Gregorio (TeX Live) 6.0.0-beta2:";;
+     short | recursive ) echo "Configuration of Gregorio (TeX Live) 6.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1521,7 +1521,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Gregorio (TeX Live) configure 6.0.0-beta2
+Gregorio (TeX Live) configure 6.0.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2360,7 +2360,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Gregorio (TeX Live) $as_me 6.0.0-beta2, which was
+It was created by Gregorio (TeX Live) $as_me 6.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8043,7 +8043,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gregorio--tex-live-'
- VERSION='6.0.0-beta2'
+ VERSION='6.0.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14463,7 +14463,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-Gregorio (TeX Live) config.lt 6.0.0-beta2
+Gregorio (TeX Live) config.lt 6.0.0
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16052,7 +16052,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Gregorio (TeX Live) $as_me 6.0.0-beta2, which was
+This file was extended by Gregorio (TeX Live) $as_me 6.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16119,7 +16119,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Gregorio (TeX Live) config.status 6.0.0-beta2
+Gregorio (TeX Live) config.status 6.0.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md b/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
index 3d4fa0b6f1b..f9166cc1298 100644
--- a/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
+++ b/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
@@ -2,18 +2,7 @@
 All notable changes to this project will be documented in this file.
 As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). It follows [some conventions](http://keepachangelog.com/).
 
-## [Unreleased][develop]
-
-
-## [Unreleased][CTAN]
-
-
-## [6.0.0-beta2] - 2021-03-04
-
-
-
-
-## [6.0.0-beta1] - 2021-02-23
+## [6.0.0] - 2021-03-13
 ### Fixed
 - Fixed some problem in 900_gregorio.xml (Scribus render frame tool).  First, the use of `filecontents` rather than `filecontents*` was leading to a comment header that made it impossible for Gregorio to find the gabc headers in the temporary score file.  Further, some of the indenting (which makes the file more human readable) was leading to errors in the formatting of the created files because they are processed in a way which handles whitespace differently from XML.  See [#1457](https://github.com/gregorio-project/gregorio/issues/1457).
 - `spacelinestext` is now based on the lyric font size instead of being a fixed distance.  As a result, large lyrics should no longer overlap with low notes.  See [#1261](https://github.com/gregorio-project/gregorio/issues/1261).
diff --git a/Build/source/texk/gregorio/gregorio-src/configure.ac b/Build/source/texk/gregorio/gregorio-src/configure.ac
index df5efce4367..c43ef3965a6 100644
--- a/Build/source/texk/gregorio/gregorio-src/configure.ac
+++ b/Build/source/texk/gregorio/gregorio-src/configure.ac
@@ -16,8 +16,8 @@ dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([gregorio],[6.0.0-beta2],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="6_0_0-beta2"
+AC_INIT([gregorio],[6.0.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="6_0_0"
 AC_SUBST(FILENAME_VERSION)
 AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
 MK=""
diff --git a/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc b/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
index 112d36923b6..8ba089344c8 100644
--- a/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
+++ b/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
@@ -1,7 +1,7 @@
 IDI_ICON1 ICON DISCARDABLE "gregorio.ico"
 1 VERSIONINFO
-FILEVERSION     6,0,0,12
-PRODUCTVERSION  6,0,0,12
+FILEVERSION     6,0,0,30
+PRODUCTVERSION  6,0,0,30
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -9,12 +9,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "Gregorio project"
       VALUE "FileDescription", "Gregorio"
-      VALUE "FileVersion", "6.0.0-beta2"
+      VALUE "FileVersion", "6.0.0"
       VALUE "InternalName", "gregorio"
       VALUE "LegalCopyright", "See COPYING in the installation directory."
       VALUE "OriginalFilename", "gregorio.exe"
       VALUE "ProductName", "Gregorio"
-      VALUE "ProductVersion", "6.0.0-beta2"
+      VALUE "ProductVersion", "6.0.0"
     END
   END
 
diff --git a/Build/source/texk/gregorio/version.ac b/Build/source/texk/gregorio/version.ac
index f51728b6c34..3eb11945574 100644
--- a/Build/source/texk/gregorio/version.ac
+++ b/Build/source/texk/gregorio/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current gregorio version
-m4_define([gregorio_version], [6.0.0-beta2])
+m4_define([gregorio_version], [6.0.0])