diff -Nru gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/changelog gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/changelog
--- gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/changelog	2016-10-26 21:51:18.000000000 +0000
+++ gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/changelog	2016-12-30 10:52:16.000000000 +0000
@@ -1,3 +1,18 @@
+gnuplot-iostream (0~20140302.gitc8919a0+dfsg-3ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Allow stderr in the autopkg tests; now having some deprecation warnings during
+      the build.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 30 Dec 2016 11:51:56 +0100
+
+gnuplot-iostream (0~20140302.gitc8919a0+dfsg-3) unstable; urgency=medium
+
+  * [3bd2423] Drop blitz from build-depends. (Closes: #845046)
+  * [974d177] Apply cme fix dpkg.
+
+ -- Anton Gladky <gladk@debian.org>  Thu, 29 Dec 2016 18:43:23 +0100
+
 gnuplot-iostream (0~20140302.gitc8919a0+dfsg-2ubuntu2) zesty; urgency=medium
 
   * Rebuild against new libarmadillo7.
diff -Nru gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/control gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/control
--- gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/control	2014-09-06 15:31:13.000000000 +0000
+++ gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/control	2016-12-29 21:45:56.000000000 +0000
@@ -1,33 +1,28 @@
 Source: gnuplot-iostream
+Maintainer: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
+Uploaders: Anton Gladky <gladk@debian.org>
 Section: libdevel
+Testsuite: autopkgtest
 Priority: optional
-Maintainer: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
-Uploaders:
- Anton Gladky <gladk@debian.org>
-Standards-Version: 3.9.5
-Build-Depends:
- debhelper (>= 9),
- gnuplot,
- libarmadillo-dev,
- libblitz-dev,
- libboost-filesystem-dev,
- libboost-iostreams-dev,
- libboost-system-dev
+Build-Depends: debhelper (>= 9),
+               gnuplot,
+               libarmadillo-dev,
+               libboost-filesystem-dev,
+               libboost-iostreams-dev,
+               libboost-system-dev
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/gnuplot-iostream.git
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/gnuplot-iostream.git
 Homepage: http://www.stahlke.org/dan/gnuplot-iostream/
-XS-Testsuite: autopkgtest
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/gnuplot-iostream.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/gnuplot-iostream.git
 
 Package: libgnuplot-iostream-dev
 Architecture: all
-Depends:
- gnuplot,
- libboost-filesystem-dev,
- libboost-iostreams-dev,
- libboost-system-dev,
- ${misc:Depends}
-Suggests:
- gnuplot-iostream-doc
+Depends: gnuplot,
+         libboost-filesystem-dev,
+         libboost-iostreams-dev,
+         libboost-system-dev,
+         ${misc:Depends}
+Suggests: gnuplot-iostream-doc
 Description: C++ programming interface for gnuplot. Headers
  This interface allows gnuplot to be controlled from C++ and is designed to be
  the lowest hanging fruit. In other words, if you know how gnuplot works it
@@ -46,12 +41,9 @@
 Package: libgnuplot-iostream-doc
 Architecture: all
 Section: doc
-Depends:
- ${misc:Depends}
-Suggests:
- cmake,
- gnuplot-iostream,
- libblitz0-dev
+Depends: ${misc:Depends}
+Suggests: cmake,
+          gnuplot-iostream
 Description: C++ programming interface for gnuplot. Docs and examples
  This interface allows gnuplot to be controlled from C++ and is designed to be
  the lowest hanging fruit. In other words, if you know how gnuplot works it
diff -Nru gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/copyright gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/copyright
--- gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/copyright	2014-09-06 09:04:08.000000000 +0000
+++ gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/copyright	2016-12-29 21:45:57.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: http://www.stahlke.org/dan/gnuplot-iostream/
 
 Files: *
diff -Nru gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/patches/enable_some_more_tests.patch gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/patches/enable_some_more_tests.patch
--- gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/patches/enable_some_more_tests.patch	2014-09-06 15:32:12.000000000 +0000
+++ gnuplot-iostream-0~20140302.gitc8919a0+dfsg/debian/patches/enable_some_more_tests.patch	2016-12-29 21:45:57.000000000 +0000
@@ -18,7 +18,7 @@
  # This makes the examples and tests more complete, but only works if you have the corresponding
  # libraries installed.
 -#CXXFLAGS+=--std=c++11 -DUSE_ARMA=1 -DUSE_BLITZ=1
-+CXXFLAGS+=--std=c++11 -DUSE_ARMA=1 -DUSE_BLITZ=1
++CXXFLAGS+=--std=c++11 -DUSE_ARMA=1
  
  ALL_EXAMPLES=example-misc example-data-1d example-data-2d example-interactive
  TEST_BINARIES=test-noncopyable test-outputs