r44039 - in /packages/code-saturne/code-saturne/trunk/debian: changelog code-saturne-bin.install code-saturne-bin.manpages code-saturne-data.install code-saturne-doc.install control rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Mon Nov 21 12:21:46 2011
New Revision: 44039

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44039
Log:
code-saturne (2.1.0-1) unstable; urgency=low

  * New upstream release. Merge all dependencies into a single source package.
  * Fix some minor lintian warnings.

Modified:
    packages/code-saturne/code-saturne/trunk/debian/changelog
    packages/code-saturne/code-saturne/trunk/debian/code-saturne-bin.install
    packages/code-saturne/code-saturne/trunk/debian/code-saturne-bin.manpages
    packages/code-saturne/code-saturne/trunk/debian/code-saturne-data.install
    packages/code-saturne/code-saturne/trunk/debian/code-saturne-doc.install
    packages/code-saturne/code-saturne/trunk/debian/control
    packages/code-saturne/code-saturne/trunk/debian/rules

Modified: packages/code-saturne/code-saturne/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/code-saturne/trunk/debian/changelog?rev=44039&op=diff
==============================================================================
--- packages/code-saturne/code-saturne/trunk/debian/changelog (original)
+++ packages/code-saturne/code-saturne/trunk/debian/changelog Mon Nov 21 12:21:46 2011
@@ -1,6 +1,7 @@
 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
 

Modified: packages/code-saturne/code-saturne/trunk/debian/code-saturne-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/code-saturne/trunk/debian/code-saturne-bin.install?rev=44039&op=diff
==============================================================================
--- packages/code-saturne/code-saturne/trunk/debian/code-saturne-bin.install (original)
+++ packages/code-saturne/code-saturne/trunk/debian/code-saturne-bin.install Mon Nov 21 12:21:46 2011
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/*.so*
-debian/tmp/usr/bin/cs_solver
+debian/tmp/usr/lib/code-saturne/code_saturne/cs_solver
 debian/tmp/usr/bin/code_saturne
 

Modified: packages/code-saturne/code-saturne/trunk/debian/code-saturne-bin.manpages
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/code-saturne/trunk/debian/code-saturne-bin.manpages?rev=44039&op=diff
==============================================================================
--- packages/code-saturne/code-saturne/trunk/debian/code-saturne-bin.manpages (original)
+++ packages/code-saturne/code-saturne/trunk/debian/code-saturne-bin.manpages Mon Nov 21 12:21:46 2011
@@ -1,2 +1,1 @@
-doc/manpages/cs_solver.1
 doc/manpages/code_saturne.1

Modified: packages/code-saturne/code-saturne/trunk/debian/code-saturne-data.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/code-saturne/trunk/debian/code-saturne-data.install?rev=44039&op=diff
==============================================================================
--- packages/code-saturne/code-saturne/trunk/debian/code-saturne-data.install (original)
+++ packages/code-saturne/code-saturne/trunk/debian/code-saturne-data.install Mon Nov 21 12:21:46 2011
@@ -1,4 +1,4 @@
 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

Modified: packages/code-saturne/code-saturne/trunk/debian/code-saturne-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/code-saturne/trunk/debian/code-saturne-doc.install?rev=44039&op=diff
==============================================================================
--- packages/code-saturne/code-saturne/trunk/debian/code-saturne-doc.install (original)
+++ packages/code-saturne/code-saturne/trunk/debian/code-saturne-doc.install Mon Nov 21 12:21:46 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/doc/ncs/*
+debian/tmp/usr/share/doc/code_saturne/*

Modified: packages/code-saturne/code-saturne/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/code-saturne/trunk/debian/control?rev=44039&op=diff
==============================================================================
--- packages/code-saturne/code-saturne/trunk/debian/control (original)
+++ packages/code-saturne/code-saturne/trunk/debian/control Mon Nov 21 12:21:46 2011
@@ -47,6 +47,8 @@
 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
@@ -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
@@ -116,7 +120,7 @@
 Package: code-saturne-doc
 Priority: optional
 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

Modified: packages/code-saturne/code-saturne/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/code-saturne/trunk/debian/rules?rev=44039&op=diff
==============================================================================
--- packages/code-saturne/code-saturne/trunk/debian/rules (original)
+++ packages/code-saturne/code-saturne/trunk/debian/rules Mon Nov 21 12:21:46 2011
@@ -3,7 +3,6 @@
 
 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_CONFIGURE_USER_FLAGS := --with-syrthes=/usr/lib/syrthes/ --with-mpi CFLAGS="-I/usr/lib/openmpi/include/"
 DEB_MAKE_BUILD_TARGET    := all pdf
@@ -11,9 +10,9 @@
 DEB_COMPRESS_EXCLUDE := .pdf
 
 binary-install/code-saturne-bin::
-	chrpath -d debian/code-saturne-bin/usr/bin/cs_solver
+	chrpath -d debian/tmp/usr/lib/code-saturne/code_saturne/cs_solver
 
 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