[Pkg-gnupg-commit] [gnupg] 06/17: avoid naming from git during autoreconf

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg.

commit 3df69969487931db4d534d9e251ed36a88f14c53
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Apr 1 06:06:25 2016 -0400

    avoid naming from git during autoreconf
---
 ...id-looking-for-git-info-during-autoreconf.patch | 28 ++++++++++++++++++++++
 ....patch => 0002-Update-Danish-translation.patch} |  0
 debian/patches/series                              |  3 ++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch b/debian/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
new file mode 100644
index 0000000..e057576
--- /dev/null
+++ b/debian/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
@@ -0,0 +1,28 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Fri, 1 Apr 2016 06:04:20 -0400
+Subject: avoid looking for git info during autoreconf
+
+---
+ configure.ac | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 92ae205..f27bffa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,13 +32,10 @@ m4_define([mym4_version], [1.4.20])
+ # the decimalized short revision number, a beta version string and a
+ # flag indicating a development version (mym4_isgit).  Note that the
+ # m4 processing is done by autoconf and not during the configure run.
+-m4_define([mym4_revision],
+-          m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++m4_define([mym4_revision],[])
+ m4_define([mym4_revision_dec],
+           m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+-m4_define([mym4_betastring],
+-          m4_esyscmd_s([git describe --match 'gnupg-1.[0-9].*[0-9]' --long|\
+-                        awk -F- '$3!=0{print"-beta"$3}']))
++m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+ 
diff --git a/debian/patches/0001-Update-Danish-translation.patch b/debian/patches/0002-Update-Danish-translation.patch
similarity index 100%
rename from debian/patches/0001-Update-Danish-translation.patch
rename to debian/patches/0002-Update-Danish-translation.patch
diff --git a/debian/patches/series b/debian/patches/series
index e80e905..b8f6416 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-0001-Update-Danish-translation.patch
+0001-avoid-looking-for-git-info-during-autoreconf.patch
+0002-Update-Danish-translation.patch

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