[code-saturne] 01/01: New patch ac_init.patch to fix installation paths
Gilles Filippini
pini at debian.org
Thu Jan 22 18:23:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository code-saturne.
commit 1fc3c81c1bc1d546cc9bc4c1365081412a25aea9
Author: Gilles Filippini <pini at debian.org>
Date: Thu Jan 22 14:17:58 2015 +0100
New patch ac_init.patch to fix installation paths
We use the name 'code-saturne' instead of 'code_saturne'.
---
debian/changelog | 11 +++++++++++
debian/code-saturne-bin.install | 2 +-
debian/code-saturne-data.install | 2 +-
debian/code-saturne-data.lintian-overrides | 2 +-
debian/code-saturne-doc.install | 6 +++---
debian/code-saturne-include.install | 2 +-
debian/patches/ac_init.patch | 13 +++++++++++++
debian/patches/series | 1 +
debian/rules | 6 +++---
9 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f0a4e1b..be5aa38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+code-saturne (3.3.3+svn-1~exp2) experimental; urgency=medium
+
+ * New patch ac_init.patch to initialise the build chain with
+ the name "code-saturne" instead of "code_saturne", so that
+ installation paths are consistent.
+ This way the command "code_saturne info -g <doc>" is able to
+ find /usr/share/doc/code-saturne/<doc>.pdf.
+ * Install examples into usr/share/doc/code-saturne as well.
+
+ -- Gilles Filippini <pini at debian.org> Thu, 22 Jan 2015 14:16:04 +0100
+
code-saturne (3.3.3+svn-1~exp1) experimental; urgency=medium
* Move packaging work from svn to git on alioth.
diff --git a/debian/code-saturne-bin.install b/debian/code-saturne-bin.install
index 209fb64..c871afd 100644
--- a/debian/code-saturne-bin.install
+++ b/debian/code-saturne-bin.install
@@ -1,4 +1,4 @@
debian/tmp/usr/lib/*.so*
-debian/tmp/usr/lib/code_saturne/cs_*
+debian/tmp/usr/lib/code-saturne/cs_*
debian/tmp/usr/bin/
diff --git a/debian/code-saturne-data.install b/debian/code-saturne-data.install
index 059bd07..9b9ebff 100644
--- a/debian/code-saturne-data.install
+++ b/debian/code-saturne-data.install
@@ -1,5 +1,5 @@
debian/tmp/usr/lib/python*/
-debian/tmp/usr/share/code_saturne/
+debian/tmp/usr/share/code-saturne/
debian/tmp/usr/share/locale/
debian/tmp/etc/bash_completion.d/code_saturne
debian/tmp/etc/code_saturne.cfg.template
diff --git a/debian/code-saturne-data.lintian-overrides b/debian/code-saturne-data.lintian-overrides
index eae2d65..a8a9cd4 100644
--- a/debian/code-saturne-data.lintian-overrides
+++ b/debian/code-saturne-data.lintian-overrides
@@ -1 +1 @@
-code-saturne-data: image-file-in-usr-lib usr/lib/python2.7/dist-packages/code_saturne/Base/icons/splashscreen.png
+code-saturne-data: image-file-in-usr-lib usr/lib/python2.7/dist-packages/code-saturne/Base/icons/splashscreen.png
diff --git a/debian/code-saturne-doc.install b/debian/code-saturne-doc.install
index 9c59b02..66b1b78 100644
--- a/debian/code-saturne-doc.install
+++ b/debian/code-saturne-doc.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/share/doc/code_saturne/*.pdf usr/share/doc/code-saturne
-debian/tmp/usr/share/doc/code_saturne/doxygen/src/html/* usr/share/doc/code-saturne/doxygen/src
-examples/ usr/share/doc/code-saturne-doc
+debian/tmp/usr/share/doc/code-saturne/*.pdf usr/share/doc/code-saturne
+debian/tmp/usr/share/doc/code-saturne/doxygen/src/html/* usr/share/doc/code-saturne/doxygen/src
+examples/ usr/share/doc/code-saturne
diff --git a/debian/code-saturne-include.install b/debian/code-saturne-include.install
index 9145e1f..ee90505 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
+debian/tmp/usr/lib/python*/dist-packages/code-saturne/cs_config.py
diff --git a/debian/patches/ac_init.patch b/debian/patches/ac_init.patch
new file mode 100644
index 0000000..eb8d941
--- /dev/null
+++ b/debian/patches/ac_init.patch
@@ -0,0 +1,13 @@
+Index: code-saturne/configure.ac
+===================================================================
+--- code-saturne.orig/configure.ac
++++ code-saturne/configure.ac
+@@ -53,7 +53,7 @@ m4_define([cs_licence_c_comment],
+ m4_define([cs_version_string],
+ [m4_normalize(esyscmd([build-aux/cs_version.py]))])
+
+-AC_INIT([code_saturne],[cs_version_string],[saturne-support at edf.fr],[],[http://code-saturne.org])
++AC_INIT([code-saturne],[cs_version_string],[saturne-support at edf.fr],[],[http://code-saturne.org])
+ AC_CONFIG_SRCDIR([src/apps/cs_solver.c])
+
+ # Use the config directory for libtool stuff ...
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..9ca93de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ac_init.patch
diff --git a/debian/rules b/debian/rules
index 533f515..75fa214 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)/l
--with-hdf5-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
endif
-#--libdir=/usr/lib/code_saturne
+#--libdir=/usr/lib/code-saturne
DEB_MAKE_CLEAN_TARGET := distclean
DEB_MAKE_BUILD_TARGET := all
DEB_MAKE_INSTALL_TARGET := install DESTDIR=`pwd`/debian/tmp
@@ -50,10 +50,10 @@ pre-build::
ls preprocessor/*/*.c src/*/*.c* | grep -v user_examples > po/POTFILES.in
install/code-saturne-bin::
- chrpath -d debian/tmp/usr/lib/code_saturne/cs_* debian/tmp/usr/lib/libsaturne.so*
+ 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*
+ chmod +x debian/code-saturne-data/usr/share/code-saturne/runcase*
dh_python2 -pcode-saturne-data
binary-install/code-saturne-include::
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/code-saturne.git
More information about the debian-science-commits
mailing list