[tachyon] 01/01: Imported Debian patch 0.99~b6+dsx-6: FTBFS #837012 fix

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository tachyon.

commit 90592f9f5519878d56e54ae33a90f598e870f6a6
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Tue Sep 13 02:49:59 2016 +0100

    Imported Debian patch 0.99~b6+dsx-6: FTBFS #837012 fix
---
 debian/changelog                   | 9 +++++++++
 debian/patches/debianization.patch | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c86312a..ea04671 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tachyon (0.99~b6+dsx-6) unstable; urgency=medium
+
+  * FTBFS bug fix release (Closes: #837012):
+    - configure.ac as provided for debianization, harden.
+  * Debianization:
+    - d/p/debianization.patch, see FTBFS bug fix above.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Tue, 13 Sep 2016 01:42:37 +0000
+
 tachyon (0.99~b6+dsx-5) unstable; urgency=medium
 
   * Debianization:
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index cc24f7e..80396f9 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -4,7 +4,7 @@ Description: debianization
  This is a Debian centric patch.
 Origin: debian
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-10-20
+Last-Update: 2014-09-13
 
 --- a/demosrc/Makefile.am
 +++ b/demosrc/Makefile.am
@@ -103,7 +103,7 @@ Last-Update: 2014-10-20
  EXTRA_DIST =
 --- a/configure.ac
 +++ b/configure.ac
-@@ -58,10 +58,11 @@
+@@ -58,10 +58,12 @@
  ## PNG library
  PKG_CHECK_MODULES([LIBPNG],[libpng],[CPPFLAGS="$CPPFLAGS -DUSEPNG"],[AC_MSG_ERROR([unable to find libpng])])
  ## OpenGL
@@ -114,6 +114,7 @@ Last-Update: 2014-10-20
  AX_CHECK_GL
  AS_IF([test "x$no_gl" != "xyes"],[],[AC_MSG_ERROR([unable to find an OpenGL implementation])])
 +X_LIBS="-lX11"
++AC_SUBST(X_LIBS)
  
  dnl Checks for header files.
  AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tachyon.git