* NEWS: Update.

* gnulib: Update to latest.
* bootstrap: Update from gnulib.

4 files changed, 22 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index ee6cc15..c02662e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-05-02  Andreas Gruenbacher  <agruen@suse.de>
 
+	* NEWS: Update.
+	* gnulib: Update to latest.
+	* bootstrap: Update from gnulib.
+
 	* src/patch.c (main): Refuse to patch read-only files, or at least warn
 	when patching such files with --force or --batch.
 	* patch.man: Document the changed behavior.
diff --git a/NEWS b/NEWS
index 16ecb19..6ec1626 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,18 @@
-* When a filename in a context diff starts with a double quote, it is
-  interpreted as a C string literal.  The escape sequences \\, \", \a,
-  \b, \f, \n, \r, \t, \v, and \ooo (a three-digit octal number between
-  0 and 255) are recognized.
-* When fed a git binary diff, patch complains and skips the diff.
-* Timestamps and --set-time or --set-utc: support for nanosecond precision.
-  Honor time zones in timestamps over the local time zone (--set-time) or
-  Universal Coordinated Time (--set-utc).
-* Many portability and several bug fixes.
+* Support for most features of the "diff --git" format: renames and copies,
+  permission changes, symlink diffs.  (Binary diffs are not supported yet;
+  patch will complain and skip them.)
+* Support for double-quoted filenames: when a filename in a context diff
+  starts with a double quote, it is interpreted as a C string literal.  The
+  escape sequences \\, \", \a, \b, \f, \n, \r, \t, \v, and \ooo (a three-digit
+  octal number between 0 and 255) are recognized.
+* Refuse to patch read-only files by default, or at least warn when patching
+  such files with --force or --batch.
+* Refuse to apply a normal patch to a symlink.  (Previous versions of patch
+  were wrongly replacing the symlink with a regular file.)
+* When a timestamp specifies a time zone, honor that instead of assuming the
+  local time zone (--set-date) or Universal Coordinated Time (--set-utc).
+* Support for nanosecond precision timestamps.
+* Many portability and bug fixes.
 
 Changes in version 2.6.1:
 
diff --git a/bootstrap b/bootstrap
index 9686baa..e55b3d2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-02-24.17; # UTC
+scriptversion=2010-04-30.16; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -819,7 +819,7 @@ if test $with_gettext = yes; then
       a\
           '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
     }
-  ' po/Makevars.template >po/Makevars
+  ' po/Makevars.template >po/Makevars || exit 1
 
   if test -d runtime-po; then
     # Similarly for runtime-po/Makevars, but not quite the same.
@@ -833,7 +833,7 @@ if test $with_gettext = yes; then
         a\
             '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
       }
-    ' <po/Makevars.template >runtime-po/Makevars
+    ' po/Makevars.template >runtime-po/Makevars || exit 1
 
     # Copy identical files from po to runtime-po.
     (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
diff --git a/gnulib b/gnulib
-Subproject e768d427cc2d135f6123e0408cd61e52345bf92
+Subproject 3b1e7b987f936143f1e133401882f87fc411014