[code-saturne] 01/02: Drop patch ac_init.patch
Gilles Filippini
pini at debian.org
Wed Dec 2 18:25:27 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 d8ae0c35ee903970fbc4cdc6527168999442a11d
Author: Gilles Filippini <pini at debian.org>
Date: Mon Nov 30 11:26:01 2015 +0100
Drop patch ac_init.patch
to change back the package name for autoconf from 'code-saturne' to
'code_saturne'. This patch broke some tests into the script
cs_package.py.
Upload release 4.1.1+repack-2~exp1 to experimental.
---
debian/NEWS | 11 +++++++++++
debian/changelog | 8 ++++++++
debian/code-saturne-bin.install | 2 +-
debian/code-saturne-data.install | 2 +-
debian/code-saturne-doc.install | 4 ++--
debian/code-saturne-include.install | 2 +-
debian/patches/ac_init.patch | 13 -------------
debian/patches/series | 1 -
debian/rules | 4 ++--
9 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..17bba6e
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,11 @@
+code-saturne (4.1.1+repack-2~exp1) experimental; urgency=medium
+
+ Starting with this release the package name for autoconf was
+ changed back from 'code-saturne' to 'code_saturne'. A few paths
+ changed accordingly:
+ - /usr/include/code_saturne
+ - /usr/lib/code_saturne
+ - /usr/share/code_saturne
+ - /usr/lib/python*/dist-packages/code_saturne
+
+ -- Gilles Filippini <pini at debian.org> Sun, 29 Nov 2015 18:24:45 +0100
diff --git a/debian/changelog b/debian/changelog
index 302b71b..f743269 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+code-saturne (4.1.1+repack-2~exp1) experimental; urgency=medium
+
+ * Drop patch ac_init.patch to change back the package name for
+ autoconf from 'code-saturne' to 'code_saturne'. This patch broke
+ some tests into the script cs_package.py.
+
+ -- Gilles Filippini <pini at debian.org> Mon, 30 Nov 2015 11:25:23 +0100
+
code-saturne (4.1.1+repack-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/code-saturne-bin.install b/debian/code-saturne-bin.install
index c871afd..209fb64 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 845d371..6c22f82 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 usr/share/bash-completion/completions
debian/tmp/etc/code_saturne.cfg.template
diff --git a/debian/code-saturne-doc.install b/debian/code-saturne-doc.install
index 66b1b78..eddfe56 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
+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 ee90505..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
+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
deleted file mode 100644
index eb8d941..0000000
--- a/debian/patches/ac_init.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 a2504c5..6353da6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
pdflatex.patch
-ac_init.patch
format-not-a-string-literal-and-no-format-arguments.patch
diff --git a/debian/rules b/debian/rules
index cc43078..58f9f8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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