r46422 - in /packages/code-saturne/trunk/debian: changelog control patches/fix-the-make-install.diff patches/series rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Fri Dec 13 15:49:38 UTC 2013
Author: sylvestre
Date: Fri Dec 13 15:49:38 2013
New Revision: 46422
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46422
Log:
* New upstream release
* Cherry-pick a patch from upstream to fix the install
fix-the-make-install.diff
* Use dh-autoreconf to rebuild the autotools files
* New upstream release
Added:
packages/code-saturne/trunk/debian/patches/fix-the-make-install.diff
Modified:
packages/code-saturne/trunk/debian/changelog
packages/code-saturne/trunk/debian/control
packages/code-saturne/trunk/debian/patches/series
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=46422&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/changelog (original)
+++ packages/code-saturne/trunk/debian/changelog Fri Dec 13 15:49:38 2013
@@ -1,3 +1,18 @@
+code-saturne (3.2.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Cherry-pick a patch from upstream to fix the install
+ fix-the-make-install.diff
+ * Use dh-autoreconf to rebuild the autotools files
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 10 Dec 2013 09:51:14 +0100
+
+code-saturne (3.1.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Fri, 21 Jun 2013 10:54:15 +0200
+
code-saturne (3.0.1-1) unstable; urgency=low
* New upstream release
Modified: packages/code-saturne/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/control?rev=46422&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/control (original)
+++ packages/code-saturne/trunk/debian/control Fri Dec 13 15:49:38 2013
@@ -9,8 +9,8 @@
# To help the configure detection on cs lib
zlib1g-dev, libhdf5-mpi-dev (>= 1.8.8~), libcgns-dev (>= 3.1.3.2), mpi-default-dev, libmedc-dev,
libxml2-dev, libblas-dev | libatlas-dev, libopenmpi-dev,
- chrpath, python, libscotch-dev
-Standards-Version: 3.9.4
+ chrpath, python, libscotch-dev, dh-autoreconf
+Standards-Version: 3.9.5
Homepage: http://www.code-saturne.org/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/code-saturne/code-saturne/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/code-saturne/code-saturne/
Added: packages/code-saturne/trunk/debian/patches/fix-the-make-install.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/patches/fix-the-make-install.diff?rev=46422&op=file
==============================================================================
--- packages/code-saturne/trunk/debian/patches/fix-the-make-install.diff (added)
+++ packages/code-saturne/trunk/debian/patches/fix-the-make-install.diff Fri Dec 13 15:49:38 2013
@@ -0,0 +1,96 @@
+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)
Modified: packages/code-saturne/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/patches/series?rev=46422&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/patches/series (original)
+++ packages/code-saturne/trunk/debian/patches/series Fri Dec 13 15:49:38 2013
@@ -1 +1,2 @@
+fix-the-make-install.diff
Modified: packages/code-saturne/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/rules?rev=46422&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/rules (original)
+++ packages/code-saturne/trunk/debian/rules Fri Dec 13 15:49:38 2013
@@ -3,6 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
DEB_CONFIGURE_USER_FLAGS := --with-syrthes=/usr/lib/syrthes/ --with-mpi --libexecdir=/usr/lib/
#--libdir=/usr/lib/code_saturne
More information about the debian-science-commits
mailing list