bump version numberv4.24.2

6 files changed, 38 insertions, 58 deletions

diff --git a/Makefile.am b/Makefile.am
index e5a7d57..c1e6a29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 # Automake requirements
-AUTOMAKE_OPTIONS = gnits 1.10
+AUTOMAKE_OPTIONS = gnits 1.10 dist-bzip2
 ACLOCAL_AMFLAGS = -I m4
 
 PACKAGE = sed
diff --git a/NEWS b/NEWS
index e696ce3..2799009 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
-Sed 4.1f
+Sed 4.2
+
+* now released under GPLv3
 
 * added a new extension `z` to clear pattern space even in the presence
 of invalid multibyte sequences
@@ -6,8 +8,12 @@ of invalid multibyte sequences
 * a preexisting GNU gettext installation is needed in order to compile
 GNU sed with NLS support
 
-* fixed --follow-symlinks to avoid attempting the creation of cross-device
-links.
+* new option --follow-symlinks, available when editing a file in-place.
+This option may not be available on some systems (in this case, the
+option will *not* be a no-op; it will be completely unavailable).
+In the future, the option may be added as a no-op on systems without
+symbolic links at all, since in this case a no-op is effectively
+indistinguishable from a correct implementation.
 
 * hold-space is reset between different files in -i and -s modes.
 
@@ -15,45 +21,19 @@ links.
 
 * the following GNU extensions are turned off by --posix: options [iImMsSxX]
 in the `s' command, address kinds `FIRST~STEP' and `ADDR1,+N' and `ADDR1,~N',
-`e' or `z' commands, text between an `a' or `c' or `i' command and the
-following backslash, arguments to the `l' command.
-
-----------------------------------------------------------------------------
-Sed 4.1
+line address 0, `e' or `z' commands, text between an `a' or `c' or `i'
+command and the following backslash, arguments to the `l' command.
+--posix disables all extensions to regular expressions.
 
 * fixed bug in 'i\' giving a segmentation violation if given alone.
 
-* 0,/REGEXP/ is rejected in --posix mode.
-
-* GPLv3 adopted
-
-----------------------------------------------------------------------------
-Sed 4.1c
-
-* portability fixes
-
-----------------------------------------------------------------------------
-Sed 4.1b
-
-* --posix disables all extensions to regular expressions.
-
-* new option --follow-symlinks, available when editing a file in-place.
-  This option may not be available on some systems (in this case, the
-  option will *not* be a no-op; it will be completely unavailable).
-  In the future, the option may be added as a no-op on systems without
-  symbolic links at all, since in this case a no-op is effectively
-  indistinguishable from a correct implementation.
-
-----------------------------------------------------------------------------
-Sed 4.1a
-
 * much improved portability
 
-* sed can be much faster in UTF-8 locales
+* much faster in UTF-8 locales
 
-* sed will correctly replace ACLs when using -i.
+* will correctly replace ACLs when using -i
 
-* sed will now accept NUL bytes for `.'
+* will now accept NUL bytes for `.'
 
 ----------------------------------------------------------------------------
 Sed 4.1.5
diff --git a/bootstrap.sh b/bootstrap.sh
index 4b47202..c25d16a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -20,7 +20,7 @@ if test -f config.h; then :; else
 
 #define PACKAGE "sed"
 #define PACKAGE_BUGREPORT "bug-gnu-utils@gnu.org"
-#define VERSION "4.1f-boot"
+#define VERSION "4.2-boot"
 #define SED_FEATURE_VERSION "4.2"
 #define BOOTSTRAP 1
 
diff --git a/configure.ac b/configure.ac
index e5bbdcc..ed5a728 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with -*- autoconf -*- to produce a configure script.
-AC_INIT(sed, 4.1f, bug-gnu-utils@gnu.org, sed)
+AC_INIT(sed, 4.2, bug-gnu-utils@gnu.org, sed)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_SRCDIR([sed/sed.c])
 AM_CONFIG_HEADER(config.h:config_h.in)
diff --git a/doc/sed.1 b/doc/sed.1
index a0aed54..3322d1d 100644
--- a/doc/sed.1
+++ b/doc/sed.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.28.
-.TH SED "1" "April 2009" "sed version 4.1f" "User Commands"
+.TH SED "1" "April 2009" "sed version 4.2" "User Commands"
 .SH NAME
 sed \- stream editor for filtering and transforming text
 .SH SYNOPSIS
diff --git a/po/sed.pot b/po/sed.pot
index a200a14..f287341 100644
--- a/po/sed.pot
+++ b/po/sed.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-gnu-utils@gnu.org\n"
-"POT-Creation-Date: 2009-03-31 09:43+0200\n"
+"POT-Creation-Date: 2009-04-30 10:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "couldn't edit %s: not a regular file"
 msgstr ""
 
-#: sed/execute.c:740 sed/utils.c:232
+#: sed/execute.c:740 sed/utils.c:222
 #, c-format
 msgid "couldn't open temporary file %s: %s"
 msgstr ""
@@ -274,7 +274,7 @@ msgid ""
 "                 use extended regular expressions in the script.\n"
 msgstr ""
 
-#: sed/sed.c:151
+#: sed/sed.c:153
 #, c-format
 msgid ""
 "  -s, --separate\n"
@@ -283,7 +283,7 @@ msgid ""
 "                 long stream.\n"
 msgstr ""
 
-#: sed/sed.c:154
+#: sed/sed.c:156
 #, c-format
 msgid ""
 "  -u, --unbuffered\n"
@@ -292,17 +292,17 @@ msgid ""
 "                 the output buffers more often\n"
 msgstr ""
 
-#: sed/sed.c:157
+#: sed/sed.c:159
 #, c-format
 msgid "      --help     display this help and exit\n"
 msgstr ""
 
-#: sed/sed.c:158
+#: sed/sed.c:160
 #, c-format
 msgid "      --version  output version information and exit\n"
 msgstr ""
 
-#: sed/sed.c:159
+#: sed/sed.c:161
 #, c-format
 msgid ""
 "\n"
@@ -313,24 +313,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sed/sed.c:315
+#: sed/sed.c:317
 #, c-format
 msgid "super-sed version %s\n"
 msgstr ""
 
-#: sed/sed.c:316
+#: sed/sed.c:318
 #, c-format
 msgid ""
 "based on GNU sed version %s\n"
 "\n"
 msgstr ""
 
-#: sed/sed.c:318
+#: sed/sed.c:320
 #, c-format
 msgid "GNU sed version %s\n"
 msgstr ""
 
-#: sed/sed.c:320
+#: sed/sed.c:322
 #, c-format
 msgid ""
 "%s\n"
@@ -339,44 +339,44 @@ msgid ""
 "to the extent permitted by law.\n"
 msgstr ""
 
-#: sed/utils.c:103 sed/utils.c:443
+#: sed/utils.c:93 sed/utils.c:433
 #, c-format
 msgid "cannot remove %s: %s"
 msgstr ""
 
-#: sed/utils.c:173
+#: sed/utils.c:163
 #, c-format
 msgid "couldn't open file %s: %s"
 msgstr ""
 
-#: sed/utils.c:196
+#: sed/utils.c:186
 #, c-format
 msgid "couldn't attach to %s: %s"
 msgstr ""
 
-#: sed/utils.c:250
+#: sed/utils.c:240
 #, c-format
 msgid "couldn't write %d item to %s: %s"
 msgid_plural "couldn't write %d items to %s: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sed/utils.c:265 sed/utils.c:281
+#: sed/utils.c:255 sed/utils.c:271
 #, c-format
 msgid "read error on %s: %s"
 msgstr ""
 
-#: sed/utils.c:383
+#: sed/utils.c:373
 #, c-format
 msgid "couldn't follow symlink %s: %s"
 msgstr ""
 
-#: sed/utils.c:417
+#: sed/utils.c:407
 #, c-format
 msgid "cannot stat %s: %s"
 msgstr ""
 
-#: sed/utils.c:448
+#: sed/utils.c:438
 #, c-format
 msgid "cannot rename %s: %s"
 msgstr ""