[code-saturne] 04/07: Successful build from upstream SVN source

Mon Jan 19 23:30:40 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 a7cd2f9e38cd8a2e614618682d3738105c6c0a61
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Jan 19 20:42:52 2015 +0100

    Successful build from upstream SVN source
    
    + two builds in a row.
---
 debian/changelog                          | 14 +++++++++++++-
 debian/code-saturne-doc.docs              |  2 --
 debian/code-saturne-doc.install           |  3 +++
 debian/code-saturne-doc.lintian-overrides |  3 +++
 debian/control                            |  2 ++
 debian/rules                              | 26 +++++++++++++++++++++++---
 debian/source/local-options               |  1 +
 debian/source/options                     |  1 +
 8 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 644b553..19f5329 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,20 @@
-code-saturne (3.3.3-1~exp4) UNRELEASED; urgency=medium
+code-saturne (3.3.3+svn-1~exp1) UNRELEASED; urgency=medium
 
   * Move packaging work from svn to git on alioth.
   * debian/control: update Vcs-* fields.
 
+  * Get upstream source code from upstream SVN repository, to be able
+    to generate documentation from source (Closes: #746970):
+    - debian/control: Build-Depends: bison, flex, doxygen, graphviz
+    - install docs via debian/code-saturne-doc.install instead of
+      debian/code-saturne-doc.docs to be able to exclude some paths
+    - debian/code-saturne-doc.lintian-overrides to silence #736360.
+  * install docs into /usr/share/doc/code-saturne (instead of
+    /usr/share/doc/code-saturne-doc).
+
+  * Fix the clean target and add debian/source/option to successfully
+    pass the two builds in a row test.
+
  -- Gilles Filippini <pini at debian.org>  Mon, 19 Jan 2015 00:57:44 +0100
 
 code-saturne (3.3.3-1~exp3) experimental; urgency=medium
diff --git a/debian/code-saturne-doc.docs b/debian/code-saturne-doc.docs
deleted file mode 100644
index 7ba3a15..0000000
--- a/debian/code-saturne-doc.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/doc/code_saturne/*
-examples/
diff --git a/debian/code-saturne-doc.install b/debian/code-saturne-doc.install
new file mode 100644
index 0000000..9c59b02
--- /dev/null
+++ b/debian/code-saturne-doc.install
@@ -0,0 +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
diff --git a/debian/code-saturne-doc.lintian-overrides b/debian/code-saturne-doc.lintian-overrides
new file mode 100644
index 0000000..9c4614f
--- /dev/null
+++ b/debian/code-saturne-doc.lintian-overrides
@@ -0,0 +1,3 @@
+# See bug #736360
+# <http://bugs.debian.org/736360>
+code-saturne-doc: embedded-javascript-library
diff --git a/debian/control b/debian/control
index ab6e26c..c471e10 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,8 @@ Uploaders: Sylvestre Ledru <sylvestre at debian.org>, Gilles Filippini <pini at debian
 Build-Depends: debhelper (>= 7), autotools-dev, cdbs, python-qt4,
  pyqt4-dev-tools, fig2ps, gfortran, autoconf,
  texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra, 
+# To build from upstream SVN source
+  bison, flex, doxygen, graphviz,
 # 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,
diff --git a/debian/rules b/debian/rules
index d6dc267..533f515 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +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
+# Exclude cs_config.py from package code-saturne-data:
+# It should go into code-saturne-include.
+# Exclude extra license file COPYING as well.
+binary-install/code-saturne-data:: DEB_DH_INSTALL_ARGS := -Xcs_config.py -XCOPYING
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
@@ -22,6 +23,7 @@ ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)/l
 endif
 
 #--libdir=/usr/lib/code_saturne
+DEB_MAKE_CLEAN_TARGET    := distclean
 DEB_MAKE_BUILD_TARGET    := all
 DEB_MAKE_INSTALL_TARGET  := install DESTDIR=`pwd`/debian/tmp
 DEB_COMPRESS_EXCLUDE := .pdf .xml .des .f90 .c
@@ -32,6 +34,21 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
 endif	
 
+clean::
+	rm -fr docs/doxygen/src
+	rm -f po/*.gmo
+	rm -f po/POTFILES.in
+	rm -f po/code_saturne.pot
+	rm -f po/stamp-po
+	rm -f src/apps/cs_solver
+	rm -f src/mei/mei_parser.[ch] src/mei/mei_scanner.c
+	# Uncomment when testing two builds in a row
+	#echo "abort-on-upstream-changes" >debian/source/local-options
+
+pre-build::
+	# See sbin/bootstrap
+	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*
 
@@ -41,3 +58,6 @@ binary-install/code-saturne-data::
 
 binary-install/code-saturne-include::
 	dh_python2 -pcode-saturne-include
+
+build/code-saturne-doc::
+	$(MAKE) html pdf
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..d22c6fa
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore = "(^|/).*\.po$"

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

