r36222 - in /packages/code-saturne/code-saturne/trunk/debian: changelog control patches/pypathissue.diff rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Wed Feb 24 17:35:30 2010
New Revision: 36222

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36222
Log:
  * Fix a build issue under kfreebsd-*. Thanks to Petr Salinger for the patch
   (Closes: #571007)
  * code-saturne recommends pdf-viewer

Added:
    packages/code-saturne/code-saturne/trunk/debian/patches/pypathissue.diff
Modified:
    packages/code-saturne/code-saturne/trunk/debian/changelog
    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=36222&op=diff
==============================================================================
--- packages/code-saturne/code-saturne/trunk/debian/changelog (original)
+++ packages/code-saturne/code-saturne/trunk/debian/changelog Wed Feb 24 17:35:30 2010
@@ -1,3 +1,11 @@
+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

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=36222&op=diff
==============================================================================
--- packages/code-saturne/code-saturne/trunk/debian/control (original)
+++ packages/code-saturne/code-saturne/trunk/debian/control Wed Feb 24 17:35:30 2010
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7), autotools-dev, cdbs, libbft-dev (>= 1.1.2),
  libfvm-dev (>= 0.15.0), libmei-dev (>= 1.0.1), python-qt4, pyqt4-dev-tools, 
  texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra, 
- fig2ps, syrthes, ecs (>= 2.0.0.rc1), gfortran,
+ fig2ps, syrthes, ecs (>= 2.0.0.rc1), gfortran, autoconf,
 # To help the configure detection on cs lib
   zlib1g-dev, libhdf5-serial-dev, libcgns-dev, mpi-default-dev, libmedc-dev,
   libxml2-dev, libblas-dev | libatlas-dev  
@@ -22,7 +22,7 @@
  code-saturne-bin (= ${binary:Version}),
  code-saturne-data (= ${source:Version}),
  code-saturne-include (= ${binary:Version}), python-qt4
-Recommends: syrthes, bash-completion, paraview
+Recommends: syrthes, bash-completion, paraview, pdf-viewer
 Description: General purpose Computational Fluid Dynamics (CFD) software
  The basic capabilities of Code_Saturne enable the handling of either
  incompressible or expandable flows with or without heat transfer and

Added: packages/code-saturne/code-saturne/trunk/debian/patches/pypathissue.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/code-saturne/trunk/debian/patches/pypathissue.diff?rev=36222&op=file
==============================================================================
--- packages/code-saturne/code-saturne/trunk/debian/patches/pypathissue.diff (added)
+++ packages/code-saturne/code-saturne/trunk/debian/patches/pypathissue.diff Wed Feb 24 17:35:30 2010
@@ -1,0 +1,13 @@
+Index: code-saturne-2.0.0.rc1/configure.ac
+===================================================================
+--- code-saturne-2.0.0.rc1.orig/configure.ac	2010-02-24 18:05:28.000000000 +0100
++++ code-saturne-2.0.0.rc1/configure.ac	2010-02-24 18:05:45.000000000 +0100
+@@ -447,7 +447,7 @@
+ path = app.applicationDirPath()
+ sys.stdout.write(path)]"
+ 
+-    PYPATH=`${PYTHON} -c "${prog}"`
++    PYPATH=$PATH:`${PYTHON} -c "${prog}"`
+ 
+   else
+     PYPATH=${PYQT4_EXE}

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=36222&op=diff
==============================================================================
--- packages/code-saturne/code-saturne/trunk/debian/rules (original)
+++ packages/code-saturne/code-saturne/trunk/debian/rules Wed Feb 24 17:35:30 2010
@@ -10,6 +10,10 @@
 DEB_MAKE_INSTALL_TARGET  := install install-pdf DESTDIR=`pwd`/debian/tmp
 DEB_COMPRESS_EXCLUDE := .pdf
 
+debian/stamp-autotools-files:
+	autoconf
+	touch $@
+
 binary-install/code-saturne-data::
 	find debian/code-saturne-data/ -name '*.pyc' -exec rm '{}' ';'
 	chmod +x debian/code-saturne-data/usr/share/ncs/SaturneGUI \