[SCM] Debian packaging for openturns www.openturns.org branch, debian, updated. debian/1.1-3

[Denis Barbier]

The following commit has been merged in the debian branch:
commit 97ee89d7e79122ec047f681fa686645afbeb1f6d
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sun May 26 18:50:06 2013 +0200

    New patch: debian/patches/ftbfs-bison-2.7.patch
    
    Fix FTBFS with newer Bison, see
     https://buildd.debian.org/status/fetch.php?pkg=openturns&arch=mipsel&ver=1.1-2&stamp=1369338707

diff --git a/debian/patches/ftbfs-bison-2.7.patch b/debian/patches/ftbfs-bison-2.7.patch
new file mode 100644
index 0000000..29a16ee
--- /dev/null
+++ b/debian/patches/ftbfs-bison-2.7.patch
@@ -0,0 +1,40 @@
+Description: Fix build failures with Bison >= 2.7
+Author: Denis Barbier <bouzim at gmail.com>
+Origin: Debian
+Forwarded: http://trac.openturns.org/ticket/630
+Applied-Upstream: http://trac.openturns.org/changeset/3023
+Last-Update: 2012-05-26
+
+Index: openturns/lib/src/Base/Stat/csv_parser.yy
+===================================================================
+--- openturns.orig/lib/src/Base/Stat/csv_parser.yy	2013-05-26 22:25:43.759605421 +0200
++++ openturns/lib/src/Base/Stat/csv_parser.yy	2013-05-26 22:25:56.463668417 +0200
+@@ -24,6 +24,15 @@
+ 
+ /* This parser is based on RFC 4180 from www.ietf.org */
+ 
++%code requires {
++#include <string>
++#include "csv_parser_state.hxx"
++#include "NumericalSampleImplementation.hxx"
++#include "Log.hxx"
++
++typedef void* yyscan_t;
++}
++
+ %pure-parser
+ %parse-param {OT::CSVParserState & theState}
+ %parse-param {yyscan_t yyscanner}
+@@ -62,12 +71,6 @@
+ 
+ 
+ %{
+-#include <string>
+-#include "csv_parser_state.hxx"
+-#include "NumericalSampleImplementation.hxx"
+-#include "Log.hxx"
+-
+-typedef void*                 yyscan_t;
+ int yylex                     (YYSTYPE *lvalp, yyscan_t yyscanner, FILE * theFile, const char * theSeparator);
+ int yyerror                   (OT::CSVParserState & theState, yyscan_t yyscanner, FILE * theFile, OT::NumericalSampleImplementation &impl, OT::UnsignedLong & theDimension, const char * theSeparator, const char *s);
+ int csvget_lineno             (yyscan_t yyscanner);
diff --git a/debian/patches/series b/debian/patches/series
index f38cbf9..b5471b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ add-missing-header-file.patch
 tests-disable-timing.patch
 tests-disable-distributed_python_wrapper.patch
 remove-soname-python-module.patch
+ftbfs-bison-2.7.patch

-- 
Debian packaging for openturns www.openturns.org