[Pkg-gnupg-commit] [libassuan] 08/09: avoid self-describing as a beta when build from revision control

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository libassuan.

commit 24fc4388d0c59c1e92eac10c421b47a3bbfdf83c
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Nov 16 21:15:36 2016 +0900

    avoid self-describing as a beta when build from revision control
---
 .../0002-avoid-self-describing-as-a-beta.patch     | 42 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 43 insertions(+)

diff --git a/debian/patches/0002-avoid-self-describing-as-a-beta.patch b/debian/patches/0002-avoid-self-describing-as-a-beta.patch
new file mode 100644
index 0000000..1b1d665
--- /dev/null
+++ b/debian/patches/0002-avoid-self-describing-as-a-beta.patch
@@ -0,0 +1,42 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Wed, 16 Nov 2016 21:14:34 +0900
+Subject: avoid self-describing as a beta
+
+Using autoreconf against the source as distributed in tarball form
+invariably results in a package that thinks it's a "beta" package,
+which produces the "THIS IS A DEVELOPMENT VERSION" warning string.
+
+since we use dh_autoreconf, i need this patch to avoid producing
+builds that announce themselves as DEVELOPMENT VERSIONs.
+
+See discussion at:
+
+ http://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029065.html
+---
+ autogen.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 90e7d7f..210409b 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -214,7 +214,7 @@ if [ "$myhost" = "find-version" ]; then
+     esac
+ 
+     beta=no
+-    if [ -d .git ]; then
++    if false; then
+       ingit=yes
+       tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
+       if [ -n "$tmp" ]; then
+@@ -228,8 +228,8 @@ if [ "$myhost" = "find-version" ]; then
+       rvd=$((0x$(echo ${rev} | head -c 4)))
+     else
+       ingit=no
+-      beta=yes
+-      tmp="-unknown"
++      beta=no
++      tmp=""
+       rev="0000000"
+       rvd="0"
+     fi
diff --git a/debian/patches/series b/debian/patches/series
index 26cf27d..66ecf03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-avoid-linker-errors-when-cross-building-for-win32.patch
+0002-avoid-self-describing-as-a-beta.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git