[apophenia] 03/03: Imported Debian patch 0.999b+ds3-1

[Jerome Benoit]

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

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

commit 75a1e79c7e51821fd03ae866c507b2340676ebd8
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Fri Oct 10 15:27:31 2014 +0200

    Imported Debian patch 0.999b+ds3-1
---
 debian/changelog                           |  5 ++-
 debian/control                             |  4 +-
 debian/patches/series                      |  1 -
 debian/patches/upstream-autotools-m4.patch | 63 ------------------------------
 debian/rules                               |  2 +
 5 files changed, 7 insertions(+), 68 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 31faea7..6c2fe38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,14 +6,15 @@ apophenia (0.999b+ds3-1) unstable; urgency=medium
         Thorsten Alteholz acting on behalf of the ftpmaster team);
     - debian/control:
       - Standards Version 3.9.6, bump;
-      - Build-Depends, remove quilt dependency;
+      - Build-Depends, remove quilt and add gnulib;
       - Multi-Arch support, refine;
     - debian/rules:
       - override_dh_auto_clean, wipe out (Closes: #764642);
       - optimize scheme wrt gsl package scheme;
+      - ad hoc GNULib support via ACLOCAL_PATH environment variable, set;
     - debian/patches/debianization.patch, refine.
 
- -- Jerome Benoit <calculus at rezozer.net>  Fri, 10 Oct 2014 13:14:59 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Fri, 10 Oct 2014 14:10:57 +0000
 
 apophenia (0.999b+ds1-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 031a91e..2aab2bc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Jerome Benoit <calculus at rezozer.net>
 Build-Depends:
- debhelper (>= 9), quilt,
- autotools-dev, autoconf-archive, dh-autoreconf, libtool,
+ debhelper (>= 9),
+ autotools-dev, autoconf-archive, gnulib, dh-autoreconf, libtool,
  pkg-config, help2man,
  zlib1g-dev, libmysqlclient-dev, libsqlite3-dev, libgsl0-dev,
  bc, sqlite3,
diff --git a/debian/patches/series b/debian/patches/series
index 1859fea..32f08b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-upstream-autotools-m4.patch
 upstream-wipeout-exit.patch
 debianization.patch
 debianization-help2man.patch
diff --git a/debian/patches/upstream-autotools-m4.patch b/debian/patches/upstream-autotools-m4.patch
deleted file mode 100644
index 0b6cd17..0000000
--- a/debian/patches/upstream-autotools-m4.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: autotools machinery
- Bring the missing m4/ld-version-script.m4 M4 material from GNULib;
- meant to be submitted to the upstream maintainer.
-Origin: debian
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-09-08
-
---- /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")
-+])
diff --git a/debian/rules b/debian/rules
index 1e25219..ef04931 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ else
 	CFLAGS += -O3
 endif
 
+export ACLOCAL_PATH=/usr/share/gnulib/m4
+
 default:
 	@uscan --no-conf --dehs --report || true
 

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