[code-saturne] 52/70: Merge changeset from r46972

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository code-saturne.

commit da76123c3b66c0bc6427ba5c9f9e16b3566835c0
Author: Gilles Filippini <pini at debian.org>
Date:   Sun Jan 11 18:49:40 2015 +0000

    Merge changeset from r46972
    
    Move arch-dependant script cs_config.py
    from code-saturne-data to code-saturne-include.
    
    + enable parallel build.
---
 debian/changelog                    | 10 ++++++++++
 debian/code-saturne-include.install |  2 +-
 debian/rules                        | 13 +++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ab2b61d..31716d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/code-saturne-include.install b/debian/code-saturne-include.install
index bf4e0a9..9145e1f 100644
--- a/debian/code-saturne-include.install
+++ b/debian/code-saturne-include.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/include
-
+debian/tmp/usr/lib/python*/dist-packages/code_saturne/cs_config.py
diff --git a/debian/rules b/debian/rules
index 16514e1..d6dc267 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,10 @@
 #!/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
 include /usr/share/cdbs/1/rules/autoreconf.mk
@@ -22,9 +26,18 @@ DEB_MAKE_BUILD_TARGET    := all
 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

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