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.

diff --git a/Admin/release-steps b/Admin/release-steps
index ee66ba33f1dbab68b82cfcd68e8ce291754e895b..1eab4d353715bce3b775ef5a43668f7484668b69 100644 (file)
--- a/Admin/release-steps
+++ b/Admin/release-steps
@@ -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:

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 8bc50b9a99b6ffd85074ee2e44dd676e4324fd00..62d550a683e84c9a4457375ee1fc290ea1a622c2 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -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

diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 655c23c13149e455c6271fd3de37f95b4c36e190..6562097b3ceb269e604f0600789dc6db8e9c6bdb 100644 (file)
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -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.