[code-saturne] 29/70: Moved at the right place since they all merged
Gilles Filippini
pini at debian.org
Sun Jan 18 22:33:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository code-saturne.
commit 7540f6f969b6c3078cec07c4f9a3b7e9533e9fef
Merge: 0bb0bcf 51db1b4
Author: Sylvestre Ledru <sylvestre at debian.org>
Date: Sun Dec 11 18:25:49 2011 +0000
Moved at the right place since they all merged
debian/changelog | 94 +++++++++++++++++++++++++++++-
debian/code-saturne-bin.install | 4 +-
debian/code-saturne-bin.lintian-overrides | 11 ++++
debian/code-saturne-bin.manpages | 8 +--
debian/code-saturne-data.install | 6 +-
debian/code-saturne-data.lintian-overrides | 1 +
debian/code-saturne-doc.install | 2 +-
debian/control | 37 +++++++-----
debian/docs | 1 -
debian/orig-tar.sh | 21 +++++++
debian/patches/have_mpi.diff | 18 ------
debian/rules | 20 ++++---
debian/source/format | 1 +
debian/watch | 4 +-
14 files changed, 171 insertions(+), 57 deletions(-)
diff --cc debian/changelog
index b6c2c36,29aefe1..b21f4c5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,85 +1,98 @@@
- code-saturne (2.0.0.beta2-3) UNRELEASED; urgency=low
++code-saturne (2.1.0-3) unstable; urgency=low
+
++ * Install a missing file
++
++ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 24 Nov 2011 00:00:08 +0100
++
++code-saturne (2.1.0-2) unstable; urgency=low
++
++ * Fix some various issues reported by upstream.
++
++ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 21 Nov 2011 14:49:56 +0100
++
+ code-saturne (2.1.0-1) unstable; urgency=low
+
- * New upstream release. Merge all dependencies into a single package.
++ * New upstream release. Merge all dependencies into a single source package.
++ * Fix some minor lintian warnings.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 01 Nov 2011 17:43:32 +0100
+
+ code-saturne (2.0.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Standards-Version updated to version 3.9.2
+ * Python byte-compile files are now compiled (Closes: #566040)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 26 Jul 2011 22:50:52 +0200
+
+ code-saturne (2.0.1-4) unstable; urgency=low
+
+ * python-mei, libbft-dev, libfvm-dev, libmei-dev, libxml2-dev, libblas-dev
+ added as dependencies of code-saturne-bin
+ * code-saturne-doc added as recommends of code-saturne
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 07 Mar 2011 21:47:26 +0100
+
+ code-saturne (2.0.1-3) unstable; urgency=low
+
+ * syrthes changed its path
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 20 Feb 2011 23:09:54 +0100
+
+ code-saturne (2.0.1-2) unstable; urgency=low
+
+ * Forgot chrpath as build dependency
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 19 Feb 2011 14:47:03 +0100
+
+ code-saturne (2.0.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Switch to dpkg-source 3.0 (quilt) format
+ * watch file updated
+ * Repack script updated
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 08 Feb 2011 18:17:01 +0100
+
+ code-saturne (2.0.0.rc1-5) unstable; urgency=low
+
+ * Change dependency from hdf5-serial to hdf5-mpi (Closes: #591154)
+ * Standards-Version updated to version 3.9.1
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 09 Oct 2010 00:45:37 +0200
+
+ code-saturne (2.0.0.rc1-4) unstable; urgency=low
+
+ * Fix a build issue under kfreebsd-*. Thanks to Petr Salinger for the patch
+ (Closes: #571007)
+ * code-saturne recommends pdf-viewer
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 24 Feb 2010 18:04:26 +0100
+
+ code-saturne (2.0.0.rc1-3) unstable; urgency=low
+
+ * Do not compress pdf files
+ * Install in code-saturne-data the bash_completion script
+ * Uses syrthes features
+ * Ship dev libraries in code-saturne-bin
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 22 Feb 2010 20:34:15 +0100
+
+ code-saturne (2.0.0.rc1-2) unstable; urgency=low
+
+ * Explicit minimal versions on code-saturne dependencies
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 22 Feb 2010 10:28:01 +0100
+
+ code-saturne (2.0.0.rc1-1) unstable; urgency=low
+
+ * New upstream release (Closes: #557297, #557020)
* watch file updated
+ * Update of Vcs-Svn Vcs-Browser
+ * Standards-Version updated to 3.8.4
+ * Apply cs-20rc1.diff provided by upstream to fix minor issues
- -- Sylvestre Ledru <sylvestre at debian.org> Sun, 14 Feb 2010 17:48:00 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 20 Feb 2010 15:06:01 +0100
code-saturne (2.0.0.beta2-2) unstable; urgency=low
diff --cc debian/code-saturne-bin.install
index 484119f,4b6ce51..209fb64
--- a/debian/code-saturne-bin.install
+++ b/debian/code-saturne-bin.install
@@@ -1,4 -1,4 +1,4 @@@
debian/tmp/usr/lib/*.so*
--debian/tmp/usr/bin/cs_solver
- debian/tmp/usr/bin/cs
-debian/tmp/usr/bin/code_saturne
++debian/tmp/usr/lib/code_saturne/cs_*
++debian/tmp/usr/bin/
diff --cc debian/code-saturne-bin.lintian-overrides
index 0000000,e319942..6188da9
mode 000000,100644..100644
--- a/debian/code-saturne-bin.lintian-overrides
+++ b/debian/code-saturne-bin.lintian-overrides
@@@ -1,0 -1,3 +1,11 @@@
+ # No big deal
-code-saturne-bin: package-name-doesnt-match-sonames libsaturne0 libsyrcs0
++code-saturne-bin: package-name-doesnt-match-sonames libbft0 libfvm0 libfvm-filters0 libmei0 libple0 libsaturne0 libsyrcs0
+
++# Normal
++code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libfvm.so.0.0.0 usr/lib/libfvm.so
++code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libsyrcs.so.0.0.0 usr/lib/libsyrcs.so
++code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libple.so.0.0.0 usr/lib/libple.so
++code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libsaturne.so.0.0.0 usr/lib/libsaturne.so
++code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libmei.so.0.0.0 usr/lib/libmei.so
++code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libfvm_filters.so.0.0.0 usr/lib/libfvm_filters.so
++code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libbft.so.0.0.0 usr/lib/libbft.so
diff --cc debian/code-saturne-bin.manpages
index fe49521,13f36b2..8469139
--- a/debian/code-saturne-bin.manpages
+++ b/debian/code-saturne-bin.manpages
@@@ -1,7 -1,2 +1,1 @@@
- doc/manpages/cs_create.1
- doc/manpages/cs_plot_probes.1
- doc/manpages/cs_check_mesh.1
- doc/manpages/cs_check_consistency.1
--doc/manpages/cs_solver.1
- doc/manpages/cs_info.1
- doc/manpages/cs_compile.1
+ doc/manpages/code_saturne.1
diff --cc debian/code-saturne-data.install
index 91e9a0a,c9502a1..c585920
--- a/debian/code-saturne-data.install
+++ b/debian/code-saturne-data.install
@@@ -1,4 -1,4 +1,6 @@@
- debian/tmp/usr/lib/python2.5/
- debian/tmp/usr/share/ncs/
+ debian/tmp/usr/lib/python*/
-debian/tmp/usr/share/ncs/
++debian/tmp/usr/share/code_saturne/
debian/tmp/usr/share/locale/
+ debian/tmp/etc/bash_completion.d/code_saturne
++debian/tmp/etc/code_saturne.cfg
+
diff --cc debian/code-saturne-doc.install
index 1560064,1560064..74b9cdc
--- a/debian/code-saturne-doc.install
+++ b/debian/code-saturne-doc.install
@@@ -1,1 -1,1 +1,1 @@@
--debian/tmp/usr/share/doc/ncs/*
++debian/tmp/usr/share/doc/code_saturne/*
diff --cc debian/control
index 53e2a0a,126365b..dc8219e
--- a/debian/control
+++ b/debian/control
@@@ -3,15 -3,17 +3,17 @@@ Section: scienc
Priority: optional
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>
- Build-Depends: debhelper (>= 7), autotools-dev, cdbs, libbft-dev, libfvm-dev,
- libmei-dev, python-qt4, pyqt4-dev-tools, texlive-latex-recommended,
- texlive-fonts-recommended, texlive-latex-extra, fig2ps
- # libmed-dev, libparmetis-dev, libmedc-dev, libopenmpi-dev,
- # libhdf5-serial-dev, libcgns-dev
- Standards-Version: 3.8.3
+ 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,
+ libxml2-dev, libblas-dev | libatlas-dev, libopenmpi-dev,
- chrpath, python
++ chrpath, python, libscotch-dev
+ Standards-Version: 3.9.2
Homepage: http://www.code-saturne.org/
- Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/code-saturne/
- Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/code-saturne/
+ Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/code-saturne/code-saturne/
+ Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/code-saturne/code-saturne/
Package: code-saturne
Priority: optional
@@@ -42,8 -44,9 +44,11 @@@ Description: General purpose Computatio
Package: code-saturne-bin
Priority: optional
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, python
+ 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
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
@@@ -66,7 -69,7 +71,9 @@@
Package: code-saturne-data
Priority: optional
Architecture: all
--Depends: ${shlibs:Depends}, ${misc:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}, python
++Replaces: python-mei
++Conflicts: python-mei
Recommends: code-saturne
Description: General purpose Computational Fluid Dynamics (CFD) software - data
The basic capabilities of Code_Saturne enable the handling of either
@@@ -90,7 -93,7 +97,8 @@@
Package: code-saturne-include
Priority: optional
Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}, libcgns-dev, libmedc-dev,
++ libhdf5-dev | libhdf5-serial-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
@@@ -112,7 -115,8 +120,8 @@@
Package: code-saturne-doc
Priority: optional
- Architecture: any
+ Section: doc
-Architecture: any
++Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: General purpose Computational Fluid Dynamics (CFD) software - Documentation
The basic capabilities of Code_Saturne enable the handling of either
diff --cc debian/rules
index 3256625,07314c5..e7b341f
--- a/debian/rules
+++ b/debian/rules
@@@ -3,13 -3,17 +3,17 @@@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
--include /usr/share/cdbs/1/rules/simple-patchsys.mk
- DEB_MAKE_BUILD_TARGET := all pdf
- DEB_MAKE_INSTALL_TARGET := install install-pdf DESTDIR=`pwd`/debian/tmp
- binary-install/code-saturne-data::
- find debian/code-saturne-data/ -name '*.pyc' -exec rm '{}' ';'
- chmod +x debian/code-saturne-data/usr/share/ncs/SaturneGUI \
- debian/code-saturne-data/usr/share/ncs/runcase \
- debian/code-saturne-data/usr/share/ncs/runcase_coupling
-DEB_CONFIGURE_USER_FLAGS := --with-syrthes=/usr/lib/syrthes/ --with-mpi CFLAGS="-I/usr/lib/openmpi/include/"
-DEB_MAKE_BUILD_TARGET := all pdf
-DEB_MAKE_INSTALL_TARGET := install install-pdf DESTDIR=`pwd`/debian/tmp
++DEB_CONFIGURE_USER_FLAGS := --with-syrthes=/usr/lib/syrthes/ --with-mpi --libexecdir=/usr/lib/
++#--libdir=/usr/lib/code_saturne
++DEB_MAKE_BUILD_TARGET := all
++DEB_MAKE_INSTALL_TARGET := install DESTDIR=`pwd`/debian/tmp
+ DEB_COMPRESS_EXCLUDE := .pdf
+
-binary-install/code-saturne-bin::
- chrpath -d debian/code-saturne-bin/usr/bin/cs_solver
++install/code-saturne-bin::
++ chrpath -d debian/tmp/usr/lib/code_saturne/cs_*
+ binary-install/code-saturne-data::
- chmod +x debian/code-saturne-data/usr/share/ncs/SaturneGUI \
- debian/code-saturne-data/usr/share/ncs/runcase
++ chmod +x debian/code-saturne-data/usr/share/code_saturne/SaturneGUI \
++ debian/code-saturne-data/usr/share/code_saturne/runcase*
+ dh_python2 -pcode-saturne-data
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/code-saturne.git
More information about the debian-science-commits
mailing list