diff -Nru gyoto-1.0.2/debian/changelog gyoto-1.0.2/debian/changelog
--- gyoto-1.0.2/debian/changelog	2016-01-19 00:41:16.000000000 +0000
+++ gyoto-1.0.2/debian/changelog	2016-02-12 11:52:46.000000000 +0000
@@ -1,3 +1,20 @@
+gyoto (1.0.2-2ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Rename library packages for g++5 ABI transition.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 12 Feb 2016 12:52:38 +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@debian.org>  Wed, 10 Feb 2016 11:25:37 +0100
+
 gyoto (1.0.2-1ubuntu2) xenial; urgency=medium
 
   * No-change rebuild to drop python3.4 support.
@@ -140,3 +157,4 @@
   * Initial release (Closes: #640809)
 
  -- Thibaut Paumard <paumard@users.sourceforge.net>  Fri, 22 Jun 2012 14:22:40 +0200
+
diff -Nru gyoto-1.0.2/debian/control gyoto-1.0.2/debian/control
--- gyoto-1.0.2/debian/control	2015-08-04 01:19:09.000000000 +0000
+++ gyoto-1.0.2/debian/control	2016-02-11 05:43:38.000000000 +0000
@@ -13,7 +13,7 @@
 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 -Nru gyoto-1.0.2/debian/patches/check-ld-library-path gyoto-1.0.2/debian/patches/check-ld-library-path
--- gyoto-1.0.2/debian/patches/check-ld-library-path	1970-01-01 00:00:00.000000000 +0000
+++ gyoto-1.0.2/debian/patches/check-ld-library-path	2016-02-10 22:14:28.000000000 +0000
@@ -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 -Nru gyoto-1.0.2/debian/patches/series gyoto-1.0.2/debian/patches/series
--- gyoto-1.0.2/debian/patches/series	2015-06-26 07:56:40.000000000 +0000
+++ gyoto-1.0.2/debian/patches/series	2016-02-11 05:43:38.000000000 +0000
@@ -1 +1,3 @@
 interpreter-path
+check-ld-library-path
+user_guide-timestamp
diff -Nru gyoto-1.0.2/debian/patches/user_guide-timestamp gyoto-1.0.2/debian/patches/user_guide-timestamp
--- gyoto-1.0.2/debian/patches/user_guide-timestamp	1970-01-01 00:00:00.000000000 +0000
+++ gyoto-1.0.2/debian/patches/user_guide-timestamp	2016-02-10 22:16:09.000000000 +0000
@@ -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}
+