diff -u openturns-0.13.2/debian/control openturns-0.13.2/debian/control --- openturns-0.13.2/debian/control +++ openturns-0.13.2/debian/control @@ -1,7 +1,8 @@ Source: openturns Section: science Priority: extra -Maintainer: Debian Science Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Science Maintainers Uploaders: Christophe Prud'homme Build-Depends: cdbs(>= 0.4.51), quilt (>= 0.46-4), debhelper (>= 7), chrpath, gcc (>= 4.2), g++ (>= 4.2), gfortran (>= 4.2), libxml2-dev, liblapack-dev, libblas-dev, r-base-core (>= 2.0), python-central (>= 0.5.6), python-dev, python-rpy2, ghostscript, graphviz, doxygen, docbook-to-man, texlive Standards-Version: 3.8.4 diff -u openturns-0.13.2/debian/changelog openturns-0.13.2/debian/changelog --- openturns-0.13.2/debian/changelog +++ openturns-0.13.2/debian/changelog @@ -1,3 +1,11 @@ +openturns (0.13.2-4ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #593284), remaining changes: + - ubuntu_fix-python-2.6.patch: fix detection of python 2.6 libs, to not use + LOCALMODLIBS. This pulls a dependency on SSL and makes the package FTBFS. + + -- Lorenzo De Liso Sat, 12 Jun 2010 21:18:48 +0200 + openturns (0.13.2-4) unstable; urgency=low * Bug fix: "ftbfs with gcc-4.5", thanks to Matthias Klose (Closes: @@ -12,6 +20,14 @@ -- Christophe Prud'homme Sun, 23 May 2010 10:10:14 +0200 +openturns (0.13.2-2ubuntu1) maverick; urgency=low + + * Merge with Debian testing. No changes left. + * ubuntu_fix-python-2.6.patch: fix detection of python 2.6 libs, to not use + LOCALMODLIBS. This pulls a dependency on SSL and makes the package FTBFS. + + -- Fabrice Coutadeur Mon, 10 May 2010 17:27:55 +0000 + openturns (0.13.2-2) unstable; urgency=low * Bug fix: "command not found", thanks to Jerome Robert (Closes: @@ -66,6 +82,13 @@ -- Christophe Prud'homme Thu, 14 Jan 2010 07:34:22 +0100 +openturns (0.13.1-1ubuntu1) karmic; urgency=low + + * debian/python-openturns.install: update to use python* and *-packages. + This fix a FTBFS with python2.6. (LP: #350437) + + -- Fabrice Coutadeur Tue, 18 Aug 2009 18:14:38 +0000 + openturns (0.13.1-1) unstable; urgency=low [Christophe Prud'homme] diff -u openturns-0.13.2/debian/patches/series openturns-0.13.2/debian/patches/series --- openturns-0.13.2/debian/patches/series +++ openturns-0.13.2/debian/patches/series @@ -3,0 +4 @@ +ubuntu_fix-python-2.6.patch only in patch2: unchanged: --- openturns-0.13.2.orig/debian/patches/ubuntu_fix-python-2.6.patch +++ openturns-0.13.2/debian/patches/ubuntu_fix-python-2.6.patch @@ -0,0 +1,28 @@ +Description: do not use LOCALMODLIBS for lib detection as this is only for internal python compilation and not for external libs. This fixes a FTBFS with python 2.6 because of missing ssl lib. +Author: Fabrice Coutadeur +Index: openturns-0.13.2/python/configure +=================================================================== +--- openturns-0.13.2.orig/python/configure 2010-05-10 17:19:16.000000000 +0000 ++++ openturns-0.13.2/python/configure 2010-05-10 17:19:09.000000000 +0000 +@@ -18120,7 +18120,7 @@ + if test -z "$PYTHON_EXTRA_LIBS"; then + PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ + conf = distutils.sysconfig.get_config_var; \ +- print conf('LOCALMODLIBS'), conf('LIBS')"` ++ print conf('LIBS')"` + fi + { $as_echo "$as_me:$LINENO: result: $PYTHON_EXTRA_LIBS" >&5 + $as_echo "$PYTHON_EXTRA_LIBS" >&6; } +Index: openturns-0.13.2/python/m4/ac_python_devel.m4 +=================================================================== +--- openturns-0.13.2.orig/python/m4/ac_python_devel.m4 2010-05-10 17:19:16.000000000 +0000 ++++ openturns-0.13.2/python/m4/ac_python_devel.m4 2010-05-10 17:18:46.000000000 +0000 +@@ -196,7 +196,7 @@ + if test -z "$PYTHON_EXTRA_LIBS"; then + PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ + conf = distutils.sysconfig.get_config_var; \ +- print conf('LOCALMODLIBS'), conf('LIBS')"` ++ print conf(conf('LIBS')"` + fi + AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) + AC_SUBST(PYTHON_EXTRA_LIBS)