[git] GPG-ERROR - branch, master, updated. libgpg-error-1.31-9-g302d43a

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  302d43a130e2364ea882474088a8b0a31bc325b9 (commit)
      from  1ac63f630cbe1b558ebe20b746bbe4962117d36f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 302d43a130e2364ea882474088a8b0a31bc325b9
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Jul 10 17:10:13 2018 +0900

    build: Remove version_parts in autogen.sh.
    
    * autogen.rc (version_parts): Remove.
    * autogen.sh: Determine by $micro argument.
    
    --
    
    It can be determined by the invocation of
    
        ./autogen.sh --find-version
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/autogen.rc b/autogen.rc
index 4e1918a..a15b3a3 100644
--- a/autogen.rc
+++ b/autogen.rc
@@ -3,8 +3,6 @@
 display_name="Libgpg-error"
 patches_to="gnupg-devel at gnupg.org"
 
-version_parts=2
-
 case "$myhost:$myhostsub" in
   w32:ce)
     extraoptions=
diff --git a/autogen.sh b/autogen.sh
index 23d27f3..9b36158 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@
 # configure it for the respective package.  It is maintained as part of
 # GnuPG and source copied by other packages.
 #
-# Version: 2018-02-21
+# Version: 2018-07-10
 
 configure_ac="configure.ac"
 
@@ -74,7 +74,6 @@ PRINT_HOST=no
 PRINT_BUILD=no
 tmp=$(dirname "$0")
 tsdir=$(cd "${tmp}"; pwd)
-version_parts=3
 
 if [ -n "${AUTOGEN_SH_SILENT}" ]; then
   SILENT=" --silent"
@@ -239,18 +238,15 @@ if [ "$myhost" = "find-version" ]; then
       exit 1
     fi
 
-    case "$version_parts" in
-      2)
-        matchstr1="$package-$major.[0-9]*"
-        matchstr2="$package-$major-base"
-        vers="$major.$minor"
-        ;;
-      *)
-        matchstr1="$package-$major.$minor.[0-9]*"
-        matchstr2="$package-$major.$minor-base"
-        vers="$major.$minor.$micro"
-        ;;
-    esac
+    if [ -z "$micro" ]; then
+      matchstr1="$package-$major.[0-9]*"
+      matchstr2="$package-$major-base"
+      vers="$major.$minor"
+    else
+      matchstr1="$package-$major.$minor.[0-9]*"
+      matchstr2="$package-$major.$minor-base"
+      vers="$major.$minor.$micro"
+    fi
 
     beta=no
     if [ -e .git ]; then

-----------------------------------------------------------------------

Summary of changes:
 autogen.rc |  2 --
 autogen.sh | 24 ++++++++++--------------
 2 files changed, 10 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org