[code-saturne] 41/70: New upstream release

[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 87dfb8654e10471ba56a82fb717e26a02244844e
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Sun May 4 13:08:22 2014 +0000

    New upstream release
---
 debian/changelog                         |  6 ++
 debian/patches/fix-the-make-install.diff | 96 --------------------------------
 debian/patches/series                    |  2 -
 3 files changed, 6 insertions(+), 98 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4e663b..56c0df6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+code-saturne (3.2.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 04 May 2014 11:51:53 +0200
+
 code-saturne (3.2.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/fix-the-make-install.diff b/debian/patches/fix-the-make-install.diff
deleted file mode 100644
index d308eba..0000000
--- a/debian/patches/fix-the-make-install.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-Index: saturne.orig/salome/cfd_study/src/CFDSTUDYGUI/Makefile.am
-===================================================================
---- saturne.orig/salome/cfd_study/src/CFDSTUDYGUI/Makefile.am	(révision 5573)
-+++ saturne/salome/cfd_study/src/CFDSTUDYGUI/Makefile.am	(révision 5575)
-@@ -86,7 +86,7 @@
- 
- install-exec-local: $(PYUI_FILES)
- 	for f in $^ ; do\
--		$(INSTALL) $$f $(salomepythondir)/$$f ; \
-+		$(INSTALL) $$f "$(DESTDIR)$(salomepythondir)/$$f" ; \
- 	done ;
- 
- ## meta object implementation files generation (moc)
-Index: saturne.orig/src/apps/Makefile.am
-===================================================================
---- saturne.orig/src/apps/Makefile.am	(révision 5573)
-+++ saturne/src/apps/Makefile.am	(révision 5575)
-@@ -182,7 +182,7 @@
- install-exec-hook: libsaturne.la
- 	PYTHONPATH=$(top_builddir)/bin:$(top_srcdir)/bin$${PYTHONPATH:+:$$PYTHONPATH} \
- 	$(PYTHON) -B $(top_srcdir)/bin/cs_compile.py --mode=install \
--	--dest "$(DESTDIR)$(pkglibexecdir)"
-+	--dest "$(DESTDIR)"
- 
- uninstall-local:
- 	rm $(libexecdir)/$(PACKAGE)/cs_solver
-Index: saturne.orig/bin/cs_compile.py
-===================================================================
---- saturne.orig/bin/cs_compile.py	(révision 5573)
-+++ saturne/bin/cs_compile.py	(révision 5575)
-@@ -219,8 +219,28 @@
- 
- #-------------------------------------------------------------------------------
- 
--def get_build_flags(pkg, flag, install=False):
-+def dest_subdir(destdir, d):
- 
-+    t = d
-+
-+    # Concatenate destdir and target subdirectory
-+    
-+    if sys.platform.startswith("win"):
-+        i = t.find(':\\')
-+        if i > -1:
-+            t = t[i+1:]
-+            while t[0] == '\\':
-+                t = t[1:]
-+    else:
-+        while t[0] == '/':
-+            t = t[1:]
-+
-+    return os.path.join(destdir, t)
-+
-+#-------------------------------------------------------------------------------
-+
-+def get_build_flags(pkg, flag, install=False, destdir=None):
-+
-     cmd_line = []
- 
-     # Build the command line, and split possible multiple arguments in lists.
-@@ -245,6 +265,8 @@
-             # So, assuming we always build on MinGW, here is a little trick!
-             if sys.platform.startswith("win"):
-                 libdir = os.path.normpath('C:\\MinGW\\msys\\1.0' + libdir)
-+            if destdir:
-+                libdir = dest_subdir(destdir, libdir)
-             cmd_line.insert(0, "-L" + libdir)
- 
-     return cmd_line
-@@ -432,14 +454,14 @@
-     # Determine executable name
- 
-     exec_name = pkg.solver
--    if destdir:
--        exec_name = os.path.join(destdir, exec_name)
--    elif install:
-+    if install:
-         exec_name = os.path.join(pkg.dirs['pkglibexecdir'][1], exec_name)
-         # Strangely, on MinGW, Windows paths are not correctly handled here...
-         # So, assuming we always build on MinGW, here is a little trick!
-         if sys.platform.startswith("win"):
-             exec_name = os.path.normpath('C:\\MinGW\\msys\\1.0' + exec_name)
-+        if destdir:
-+            exec_name = dest_subdir(destdir, exec_name)
-         dirname = os.path.dirname(exec_name)
-         if not os.path.exists(dirname):
-             os.makedirs(dirname)
-@@ -452,7 +474,7 @@
- 
-     cmd = [get_compiler(pkg, 'ld', link_build = True)]
-     cmd = cmd + ["-o", exec_name]
--    cmd = cmd + get_build_flags(pkg, 'ldflags', install)
-+    cmd = cmd + get_build_flags(pkg, 'ldflags', install, destdir)
-     cmd = cmd + p_libs
-     if pkg.config.rpath != "":
-         cmd += so_dirs_path(cmd, pkg)
diff --git a/debian/patches/series b/debian/patches/series
index fb39641..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-
-fix-the-make-install.diff

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