gettextize: Use a crafted version string

Reported by Max Lin in:
<https://lists.gnu.org/archive/html/bug-gettext/2015-07/msg00024.html>.
* gettextize.in: Replace AM_GNU_GETTEXT_VERSION invocation with
"$gettext_version" rather than "$version".  This makes it easier
to maintain a minor release without being affected by the actual
version number generated by git-version-gen.
(gettext_version): New variable.
This commit is contained in:
Daiki Ueno
2015-07-27 15:08:43 +09:00
parent 6e86bd9b14
commit 71073669ae
3 changed files with 18 additions and 2 deletions
+4
View File
@@ -120,6 +120,10 @@ Release procedure
Update required_gettext_version.
- gettext-tools/misc/gettextize.in
Update gettext_version.
and commit the changes.
* Update all ChangeLogs:
+11
View File
@@ -1,3 +1,14 @@
2015-07-27 Daiki Ueno <ueno@gnu.org>
gettextize: Use a crafted version string
Reported by Max Lin in:
<https://lists.gnu.org/archive/html/bug-gettext/2015-07/msg00024.html>.
* gettextize.in: Replace AM_GNU_GETTEXT_VERSION invocation with
"$gettext_version" rather than "$version". This makes it easier
to maintain a minor release without being affected by the actual
version number generated by git-version-gen.
(gettext_version): New variable.
2015-07-27 Peter Eisentraut <peter@eisentraut.org> (tiny change)
po-mode: Fix to accept four-part msgfmt version number
+3 -2
View File
@@ -23,6 +23,7 @@
progname=$0
package=@PACKAGE@
version=@VERSION@
gettext_version=0.19.5
# Set variables
# - gettext_datadir directory where the data files are stored.
@@ -1235,8 +1236,8 @@ sed -e 's%sed -e "/POTFILES =/r po/POTFILES" po/Makefile\.in > po/Makefile *;* *
func_modify_configure_in "(AC_OUTPUT): Remove command that created po/Makefile."
sed -e '/^\(dnl \|\)AC_LINK_FILES(\$nls_cv_header_libgt, \$nls_cv_header_intl)$/d' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
func_modify_configure_in "(AC_LINK_FILES): Remove invocation."
sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"$version"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
func_modify_configure_in "(AM_GNU_GETTEXT_VERSION): Bump to $version."
sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"$gettext_version"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
func_modify_configure_in "(AM_GNU_GETTEXT_VERSION): Bump to $gettext_version."
$do_changelog && func_ChangeLog_finish
# Recommend replacement for deprecated Makefile variables.