[tachyon] 01/01: Imported Debian patch 0.99~b6+dsx-7: #848131 fix + hardening + refreshment
Jerome Benoit
calculus-guest at moszumanska.debian.org
Fri Dec 16 18:51:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository tachyon.
commit 040336777ebca58c34961a2be2bd4c60b315af48
Author: Jerome Benoit <calculus at rezozer.net>
Date: Fri Dec 16 17:49:35 2016 +0000
Imported Debian patch 0.99~b6+dsx-7: #848131 fix + hardening + refreshment
---
debian/changelog | 17 +-
debian/control | 9 +-
.../debianization-bug-848363-ax_check_gl.patch | 306 +++++++++++++++++++++
debian/patches/debianization-documentation.patch | 2 +-
debian/patches/debianization.patch | 7 +-
debian/patches/series | 1 +
debian/patches/upstream-C2help2man.patch | 2 +-
debian/patches/upstream-demosrc-samples.patch | 2 +-
.../upstream-lintian-spelling-error-silence.patch | 2 +-
debian/patches/upstream-opengl.patch | 2 +-
debian/patches/upstream-parse-tpoly.patch | 2 +-
debian/patches/upstream-pthreads.patch | 2 +-
.../upstream-rationalization-autotools.patch | 65 +----
.../patches/upstream-rationalization-cleanup.patch | 2 +-
.../upstream-rationalization-one_header.patch | 2 +-
.../upstream-rationalization-version_script.patch | 2 +-
debian/rules | 1 +
debian/shlibs.local | 1 +
debian/templates/control.in | 9 +-
19 files changed, 350 insertions(+), 86 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ea04671..54dcd87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+tachyon (0.99~b6+dsx-7) unstable; urgency=medium
+
+ * Serious bug fix release (Closes: #848131) / Debianization:
+ - d/shlibs.local, indroduce (See: #831442).
+ * Debianization:
+ - d/templates/*:
+ - d/t/control.in (resp., d/control), harden (resp., update);
+ - d/patches/*:
+ - d/p/upstream-rationalization-autotools.patch, refresh and harden;
+ - d/p/debianization-bug-848363-ax_check_gl.patch, introduce;
+ - Origin field, correct;
+ - d/rules, harden.
+
+ -- Jerome Benoit <calculus at rezozer.net> Fri, 16 Dec 2016 18:23:58 +0000
+
tachyon (0.99~b6+dsx-6) unstable; urgency=medium
* FTBFS bug fix release (Closes: #837012):
@@ -95,7 +110,7 @@ tachyon (0.99~b6+dsx-1) unstable; urgency=medium
- merge the installed header into one header;
- script-version, create by hand wrt `tachyon.h';
- autotools build machinery, write from scratch to ease maintenance;
- - library versionning, introduce;
+ - library versioning, introduce;
- manual page generated via help2man;
- debian/README.{source,Debian}, refresh;
- build-arch/build-indep scheme, introduce;
diff --git a/debian/control b/debian/control
index 92808af..3f75643 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,10 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Jerome Benoit <calculus at rezozer.net>
Build-Depends:
debhelper (>= 9),
- autotools-dev, autoconf-archive, dh-autoreconf, libtool, pkg-config, help2man,
- mpi-default-dev (>= 1.6),
- libmpich-dev,
- libjpeg-dev,
- libpng-dev,
+ autotools-dev, autoconf-archive (>= 20160916), gnulib, dh-autoreconf, libtool,
+ pkg-config, help2man,
+ mpi-default-dev (>= 1.6), libopenmpi-dev, libmpich-dev,
+ libjpeg-dev, libpng-dev,
libgl1-mesa-dev | libgl-dev
Build-Conflicts:
glx-diversions
diff --git a/debian/patches/debianization-bug-848363-ax_check_gl.patch b/debian/patches/debianization-bug-848363-ax_check_gl.patch
new file mode 100644
index 0000000..b20d063
--- /dev/null
+++ b/debian/patches/debianization-bug-848363-ax_check_gl.patch
@@ -0,0 +1,306 @@
+Description: debianization -- workaround around bug #848363
+Origin: vendor, Debian
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2015-12-14
+
+--- /dev/null
++++ b/m4/ax_check_gl.m4
+@@ -0,0 +1,298 @@
++# ===========================================================================
++# http://www.gnu.org/software/autoconf-archive/ax_check_gl.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++# AX_CHECK_GL([ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
++#
++# DESCRIPTION
++#
++# Checks for an OpenGL implementation. If a valid OpenGL implementation is
++# found, this macro would set C preprocessor symbol HAVE_GL to 1.
++#
++# If either a valid OpenGL header or library was not found, by default the
++# configuration would exits on error. This behavior can be overwritten by
++# providing a custom "ACTION-IF-NOT-FOUND" hook.
++#
++# If the header, library was found, and been tested for compiling and
++# linking the configuration would export the required compiler flags to
++# "GL_CFLAGS" and "GL_LIBS". These two variables can also be overwritten
++# by user from the command line if they want to link against the library
++# they specified instead of having the configuration script to detect the
++# flags automatically. Note that having "GL_CFLAGS" or "GL_LIBS" set
++# doesn't mean it can compile or link with the flags, since it could be
++# overwritten by user. However the "HAVE_GL" symbol and "ACTION-IF-FOUND"
++# hook is always guaranteed to reflect a valid OpenGL implementation.
++#
++# If user didn't specify the "ACTION-IF-FOUND" hook, the configuration
++# would prepend "GL_CFLAGS" and "GL_LIBS" to "CFLAGS" and "LIBS", like
++# many other autoconf macros do.
++#
++# OpenGL is one of the libraries that has different header names on
++# different platforms. This macro does the header detection, and will
++# export the following symbol: "HAVE_GL_GL_H" for having "GL/gl.h" or
++# "HAVE_OPENGL_GL_H" for having "OpenGL/gl.h". To write a portable OpenGL
++# code, you should include OpenGL header like so:
++#
++# #if defined(HAVE_WINDOWS_H) && defined(_WIN32)
++# # include <windows.h>
++# #endif
++# #ifdef HAVE_GL_GL_H
++# # include <GL/gl.h>
++# #elif defined(HAVE_OPENGL_GL_H)
++# # include <OpenGL/gl.h>
++# #else
++# # error no gl.h
++# #endif
++#
++# On the OSX platform, there's two possible OpenGL implementation. One is
++# the OpenGL that ships with OSX, the other comes with X11/XQuartz
++# (http://www.xquartz.org). To use the xquartz variant, user can use the
++# option --with-xquartz-gl[=path to xquartz root]. By default the
++# configuration will check "/opt/X11", which is the default X11 install
++# location on OSX.
++#
++# LICENSE
++#
++# Copyright (c) 2009 Braden McDaniel <braden at endoframe.com>
++# Copyright (c) 2012 Bastien Roucaries <roucaries.bastien+autoconf at gmail.com>
++# Copyright (c) 2016 Felix Chern <idryman at gmail.com>
++#
++# This program is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by the
++# Free Software Foundation; either version 2 of the License, or (at your
++# option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++# Public License for more details.
++#
++# You should have received a copy of the GNU General Public License along
++# with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++# As a special exception, the respective Autoconf Macro's copyright owner
++# gives unlimited permission to copy, distribute and modify the configure
++# scripts that are the output of Autoconf when processing the Macro. You
++# need not follow the terms of the GNU General Public License when using
++# or distributing such scripts, even though portions of the text of the
++# Macro appear in them. The GNU General Public License (GPL) does govern
++# all other use of the material that constitutes the Autoconf Macro.
++#
++# This special exception to the GPL applies to versions of the Autoconf
++# Macro released by the Autoconf Archive. When you make and distribute a
++# modified version of the Autoconf Macro, you may extend this special
++# exception to the GPL to apply to your modified version as well.
++
++#serial 19
++
++# example gl program
++m4_define([_AX_CHECK_GL_PROGRAM],
++ [AC_LANG_PROGRAM([[
++# if defined(HAVE_WINDOWS_H) && defined(_WIN32)
++# include <windows.h>
++# endif
++# ifdef HAVE_GL_GL_H
++# include <GL/gl.h>
++# elif defined(HAVE_OPENGL_GL_H)
++# include <OpenGL/gl.h>
++# else
++# error no gl.h
++# endif
++]],[[glBegin(0)]])])
++
++dnl Default include : add windows.h
++dnl see http://www.opengl.org/wiki/Platform_specifics:_Windows
++dnl (acceded 20120801)
++AC_DEFUN([_AX_CHECK_GL_INCLUDES_DEFAULT],dnl
++[
++ AC_INCLUDES_DEFAULT
++ [
++ # if defined(HAVE_WINDOWS_H) && defined(_WIN32)
++ # include <windows.h>
++ # endif
++ ]
++])
++
++
++# _AX_CHECK_GL_SAVE_FLAGS(LIST-OF-FLAGS)
++# Use this macro before you modify the flags.
++# Restore the flags by _AX_CHECK_GL_RESTORE_FLAGS
++#
++# Example: _AX_CHECK_GL_SAVE_FLAGS([[CFLAGS],[LIBS]]) expands to
++# gl_saved_flag_cflags=$CFLAGS
++# gl_saved_flag_libs=$LIBS
++# CFLAGS="$GL_CFLAGS $CFLAGS"
++# LIBS="$GL_LIBS $LIBS"
++AC_DEFUN([_AX_CHECK_GL_SAVE_FLAGS], [
++ AX_SAVE_FLAGS_WITH_PREFIX([GL],[$1])
++ AC_LANG_PUSH([C])
++])
++
++# _AX_CHECK_GL_RESTORE_FLAGS(LIST-OF-FLAGS)
++# Use this marcro to restore the flags you saved using
++# _AX_CHECK_GL_SAVE_FLAGS
++#
++# Example: _AX_CHECK_GL_RESTORE_FLAGS([[CFLAGS],[LIBS]]) expands to
++# CFLAGS="$gl_saved_flag_cflags"
++# LIBS="$gl_saved_flag_libs"
++AC_DEFUN([_AX_CHECK_GL_RESTORE_FLAGS], [
++ AX_RESTORE_FLAGS_WITH_PREFIX([GL],[$1])
++ AC_LANG_POP([C])
++])
++
++# Check if the program compiles
++AC_DEFUN([_AX_CHECK_GL_COMPILE],
++[dnl
++ _AX_CHECK_GL_SAVE_FLAGS([CFLAGS])
++ AC_COMPILE_IFELSE([_AX_CHECK_GL_PROGRAM],
++ [ax_check_gl_compile_opengl="yes"],
++ [ax_check_gl_compile_opengl="no"])
++ _AX_CHECK_GL_RESTORE_FLAGS([CFLAGS])
++])
++
++# Compile the example program (cache)
++AC_DEFUN([_AX_CHECK_GL_COMPILE_CV],
++[dnl
++ AC_CACHE_CHECK([for compiling a minimal OpenGL program],[ax_cv_check_gl_compile_opengl],
++ [_AX_CHECK_GL_COMPILE()
++ ax_cv_check_gl_compile_opengl="${ax_check_gl_compile_opengl}"])
++ ax_check_gl_compile_opengl="${ax_cv_check_gl_compile_opengl}"
++])
++
++# Link the example program
++AC_DEFUN([_AX_CHECK_GL_LINK],
++[dnl
++ _AX_CHECK_GL_SAVE_FLAGS([[CFLAGS],[LIBS],[LDFLAGS]])
++ AC_LINK_IFELSE([_AX_CHECK_GL_PROGRAM],
++ [ax_check_gl_link_opengl="yes"],
++ [ax_check_gl_link_opengl="no"])
++ _AX_CHECK_GL_RESTORE_FLAGS([[CFLAGS],[LIBS],[LDFLAGS]])
++])
++
++# Link the example program (cache)
++AC_DEFUN([_AX_CHECK_GL_LINK_CV],
++[dnl
++ AC_CACHE_CHECK([for linking a minimal OpenGL program],[ax_cv_check_gl_link_opengl],
++ [_AX_CHECK_GL_LINK()
++ ax_cv_check_gl_link_opengl="${ax_check_gl_link_opengl}"])
++ ax_check_gl_link_opengl="${ax_cv_check_gl_link_opengl}"
++])
++
++
++# _AX_CHECK_GL_MANUAL_LIBS_GENERIC(LIBRARIES-TO-SEARCH)
++# Searches library provided in $1, and output the flag
++# $ax_check_gl_lib_opengl
++AC_DEFUN([_AX_CHECK_GL_MANUAL_LIBS_GENERIC], [
++ AS_IF([test -n "$GL_LIBS"],[], [
++ ax_check_gl_manual_libs_generic_extra_libs="$1"
++ AS_IF([test "X$ax_check_gl_manual_libs_generic_extra_libs" = "X"],
++ [AC_MSG_ERROR([AX_CHECK_GL_MANUAL_LIBS_GENERIC argument must no be empty])])
++
++ _AX_CHECK_GL_SAVE_FLAGS([CFLAGS])
++ AC_SEARCH_LIBS([glBegin],[$ax_check_gl_manual_libs_generic_extra_libs], [
++ ax_check_gl_lib_opengl="yes"
++ break
++ ])
++ AS_IF([test "X$ax_check_gl_lib_opengl"="Xyes"],
++ [GL_LIBS="${ac_cv_search_glBegin}"])
++ _AX_CHECK_GL_RESTORE_FLAGS([CFLAGS])
++ ])
++])
++
++# _WITH_XQUARTZ_GL
++# ----------------
++# Provides an option in command line to specify the XQuartz installation
++# path on OSX, so that user can link to it instead of using the default
++# OSX OpenGL framework. (Mac OSX only)
++AC_DEFUN_ONCE([_WITH_XQUARTZ_GL],[
++ AC_ARG_WITH([xquartz-gl],
++ [AS_HELP_STRING([--with-xquartz-gl@<:@=DIR@:>@],
++ [On Mac OSX, use opengl provided by X11/XQuartz instead of the built-in framework.
++ If enabled, the default location is @<:@DIR=/opt/X11@:>@.
++ This option is default to false.])],
++ [AS_IF([test "X$with_xquartz_gl"="Xyes"],
++ [with_xquartz_gl="/opt/X11"])],
++ [with_xquartz_gl=no])
++ AS_IF([test "X$with_xquartz_gl" != "Xno"],
++ [AC_MSG_CHECKING([OSX X11 path])
++ AS_IF([test -e "$with_xquartz_gl"],
++ [AC_MSG_RESULT(["$with_xquartz_gl"])
++ CFLAGS="-I$with_xquartz_gl/include $CFLAGS"
++ LIBS="-L$with_xquartz_gl/lib $LIBS"
++ ],
++ [with_xquartz_gl=no
++ AC_MSG_RESULT([no])
++ AC_MSG_WARN([--with-xquartz-gl was given, but test for X11 failed. Fallback to system framework])
++ ])
++ ])
++])
++
++# OSX specific setup for OpenGL check
++AC_DEFUN([_AX_CHECK_DARWIN_GL], [
++ AC_REQUIRE([_WITH_XQUARTZ_GL])
++ AS_IF([test "x$with_xquartz_gl" != "xno"],
++ [GL_LIBS="${GL_LIBS:--lGL}"],
++ [GL_LIBS="${GL_LIBS:--framework OpenGL}"])
++])
++
++
++# AX_CHECK_GL_LIB([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++# ---------------------------------------------------------
++# Checks OpenGL headers and library and provides hooks for success and failures.
++# When $1 is not set, this macro would modify CFLAGS and LIBS environment variables.
++# However, user can override this behavior by providing their own hooks.
++# The CFLAGS and LIBS flags required by OpenGL is always exported in
++# GL_CFLAGS and GL_LIBS environment variable.
++#
++# In other words, the default behavior of AX_CHECK_GL_LIB() is equivalent to
++# AX_CHECK_GL_LIB(
++# [CFLAGS="$GL_CFLAGS $CFLAGS"
++# LIBS="$GL_LIBS $LIBS"]
++# )
++AC_DEFUN([AX_CHECK_GL],
++[AC_REQUIRE([AC_CANONICAL_HOST])
++ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++ AC_ARG_VAR([GL_CFLAGS],[C compiler flags for GL, overriding configure script defaults])
++ AC_ARG_VAR([GL_LIBS],[Linker flags for GL, overriding configure script defaults])
++
++ dnl --with-gl or not can be implemented outside of check-gl
++ AS_CASE([${host}],
++ [*-darwin*],[_AX_CHECK_DARWIN_GL],
++ dnl some windows may support X11 opengl, and should be able to linked
++ dnl by -lGL. However I have no machine to test it.
++ [*-cygwin*|*-mingw*],[
++ _AX_CHECK_GL_MANUAL_LIBS_GENERIC([opengl32 GL gl])
++ AC_CHECK_HEADERS([windows.h])
++ ],
++ [PKG_PROG_PKG_CONFIG
++ PKG_CHECK_MODULES([GL],[gl],
++ [],
++ [_AX_CHECK_GL_MANUAL_LIBS_GENERIC([GL gl])])
++ ]) dnl host specific checks
++
++ dnl this was cache
++ _AX_CHECK_GL_SAVE_FLAGS([CFLAGS])
++ AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h],
++ [ax_check_gl_have_headers="yes";break])
++ _AX_CHECK_GL_RESTORE_FLAGS([CFLAGS])
++
++ AS_IF([test "X$ax_check_gl_have_headers" = "Xyes"],
++ [_AX_CHECK_GL_COMPILE_CV()],
++ [no_gl=yes])
++ AS_IF([test "X$ax_check_gl_compile_opengl" = "Xyes"],
++ [_AX_CHECK_GL_LINK_CV()],
++ [no_gl=yes])
++ AS_IF([test "X$no_gl" = "X"],
++ [AC_DEFINE([HAVE_GL], [1], [Defined if a valid OpenGL implementation is found.])
++ m4_ifval([$1],
++ [$1],
++ [CFLAGS="$GL_CFLAGS $CFLAGS"
++ LIBS="$GL_LIBS $LIBS"])
++ ],
++ [m4_ifval([$2],
++ [$2],
++ [AC_MSG_ERROR([Could not find a valid OpenGL implementation])])
++ ])
++])
diff --git a/debian/patches/debianization-documentation.patch b/debian/patches/debianization-documentation.patch
index 2d64836..afe1ad7 100644
--- a/debian/patches/debianization-documentation.patch
+++ b/debian/patches/debianization-documentation.patch
@@ -2,7 +2,7 @@ Description: debianization -- documentation
Address Debian Policy requirements for documentation;
and silence the composition machinery.
This is a Debian centric patch.
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
Last-Update: 2014-11-06
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 80396f9..5729132 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -2,7 +2,7 @@ Description: debianization
Meant to maintain a minimal debian/rules, to fix warnings,
to address Debian specific stuff in general.
This is a Debian centric patch.
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
Last-Update: 2014-09-13
@@ -103,7 +103,7 @@ Last-Update: 2014-09-13
EXTRA_DIST =
--- a/configure.ac
+++ b/configure.ac
-@@ -58,10 +58,12 @@
+@@ -58,9 +58,11 @@
## PNG library
PKG_CHECK_MODULES([LIBPNG],[libpng],[CPPFLAGS="$CPPFLAGS -DUSEPNG"],[AC_MSG_ERROR([unable to find libpng])])
## OpenGL
@@ -111,8 +111,7 @@ Last-Update: 2014-09-13
-AC_PATH_XTRA
+####AC_PATH_X
+####AC_PATH_XTRA
- AX_CHECK_GL
- AS_IF([test "x$no_gl" != "xyes"],[],[AC_MSG_ERROR([unable to find an OpenGL implementation])])
+ AX_CHECK_GL([:],[AC_MSG_ERROR([unable to find an OpenGL implementation])])
+X_LIBS="-lX11"
+AC_SUBST(X_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index 959b8c1..de158d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ upstream-rationalization-version_script.patch
upstream-rationalization-autotools.patch
debianization.patch
debianization-documentation.patch
+debianization-bug-848363-ax_check_gl.patch
diff --git a/debian/patches/upstream-C2help2man.patch b/debian/patches/upstream-C2help2man.patch
index 6e06bac..d1dd69f 100644
--- a/debian/patches/upstream-C2help2man.patch
+++ b/debian/patches/upstream-C2help2man.patch
@@ -1,7 +1,7 @@
Description: format usages and helps
Attempt to format and harmonize helps of the demonstration programs
wrt UN*X customs in view to employ help2man to generate manpages.
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
Last-Update: 2014-10-21
diff --git a/debian/patches/upstream-demosrc-samples.patch b/debian/patches/upstream-demosrc-samples.patch
index fcecf4d..4a13f7f 100644
--- a/debian/patches/upstream-demosrc-samples.patch
+++ b/debian/patches/upstream-demosrc-samples.patch
@@ -1,7 +1,7 @@
Description: demosrc samples refreshment
Render buildable the demonstration C source samples;
plus minor comestic changes.
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
Last-Update: 2014-11-06
diff --git a/debian/patches/upstream-lintian-spelling-error-silence.patch b/debian/patches/upstream-lintian-spelling-error-silence.patch
index 3abe5e9..3edb306 100644
--- a/debian/patches/upstream-lintian-spelling-error-silence.patch
+++ b/debian/patches/upstream-lintian-spelling-error-silence.patch
@@ -2,7 +2,7 @@ Description: source typo
Correct spelling error as reported by lintian in some binraries;
meant to silence lintian and eventually to be submitted to the
upstream maintainer.
-Origin: debian
+Origin: vendor, Debian
Forwarded: by email
Comment: spelling-error-in-binary
Author: Jerome Benoit <calculus at rezozer.net>
diff --git a/debian/patches/upstream-opengl.patch b/debian/patches/upstream-opengl.patch
index 048eaa5..5e7538a 100644
--- a/debian/patches/upstream-opengl.patch
+++ b/debian/patches/upstream-opengl.patch
@@ -1,6 +1,6 @@
Description: opengl
Harden separate build either with or without OpenGL support.
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
Last-Update: 2014-10-26
diff --git a/debian/patches/upstream-parse-tpoly.patch b/debian/patches/upstream-parse-tpoly.patch
index daa11b6..6cd20d9 100644
--- a/debian/patches/upstream-parse-tpoly.patch
+++ b/debian/patches/upstream-parse-tpoly.patch
@@ -1,6 +1,6 @@
Description: parse -- tpoly
Correct the tachyon parser for tpoly data files.
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
Last-Update: 2014-10-26
diff --git a/debian/patches/upstream-pthreads.patch b/debian/patches/upstream-pthreads.patch
index 79cc34b..d0caa7a 100644
--- a/debian/patches/upstream-pthreads.patch
+++ b/debian/patches/upstream-pthreads.patch
@@ -1,6 +1,6 @@
Description: POSIX Threads
Harden POSIX Threads support in GNU environment (Closes: #729182).
-Origin: debian
+Origin: vendor, Debian
Author: Samuel Thibault <sthibault at debian.org>
Last-Update: 2014-10-26
diff --git a/debian/patches/upstream-rationalization-autotools.patch b/debian/patches/upstream-rationalization-autotools.patch
index d51118c..4031129 100644
--- a/debian/patches/upstream-rationalization-autotools.patch
+++ b/debian/patches/upstream-rationalization-autotools.patch
@@ -2,13 +2,13 @@ Description: rationalization -- autotools machinery
Attempt to autotoolize the upstream package in view to ease
future maintenance on both side.
This patch is meant to be submitted to the upstream maintainer.
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-06-25
+Last-Update: 2016-12-16
--- /dev/null
+++ b/configure.ac
-@@ -0,0 +1,88 @@
+@@ -0,0 +1,87 @@
+dnl -*- Autoconf -*-
+dnl Process this file with autoconf to produce a configure script.
+
@@ -71,8 +71,7 @@ Last-Update: 2015-06-25
+## OpenGL
+AC_PATH_X
+AC_PATH_XTRA
-+AX_CHECK_GL
-+AS_IF([test "x$no_gl" != "xyes"],[],[AC_MSG_ERROR([unable to find an OpenGL implementation])])
++AX_CHECK_GL([:],[AC_MSG_ERROR([unable to find an OpenGL implementation])])
+
+dnl Checks for header files.
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h])
@@ -276,62 +275,6 @@ Last-Update: 2015-06-25
+
+EXTRA_DIST =
--- /dev/null
-+++ b/m4/ld-version-script.m4
-@@ -0,0 +1,53 @@
-+# ld-version-script.m4 serial 3
-+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl From Simon Josefsson
-+
-+# FIXME: The test below returns a false positive for mingw
-+# cross-compiles, 'local:' statements does not reduce number of
-+# exported symbols in a DLL. Use --disable-ld-version-script to work
-+# around the problem.
-+
-+# gl_LD_VERSION_SCRIPT
-+# --------------------
-+# Check if LD supports linker scripts, and define automake conditional
-+# HAVE_LD_VERSION_SCRIPT if so.
-+AC_DEFUN([gl_LD_VERSION_SCRIPT],
-+[
-+ AC_ARG_ENABLE([ld-version-script],
-+ AS_HELP_STRING([--enable-ld-version-script],
-+ [enable linker version script (default is enabled when possible)]),
-+ [have_ld_version_script=$enableval], [])
-+ if test -z "$have_ld_version_script"; then
-+ AC_MSG_CHECKING([if LD -Wl,--version-script works])
-+ save_LDFLAGS="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
-+ cat > conftest.map <<EOF
-+foo
-+EOF
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-+ [accepts_syntax_errors=yes], [accepts_syntax_errors=no])
-+ if test "$accepts_syntax_errors" = no; then
-+ cat > conftest.map <<EOF
-+VERS_1 {
-+ global: sym;
-+};
-+
-+VERS_2 {
-+ global: sym;
-+} VERS_1;
-+EOF
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-+ [have_ld_version_script=yes], [have_ld_version_script=no])
-+ else
-+ have_ld_version_script=no
-+ fi
-+ rm -f conftest.map
-+ LDFLAGS="$save_LDFLAGS"
-+ AC_MSG_RESULT($have_ld_version_script)
-+ fi
-+ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
-+])
---- /dev/null
+++ b/demosrc/Makefile.am
@@ -0,0 +1,85 @@
+bin_PROGRAMS =
diff --git a/debian/patches/upstream-rationalization-cleanup.patch b/debian/patches/upstream-rationalization-cleanup.patch
index d24c91d..bfe2a7d 100644
--- a/debian/patches/upstream-rationalization-cleanup.patch
+++ b/debian/patches/upstream-rationalization-cleanup.patch
@@ -1,7 +1,7 @@
Description: rationalization -- clean up
Straightforward clean up.
This patch is meant to be submitted to the upstream maintainer.
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
Last-Update: 2014-10-20
diff --git a/debian/patches/upstream-rationalization-one_header.patch b/debian/patches/upstream-rationalization-one_header.patch
index 4177f85..fd40788 100644
--- a/debian/patches/upstream-rationalization-one_header.patch
+++ b/debian/patches/upstream-rationalization-one_header.patch
@@ -9,7 +9,7 @@ Description: rationalization -- one development header file
wide set up.
This patch is transparent for the final developer, and it is also
meant to be submitted to the upstream maintainer.
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
Last-Update: 2014-10-20
diff --git a/debian/patches/upstream-rationalization-version_script.patch b/debian/patches/upstream-rationalization-version_script.patch
index 494aa74..3e00243 100644
--- a/debian/patches/upstream-rationalization-version_script.patch
+++ b/debian/patches/upstream-rationalization-version_script.patch
@@ -8,7 +8,7 @@ Description: rationalization -- version_script
This patch is transparent for the final developer, and it is also
meant to be submitted to the upstream maintainer.
[1] https://www.gnu.org/software/gnulib/manual/html_node/LD-Version-Scripts.html
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
Last-Update: 2014-10-20
diff --git a/debian/rules b/debian/rules
index a3a0113..ba067d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,7 @@ DEB_ARCH_REVLISTOF_OPENMPI ?= any
DEB_ARCH_REVLISTOF_MPICH ?= any
endif
+export ACLOCAL_PATH=/usr/share/gnulib/m4
## inspired from mpfr material
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
diff --git a/debian/shlibs.local b/debian/shlibs.local
new file mode 100644
index 0000000..55a982b
--- /dev/null
+++ b/debian/shlibs.local
@@ -0,0 +1 @@
+libmpich 12 libmpich12
diff --git a/debian/templates/control.in b/debian/templates/control.in
index 3d0869f..61db3b5 100644
--- a/debian/templates/control.in
+++ b/debian/templates/control.in
@@ -5,11 +5,10 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Jerome Benoit <calculus at rezozer.net>
Build-Depends:
debhelper (>= 9),
- autotools-dev, autoconf-archive, dh-autoreconf, libtool, pkg-config, help2man,
- mpi-default-dev (>= 1.6),
- libmpich-dev,
- libjpeg-dev,
- libpng-dev,
+ autotools-dev, autoconf-archive (>= 20160916), gnulib, dh-autoreconf, libtool,
+ pkg-config, help2man,
+ mpi-default-dev (>= 1.6), libopenmpi-dev, libmpich-dev,
+ libjpeg-dev, libpng-dev,
libgl1-mesa-dev | libgl-dev
Build-Conflicts:
glx-diversions
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tachyon.git
More information about the debian-science-commits
mailing list