[apophenia] 02/02: Imported Debian patch 1.0+ds-6: #841636 workaround

[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 4cdb6ab18c6ab7352043648c81fe1057327cb1fc
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Mon Dec 19 04:46:11 2016 +0000

    Imported Debian patch 1.0+ds-6: #841636 workaround
---
 debian/changelog                                                  | 8 ++++++++
 ... => debianization-bug-597187_757967_841636-mysql_config.patch} | 8 ++++----
 debian/patches/series                                             | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc1bf29..2975cff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apophenia (1.0+ds-6) unstable; urgency=medium
+
+  * FTBFS fix release:
+    - d/p/debianization-bug-[DebianBug_..]-mysql_config.patch, add meterial
+      to workaround bug #841636.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Mon, 19 Dec 2016 04:56:39 +0000
+
 apophenia (1.0+ds-5) unstable; urgency=medium
 
   * Bug fix release, effectively disable extended tests (Closes:  #847699).
diff --git a/debian/patches/debianization-bug-597187_757967-mysql_config.patch b/debian/patches/debianization-bug-597187_757967_841636-mysql_config.patch
similarity index 70%
rename from debian/patches/debianization-bug-597187_757967-mysql_config.patch
rename to debian/patches/debianization-bug-597187_757967_841636-mysql_config.patch
index efb10a7..2e8a54d 100644
--- a/debian/patches/debianization-bug-597187_757967-mysql_config.patch
+++ b/debian/patches/debianization-bug-597187_757967_841636-mysql_config.patch
@@ -1,8 +1,8 @@
 Description: debianization -- workaround around bugs
- Meant to workaround bugs #597187 and #757967
+ Meant to workaround bugs #597187, #757967 and 841636
 Origin: debian
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-07-10
+Last-Update: 2016-12-19
 
 --- a/configure.ac
 +++ b/configure.ac
@@ -10,8 +10,8 @@ Last-Update: 2015-07-10
  ## Debian package version
  DEB_PKG_VERSION=$(dpkg-parsechangelog -S Version)
  AC_SUBST(DEB_PKG_VERSION)
-+## work around for bugs #597187 and #757967
-+MYSQL_CFLAGS=$(echo "${MYSQL_CFLAGS}" | sed -e 's/-DNDEBUG//g;s/-g//g;s/-fabi-version=2//g;s/-fno-omit-frame-pointer//g;s/-fno-strict-aliasing//g;s/[ ]*$//g' | tr -s ' ')
++## work around for bugs #597187, #757967 and #841636
++MYSQL_CFLAGS=$(echo "${MYSQL_CFLAGS}" | sed -e 's/-DNDEBUG//g;s/-g//g;s/-fabi-version=2//g;s/-fno-omit-frame-pointer//g;s/-fno-strict-aliasing//g;s/[ ]*$//g;s|-fdebug-prefix-map=[0-9a-zA-Z/=\.\-]*||g' | tr -s ' ')
 +MYSQL_LDFLAGS=$(echo "${MYSQL_LDFLAGS}" | sed -e 's/-lz//g;s/-lrt//g;s/-ldl//g' | tr -s ' ')
  
  AC_CONFIG_FILES([
diff --git a/debian/patches/series b/debian/patches/series
index be0a84e..954e3c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,5 @@ upstream-correction-spelling-error-in-source.patch
 debianization.patch
 debianization-help2man.patch
 debianization-documentation.patch
-debianization-bug-597187_757967-mysql_config.patch
+debianization-bug-597187_757967_841636-mysql_config.patch
 debianization-adhoc.patch

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