r46974 - in /packages/code-saturne/trunk/debian: changelog code-saturne-include.install rules

[pini at users.alioth.debian.org]

Author: pini
Date: Sun Jan 11 18:49:40 2015
New Revision: 46974

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46974
Log:
Merge changeset from r46972

Move arch-dependant script cs_config.py
from code-saturne-data to code-saturne-include.

+ enable parallel build.

Modified:
    packages/code-saturne/trunk/debian/changelog
    packages/code-saturne/trunk/debian/code-saturne-include.install
    packages/code-saturne/trunk/debian/rules

Modified: packages/code-saturne/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/changelog?rev=46974&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/changelog	(original)
+++ packages/code-saturne/trunk/debian/changelog	Sun Jan 11 18:49:40 2015
@@ -1,3 +1,13 @@
+code-saturne (3.3.3-1~exp2) unstable; urgency=medium
+
+  * Team upload.
+  * Merge fix from unstable (3.3.2-3):
+    Move arch-dependant script cs_config.py from code-saturne-data to
+    code-saturne-include (Closes: #775107).
+  * Enable parallel build.
+
+ -- Gilles Filippini <pini at debian.org>  Sun, 11 Jan 2015 16:01:45 +0100
+
 code-saturne (3.3.3-1~exp1) experimental; urgency=medium
 
   * New upstream release

Modified: packages/code-saturne/trunk/debian/code-saturne-include.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/code-saturne-include.install?rev=46974&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/code-saturne-include.install	(original)
+++ packages/code-saturne/trunk/debian/code-saturne-include.install	Sun Jan 11 18:49:40 2015
@@ -1,2 +1,2 @@
 debian/tmp/usr/include
-
+debian/tmp/usr/lib/python*/dist-packages/code_saturne/cs_config.py

Modified: packages/code-saturne/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/rules?rev=46974&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/rules	(original)
+++ packages/code-saturne/trunk/debian/rules	Sun Jan 11 18:49:40 2015
@@ -1,5 +1,9 @@
 #!/usr/bin/make -f
 # Copyright 2009 Sylvestre Ledru <sylvestre at debian.org>
+
+# Exclude cs_config.py from package code-saturne-data
+# It should go into code-saturne-include
+binary-install/code-saturne-data:: DEB_DH_INSTALL_ARGS := -Xcs_config.py
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
@@ -22,9 +26,18 @@
 DEB_MAKE_INSTALL_TARGET  := install DESTDIR=`pwd`/debian/tmp
 DEB_COMPRESS_EXCLUDE := .pdf .xml .des .f90 .c
 
+# Enable parallel build when available
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
+endif	
+
 install/code-saturne-bin::
 	chrpath -d debian/tmp/usr/lib/code_saturne/cs_* debian/tmp/usr/lib/libsaturne.so*
 
 binary-install/code-saturne-data::
 	chmod +x debian/code-saturne-data/usr/share/code_saturne/runcase*
 	dh_python2 -pcode-saturne-data
+
+binary-install/code-saturne-include::
+	dh_python2 -pcode-saturne-include