[code-saturne] 02/05: code-saturne (2.1.4-1) UNRELEASED; urgency=low

[Gilles Filippini]

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

pini pushed a commit to annotated tag debian/2.1.4-1
in repository code-saturne.

commit d8d56a6abdb04479ccd7bc3ceb82628c46b1a948
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Wed Jan 18 19:44:49 2012 +0000

    code-saturne (2.1.4-1) UNRELEASED; urgency=low
    
      * New upstream release
      * Update the build dep on hdf5 for the 1.8.8 transition
      * Fix an upgrade issue (LP: #916165)
      * Provide also the examples (Closes: #639693)
      * Patch as-needed.patch removed (applied upstream)
      * Force usage of cgns 3.1.3.2 minimal
---
 changelog                | 11 +++++++++++
 code-saturne-doc.install |  1 +
 control                  |  8 ++++----
 patches/as-needed.patch  | 37 -------------------------------------
 patches/series           |  2 +-
 5 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/changelog b/changelog
index 821a6c4..3394720 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,14 @@
+code-saturne (2.1.4-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Update the build dep on hdf5 for the 1.8.8 transition
+  * Fix an upgrade issue (LP: #916165)
+  * Provide also the examples (Closes: #639693)
+  * Patch as-needed.patch removed (applied upstream)
+  * Force usage of cgns 3.1.3.2 minimal
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 18 Jan 2012 19:50:42 +0100
+
 code-saturne (2.1.0-4) unstable; urgency=low
 
   * Fix a as-needed issue. Thanks to Ilya Barygin for the patch
diff --git a/code-saturne-doc.install b/code-saturne-doc.install
index 74b9cdc..8cf2ffc 100644
--- a/code-saturne-doc.install
+++ b/code-saturne-doc.install
@@ -1 +1,2 @@
 debian/tmp/usr/share/doc/code_saturne/*
+examples/
\ No newline at end of file
diff --git a/control b/control
index dc8219e..f461c4a 100644
--- a/control
+++ b/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7), autotools-dev, cdbs, python-qt4,
  pyqt4-dev-tools, fig2ps, syrthes, gfortran, autoconf,
  texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra, 
 # To help the configure detection on cs lib
-  zlib1g-dev, libhdf5-mpi-dev, libcgns-dev, mpi-default-dev, libmedc-dev,
+  zlib1g-dev, libhdf5-mpi-dev, libcgns-dev (>= 3.1.3.2), mpi-default-dev, libmedc-dev,
   libxml2-dev, libblas-dev | libatlas-dev, libopenmpi-dev,
   chrpath, python, libscotch-dev
 Standards-Version: 3.9.2
@@ -47,8 +47,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python,
  libxml2-dev, libblas-dev
 Recommends: code-saturne
-Replaces: libbft-dev, libfvm-dev, libmei-dev
-Conflicts: libbft-dev, libfvm-dev, libmei-dev
+Replaces: libbft-dev, libfvm-dev, libmei-dev, libfvm0, libbft1, libmei0
+Conflicts: libbft-dev, libfvm-dev, libmei-dev, libfvm0, libbft1, libmei0
 Description: General purpose Computational Fluid Dynamics (CFD) software - binaries
  The basic capabilities of Code_Saturne enable the handling of either
  incompressible or expandable flows with or without heat transfer and
@@ -98,7 +98,7 @@ Package: code-saturne-include
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libcgns-dev, libmedc-dev,
- libhdf5-dev | libhdf5-serial-dev, zlib1g-dev, mpi-default-dev, libxml2-dev
+ libhdf5-dev, zlib1g-dev, mpi-default-dev, libxml2-dev
 Description: General purpose Computational Fluid Dynamics (CFD) software - includes
  The basic capabilities of Code_Saturne enable the handling of either
  incompressible or expandable flows with or without heat transfer and
diff --git a/patches/as-needed.patch b/patches/as-needed.patch
deleted file mode 100644
index 291dfc7..0000000
--- a/patches/as-needed.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: fix FTBFS with ld --as-needed option
- -lm should be added to LDADD, not LDFLAGS. This way it's put after object
- files when invoking linker
-Author: Ilya Barygin <randomaction at ubuntu.com>
---- code-saturne-2.1.0.orig/src/apps/Makefile.am
-+++ code-saturne-2.1.0/src/apps/Makefile.am
-@@ -147,10 +147,10 @@ cs_check_syntax_CPPFLAGS = \
- cs_check_syntax_SOURCES = cs_check_syntax.c
- cs_check_syntax_LDADD = \
- $(top_builddir)/src/mei/libmei.la \
--$(top_builddir)/src/bft/libbft.la
--cs_check_syntax_LDFLAGS = \
--$(ORIGINRUNPATH) \
-+$(top_builddir)/src/bft/libbft.la \
- -lm
-+cs_check_syntax_LDFLAGS = \
-+$(ORIGINRUNPATH)
- 
- endif
- 
---- code-saturne-2.1.0.orig/src/apps/Makefile.in
-+++ code-saturne-2.1.0/src/apps/Makefile.in
-@@ -637,11 +637,11 @@ $(FCLIBS)
- @HAVE_FRONTEND_TRUE at cs_check_syntax_SOURCES = cs_check_syntax.c
- @HAVE_FRONTEND_TRUE at cs_check_syntax_LDADD = \
- @HAVE_FRONTEND_TRUE@$(top_builddir)/src/mei/libmei.la \
-- at HAVE_FRONTEND_TRUE@$(top_builddir)/src/bft/libbft.la
-+ at HAVE_FRONTEND_TRUE@$(top_builddir)/src/bft/libbft.la \
-+ at HAVE_FRONTEND_TRUE@-lm
- 
- @HAVE_FRONTEND_TRUE at cs_check_syntax_LDFLAGS = \
-- at HAVE_FRONTEND_TRUE@$(ORIGINRUNPATH) \
-- at HAVE_FRONTEND_TRUE@-lm
-+ at HAVE_FRONTEND_TRUE@$(ORIGINRUNPATH)
- 
- 
- # Code_Saturne partitioner
diff --git a/patches/series b/patches/series
index 7477eeb..8b13789 100644
--- a/patches/series
+++ b/patches/series
@@ -1 +1 @@
-as-needed.patch
+

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