gnupg/trunk/avoid-beta-warning.patch

   1 From 114ab3037de3b0f9b35cf023b64c8a9b76070065 Mon Sep 17 00:00:00 2001
   2 From: Debian GnuPG Maintainers <pkg-gnupg-maint@lists.alioth.debian.org>
   3 Date: Tue, 14 Apr 2015 10:02:31 -0400
   4 Subject: [PATCH 6/7] avoid beta warning
   5
   6 avoid self-describing as a beta
   7
   8 Using autoreconf against the source as distributed in tarball form
   9 invariably results in a package that thinks it's a "beta" package,
  10 which produces the "THIS IS A DEVELOPMENT VERSION" warning string.
  11
  12 since we use dh_autoreconf, i need this patch to avoid producing
  13 builds that announce themselves as DEVELOPMENT VERSIONs.
  14
  15 See discussion at:
  16
  17  http://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029065.html
  18 ---
  19  autogen.sh | 6 +++---
  20  1 file changed, 3 insertions(+), 3 deletions(-)
  21
  22 diff --git a/autogen.sh b/autogen.sh
  23 index b23855061..9b86d3ff9 100755
  24 --- a/autogen.sh
  25 +++ b/autogen.sh
  26 @@ -229,24 +229,24 @@ if [ "$myhost" = "find-version" ]; then
  27      esac
  28
  29      beta=no
  30 -    if [ -e .git ]; then
  31 +    if false; then
  32        ingit=yes
  33        tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
  34        tmp=$(echo "$tmp" | sed s/^"$package"//)
  35        if [ -n "$tmp" ]; then
  36            tmp=$(echo "$tmp" | sed s/^"$package"//  \
  37                  | awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}')
  38        else
  39            tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null \
  40                  | awk -F- '$4!=0{print"-beta"$4}')
  41        fi
  42        [ -n "$tmp" ] && beta=yes
  43        rev=$(git rev-parse --short HEAD | tr -d '\n\r')
  44        rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
  45      else
  46        ingit=no
  47 -      beta=yes
  48 -      tmp="-unknown"
  49 +      beta=no
  50 +      tmp=""
  51        rev="0000000"
  52        rvd="0"
  53      fi
  54 --
  55 2.27.0
  56