[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 4d4366ada2659f274a13f594e0fcee9ce3a121d9
Author: Denis Barbier <bouzim at gmail.com>
Date:   Thu May 30 23:48:48 2013 +0200

    New patch: debian/patches/fix-swig-warning.patch
    
    Fix warnings with SWIG 2.0.9, patch cherry-picked from upstream.

diff --git a/debian/patches/fix-swig-warning.patch b/debian/patches/fix-swig-warning.patch
new file mode 100644
index 0000000..528a779
--- /dev/null
+++ b/debian/patches/fix-swig-warning.patch
@@ -0,0 +1,107 @@
+Description: Fix warnings with SWIG 2.0.9
+ UserDefined.i causes test failures:
+	159 - pyinstallcheck_StandardEvent_std (Failed)
+	281 - pyinstallcheck_UserDefined_std (Failed)
+	363 - pyinstallcheck_FittingTest_std (Failed)
+	365 - pyinstallcheck_NormalityTest_std (Failed)
+Author: Julien Schueller
+Origin: Vendor
+Applied-Upstream: http://trac.openturns.org/changeset/3044
+Last-Update: 2013-03-05
+
+Index: openturns/python/src/ComposedCopula.i
+===================================================================
+--- openturns.orig/python/src/ComposedCopula.i	2013-05-30 23:47:53.351894608 +0200
++++ openturns/python/src/ComposedCopula.i	2013-05-30 23:47:53.347894588 +0200
+@@ -21,17 +21,21 @@
+ 
+ }
+ 
++namespace OT {
+ 
+-%extend OT::ComposedCopula
+-{
++%extend ComposedCopula {
+ 
+-OT::ComposedCopula(PyObject * pyObj)
++ComposedCopula(PyObject * pyObj)
+ {
+- OT::Pointer<OT::Collection<OT::Copula> > p_coll =  OT::buildCollectionFromPySequence<OT::Copula>( pyObj );
+- return new OT::ComposedCopula( *p_coll );
++  OT::Pointer<OT::Collection<OT::Copula> > p_coll =  OT::buildCollectionFromPySequence<OT::Copula>( pyObj );
++  return new OT::ComposedCopula( *p_coll );
+ }
+ 
++ComposedCopula(const ComposedCopula & other)
++{
++  return new OT::ComposedCopula(other);
+ }
+ 
+-
+-namespace OT { %extend ComposedCopula { ComposedCopula(const ComposedCopula & other) { return new OT::ComposedCopula(other); } } }
++} // ComposedCopula
++ 
++} // OT
+Index: openturns/python/src/UserDefined.i
+===================================================================
+--- openturns.orig/python/src/UserDefined.i	2013-05-30 23:47:53.351894608 +0200
++++ openturns/python/src/UserDefined.i	2013-05-30 23:47:53.347894588 +0200
+@@ -2,35 +2,45 @@
+ // @author schueller
+ // @date   2012-01-02 11:44:01 +0100 (Mon, 02 Jan 2012)
+ 
++
++
+ %{
++#include "PythonWrappingFunctions.hxx"
+ #include "UserDefined.hxx"
+ %}
+ 
+-%include UserDefined.hxx
++%template(UserDefinedPairCollection) OT::Collection<OT::UserDefinedPair>;
+ 
+-%template(UserDefinedPairCollection_) OT::Collection<OT::UserDefinedPair>;
+-%template(UserDefinedPairCollection) OT::PersistentCollection<OT::UserDefinedPair>;
++%include UserDefined.hxx
+ 
+-%extend OT::PersistentCollection<OT::UserDefinedPair>
++%extend OT::Collection<OT::UserDefinedPair>
+ {
+ 
+-OT::PersistentCollection<OT::UserDefinedPair>::OT::PersistentCollection<OT::UserDefinedPair> (PyObject * pyObj)
++OT::Collection<OT::UserDefinedPair> (PyObject * pyObj)
+ {
+-  OT::Pointer<OT::Collection<OT::UserDefinedPair> > ptr = OT::buildCollectionFromPySequence<OT::UserDefinedPair>( pyObj );
+-  return new OT::PersistentCollection<OT::UserDefinedPair>(ptr->begin(), ptr->end());
++  return OT::buildCollectionFromPySequence<OT::UserDefinedPair>( pyObj );
+ }
+ 
+ }
+ 
++
+ namespace OT {  
+ 
+ %extend UserDefined {
+-  UserDefined(const OT::Collection<OT::UserDefinedPair> & collection)
+-  {
+-    return new OT::UserDefined(collection);
+-  }
+-}
+ 
++UserDefined(const UserDefined & other)
++{
++  return new OT::UserDefined(other);
++} 
++
++UserDefined(PyObject * pyObj)
++{
++  OT::Pointer<OT::Collection<OT::UserDefinedPair> > p_coll =  OT::buildCollectionFromPySequence<OT::UserDefinedPair>( pyObj );
++  return new OT::UserDefined( *p_coll );
+ }
+ 
+-namespace OT { %extend UserDefined { UserDefined(const UserDefined & other) { return new OT::UserDefined(other); } } }
++
++} // UserDefined
++
++} // OT
++
diff --git a/debian/patches/series b/debian/patches/series
index b5471b2..3cf78b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ tests-disable-timing.patch
 tests-disable-distributed_python_wrapper.patch
 remove-soname-python-module.patch
 ftbfs-bison-2.7.patch
+fix-swig-warning.patch

-- 
Debian packaging for openturns www.openturns.org