[Pkg-gnupg-commit] [gnupg2] 02/02: debian/patches/0003-Include-defs.inc-in-BUILT_SOURCES.patch: Fix for build failure when rebuilding info docs.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 557a2449d866b8a3d903c5e0e3a9e720cb5aa39d
Author: Eric Dorland <eric at debian.org>
Date:   Tue Jun 30 17:32:24 2015 -0400

    debian/patches/0003-Include-defs.inc-in-BUILT_SOURCES.patch: Fix for build failure when rebuilding info docs.
---
 debian/changelog                                   |  5 ++++
 .../0004-Include-defs.inc-in-BUILT_SOURCES.patch   | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c84a75d..9306ce6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 gnupg2 (2.1.5-2) experimental; urgency=medium
 
+  [ Daniel Kahn Gillmor ]
   * pass DBUS_SESSION_BUS_ADDRESS through to the agent so that
     pinentry-gnome3 can work across sessions.
 
+  [ Eric Dorland ]
+  * debian/patches/0003-Include-defs.inc-in-BUILT_SOURCES.patch: Fix for
+    build failure when rebuilding info docs.
+
  -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Tue, 30 Jun 2015 11:58:07 -0400
 
 gnupg2 (2.1.5-1) experimental; urgency=medium
diff --git a/debian/patches/0004-Include-defs.inc-in-BUILT_SOURCES.patch b/debian/patches/0004-Include-defs.inc-in-BUILT_SOURCES.patch
new file mode 100644
index 0000000..c5af67a
--- /dev/null
+++ b/debian/patches/0004-Include-defs.inc-in-BUILT_SOURCES.patch
@@ -0,0 +1,27 @@
+From: Eric Dorland <eric at debian.org>
+Date: Tue, 30 Jun 2015 16:11:34 -0400
+Subject: Include defs.inc in BUILT_SOURCES
+
+* doc/Makefile.am: Building the info files can fail on a clean source
+tree since the .texi files include defs.inc. Use BUILT_SOURCES to force
+it to be built early.
+
+--
+Signed-off-by: Eric Dorland <eric at debian.org
+---
+ doc/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index ee8bca2..3ea19ad 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -41,7 +41,7 @@ EXTRA_DIST = samplekeys.asc mksamplekeys \
+ 	     gpgv.texi yat2m.c ChangeLog-2011 whats-new-in-2.1.txt
+ 
+ BUILT_SOURCES = gnupg-card-architecture.eps gnupg-card-architecture.png \
+-                gnupg-card-architecture.pdf defsincdate
++                gnupg-card-architecture.pdf defsincdate defs.inc
+ 
+ info_TEXINFOS = gnupg.texi
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 61d0094..4c23268 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-rename-gnupg2.patch
 0002-avoid-beta-warning.patch
 0003-pass-DBUS_SESSION_BUS_ADDRESS-for-gnome3.patch
+0004-Include-defs.inc-in-BUILT_SOURCES.patch

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