From 8cbd148e02db7081ba63d780fb8ae96e2d80efdd Mon Sep 17 00:00:00 2001
From: "Gary V. Vaughan" <gary@gnu.org>
Date: Sun, 16 Sep 2012 11:40:16 +0700
Subject: [PATCH] gnulib: update local gnulib patches.

* gl/build-aux/announce-gen.diff: Remove hunks adopted upstream.
* gl/build-aux/do-release-commit-and-tag.diff: Refresh this patch
to match current gnulib.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---
 gl/build-aux/announce-gen.diff              |  9 ---------
 gl/build-aux/do-release-commit-and-tag.diff | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/gl/build-aux/announce-gen.diff b/gl/build-aux/announce-gen.diff
index 937918a38..d39e8e29f 100644
--- a/gl/build-aux/announce-gen.diff
+++ b/gl/build-aux/announce-gen.diff
@@ -1,14 +1,5 @@
 --- gnulib/build-aux/announce-gen	2011-10-19 01:26:27.000000000 +0700
 +++ gl/build-aux/announce-gen	2011-10-19 16:54:12.000000000 +0700
-@@ -102,7 +102,7 @@
-   my %res;
-   foreach my $f (@file)
-     {
--      my $cmd = "du --human $f";
-+      my $cmd = "du -h $f";
-       my $t = `$cmd`;
-       # FIXME-someday: give a better diagnostic, a la $PROCESS_STATUS
-       $@
 @@ -449,7 +449,14 @@
  
  <\#secure method=pgpmime mode=sign>
diff --git a/gl/build-aux/do-release-commit-and-tag.diff b/gl/build-aux/do-release-commit-and-tag.diff
index 9dfa795c9..0496beda0 100644
--- a/gl/build-aux/do-release-commit-and-tag.diff
+++ b/gl/build-aux/do-release-commit-and-tag.diff
@@ -1,22 +1,22 @@
---- gnulib/build-aux/do-release-commit-and-tag	2011-10-19 22:37:21.000000000 +0700
-+++ gl/build-aux/do-release-commit-and-tag	2011-10-21 15:09:12.000000000 +0700
-@@ -74,6 +74,10 @@
-   esac
- }
+--- gnulib/build-aux/do-release-commit-and-tag	2012-09-16 10:56:58.000000000 +0700
++++ gl/build-aux/do-release-commit-and-tag	2012-09-16 11:01:14.000000000 +0700
+@@ -86,6 +86,10 @@
+ branch=$(git branch | sed -ne '/^\* /{s///;p;q;}')
+ builddir=.
  
 +for gsort in $SORT gsort sort; do
 +  echo 1|$gsort -V >/dev/null 2>/dev/null && break
 +done
 +
- branch=master
- case $1 in
-   --branch) shift; branch=$1; shift ;;
-@@ -95,7 +99,7 @@
+ while test $# != 0
+ do
+   # Handle --option=value by splitting apart and putting back on argv.
+@@ -125,7 +129,7 @@
    || die 'failed to determine previous version number from .prev-version'
  
  # Verify that $ver is sensible (> .prev-version).
 -case $(printf "$prev_ver\n$ver\n"|sort -V -u|tr '\n' ':') in
 +case $(printf "$prev_ver\n$ver\n"|$gsort -V -u|tr '\n' ':') in
    "$prev_ver:$ver:") ;;
-   *) die "invalid version: $ver";;
+   *) die "invalid version: $ver (<= $prev_ver)";;
  esac
-- 
2.47.2