[Debian-astro-commits] [gyoto] 01/01: gyoto (1.0.2-2) unstable; urgency=low

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit 2614356b2ad3f0e385160b706c6c0e92cd41fa30
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Wed Feb 10 23:31:49 2016 +0100

    gyoto (1.0.2-2) unstable; urgency=low
    
      * Bug fix: "FTBFS: gyoto.C: Error initializing libgyoto", thanks to
        Mattia Rizzolo (Closes: #813725).
      * Bug fix: "please make the build reproducible", thanks to Chris Lamb
        (Closes: #797518).
      * Bump Standards-Version to 3.9.7. No change required.
    
     -- Thibaut Paumard <thibaut at debian.org>  Wed, 10 Feb 2016 11:25:37 +0100
---
 debian/changelog                     | 10 ++++++++++
 debian/control                       |  2 +-
 debian/patches/check-ld-library-path | 23 +++++++++++++++++++++++
 debian/patches/series                |  2 ++
 debian/patches/user_guide-timestamp  | 25 +++++++++++++++++++++++++
 yorick/gyotoy.i                      |  2 +-
 6 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c6085bf..0192a7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gyoto (1.0.2-2) unstable; urgency=low
+
+  * Bug fix: "FTBFS: gyoto.C: Error initializing libgyoto", thanks to
+    Mattia Rizzolo (Closes: #813725).
+  * Bug fix: "please make the build reproducible", thanks to Chris Lamb
+    (Closes: #797518).
+  * Bump Standards-Version to 3.9.7. No change required.
+
+ -- Thibaut Paumard <thibaut at debian.org>  Wed, 10 Feb 2016 11:25:37 +0100
+
 gyoto (1.0.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index ef6d067..fdde22b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9~), yorick-dev, yorick-yutils,
 Build-Depends-Indep: doxygen-latex,
                texlive-bibtex-extra, texlive-latex-base,
                texlive-lang-french, tipa
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
 Testsuite: autopkgtest
diff --git a/debian/patches/check-ld-library-path b/debian/patches/check-ld-library-path
new file mode 100644
index 0000000..fe937e6
--- /dev/null
+++ b/debian/patches/check-ld-library-path
@@ -0,0 +1,23 @@
+Description: Fix LD_LIBRARY_PATH in CHECK_CMD
+ Sometimes the libtool wrapper around gyoto fails to find the plug-ins in
+ lib/.libs. This causes FTBFS. Set LD_LIBRARY_PATH to include this directory.
+Author: Thibaut Paumard
+Origin: upstream
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813725
+Applied-Upstream: 9006be3211f0daeaf32f1ff49a4b8accb1e7eb48
+Last-Update: 2016-02-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/bin/Makefile.am b/bin/Makefile.am
+index d443134..7985a1e 100644
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -62,7 +62,7 @@ CLEANFILES += $(CHECK_RESULTS) $(CHECK_MPI_RESULTS)
+ 
+ MPIRUN = mpirun
+ 
+-CHECK_CMD = ./gyoto -pstdplug -r32 -T8 -P0
++CHECK_CMD = LD_LIBRARY_PATH=@top_builddir@/lib/.libs/:$(LD_LIBRARY_PATH) ./gyoto -pstdplug -r32 -T8 -P0
+ 
+ check-nompi-clean:
+ 	rm -f $(CHECK_RESULTS)
diff --git a/debian/patches/series b/debian/patches/series
index b8c491c..c7cea01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 interpreter-path
+check-ld-library-path
+user_guide-timestamp
diff --git a/debian/patches/user_guide-timestamp b/debian/patches/user_guide-timestamp
new file mode 100644
index 0000000..b899125
--- /dev/null
+++ b/debian/patches/user_guide-timestamp
@@ -0,0 +1,25 @@
+Description: Hardcode last-change date in user manual
+Author: Thibaut Paumard
+Origin: upstream
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=797518
+Applied-Upstream: 67dc38bcaba46606f51fc62ecda177093d643603
+Last-Update: 2016-02-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/doc/user_guide/GyotoManual.tex b/doc/user_guide/GyotoManual.tex
+index c774735..af1b294 100644
+--- a/doc/user_guide/GyotoManual.tex
++++ b/doc/user_guide/GyotoManual.tex
+@@ -58,8 +58,10 @@
+ 
+ \vspace{0.5cm}
+ 
+-\Large{Updated}
+-\today
++% Let's enter the date manually.  Need to update it at least for each
++% release. Use git log to find out the last change to the user manual.
++\Large{Updated June 22, 2015}
++%\today
+ 
+ \vspace{4cm}
+ 
diff --git a/yorick/gyotoy.i b/yorick/gyotoy.i
index 42db451..7e225a3 100644
--- a/yorick/gyotoy.i
+++ b/yorick/gyotoy.i
@@ -1,4 +1,4 @@
-#!/usr/bin/yorick -i
+#!/usr/bin/env yorick -i
 /*
     Copyright 2007 F. Rigaut
     Copyright 2011-2015 Thibaut Paumard

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git