[Pkg-gnupg-commit] [libgpg-error] 02/02: select revision based on debian/changelog instead of git commit ID

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository libgpg-error.

commit 5808acd089833963ed378a476526605f2b9af499
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Feb 9 01:14:52 2016 -0500

    select revision based on debian/changelog instead of git commit ID
---
 ...re-revision-by-length-of-debian-changelog.patch | 31 ++++++++++++++++++++++
 ...pace-in-gpg-error.def-linker-script-for-.patch} |  0
 debian/patches/series                              |  3 ++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0002-Measure-revision-by-length-of-debian-changelog.patch b/debian/patches/0002-Measure-revision-by-length-of-debian-changelog.patch
new file mode 100644
index 0000000..4b7e687
--- /dev/null
+++ b/debian/patches/0002-Measure-revision-by-length-of-debian-changelog.patch
@@ -0,0 +1,31 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Tue, 9 Feb 2016 01:09:26 -0500
+Subject: Measure revision by length of debian/changelog
+
+Upstream libgpg-error's autoreconf step derives the package "revision"
+number from the first couple octets of the git commit ID.
+
+But Debian doesn't build packages from git, and we autoreconf the
+package before building.  So we need to figure out a different value
+for the package revision.
+
+This patch makes the package revision reflect the number of lines in
+debian/changelog instead of trying to derive a revision number from
+the git ID.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8b83c2c..2d27cc6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,7 +35,7 @@ m4_define([mym4_version_minor], [21])
+ # processing is done by autoconf and not during the configure run.
+ m4_define([mym4_version], [mym4_version_major.mym4_version_minor])
+ m4_define([mym4_revision],
+-          m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++          m4_esyscmd([printf %x $(wc -l < debian/changelog)]))
+ m4_define([mym4_revision_dec],
+           m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+ m4_define([mym4_betastring],
diff --git a/debian/patches/0002-avoid-whitespace-in-gpg-error.def-linker-script-for-.patch b/debian/patches/0003-avoid-whitespace-in-gpg-error.def-linker-script-for-.patch
similarity index 100%
rename from debian/patches/0002-avoid-whitespace-in-gpg-error.def-linker-script-for-.patch
rename to debian/patches/0003-avoid-whitespace-in-gpg-error.def-linker-script-for-.patch
diff --git a/debian/patches/series b/debian/patches/series
index dae2fc7..46e7f1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-avoid-identifying-as-beta.patch
-0002-avoid-whitespace-in-gpg-error.def-linker-script-for-.patch
+0002-Measure-revision-by-length-of-debian-changelog.patch
+0003-avoid-whitespace-in-gpg-error.def-linker-script-for-.patch

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