[gnuplot5] 01/02: Merge.
Anton Gladky
gladk at moszumanska.debian.org
Fri Feb 19 22:26:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch jessie-backports
in repository gnuplot5.
commit 489697af23ec1e8f25d81b535fee8c85721b8f11
Merge: 46d47fc 546f2ab
Author: Anton Gladky <gladk at debian.org>
Date: Fri Feb 19 20:42:57 2016 +0100
Merge.
ChangeLog | 625 ++++++
Makefile.in | 6 +-
NEWS | 54 +-
PATCHLEVEL | 2 +-
RELEASE_NOTES | 83 +-
aclocal.m4 | 6 +-
config/Makefile.in | 3 +-
configure | 66 +-
configure.in | 7 +-
debian/changelog | 45 +
debian/control | 5 +-
debian/copyright | 78 +-
debian/patches/04_fix_libexecdir.diff | 6 +-
debian/patches/05_default_gd_font.diff | 6 +-
debian/patches/07_doc.patch | 14 +-
debian/patches/08_disable_demo_plugin.patch | 22 +-
debian/patches/09_remove_beos.patch | 18 +-
debian/patches/10_removepicins.patch | 37 +-
debian/patches/11_fix_linkage_wx.patch | 8 +-
debian/patches/12_info.patch | 53 +-
debian/patches/15_fix_format_not_a_string.patch | 188 ++
debian/patches/series | 1 +
debian/rules | 5 +-
demo/Makefile.in | 3 +-
demo/html/webify.pl | 2 +-
demo/imageNaN.dem | 12 +-
demo/iterate.dem | 16 +
demo/plugin/Makefile.in | 3 +-
demo/stringvar.dem | 4 +-
demo/timedat.dem | 4 +-
docs/Makefile.am | 315 +--
docs/Makefile.in | 316 +--
docs/doc2ms.c | 33 +-
docs/gnuplot-ja.doc | 4 +-
docs/gnuplot.doc | 145 +-
docs/psdoc/ps_symbols.gpi | 154 +-
docs/titlepag.tex | 4 +-
docs/windows/doc2html.c | 3 +-
m4/Makefile.in | 3 +-
man/Makefile.in | 3 +-
share/LaTeX/Makefile.in | 3 +-
share/LaTeX/gnuplot-lua-tikz.sty | 2 +-
share/Makefile.in | 3 +-
src/Makefile.am | 17 +-
src/Makefile.in | 106 +-
src/axis.c | 22 +-
src/axis.h | 7 +-
src/boundary.c | 10 +-
src/command.c | 104 +-
src/datablock.c | 6 +-
src/datafile.c | 135 +-
src/eval.c | 4 +-
src/fit.c | 10 +-
src/gadgets.c | 5 +-
src/gadgets.h | 7 +
src/graph3d.c | 84 +-
src/graphics.c | 250 +--
src/help.c | 14 +-
src/internal.c | 8 +-
src/interpol.c | 8 +-
src/misc.c | 12 +-
src/mouse.c | 8 +-
src/parse.c | 51 +-
src/parse.h | 3 +-
src/plot2d.c | 87 +-
src/plot3d.c | 70 +-
src/qtterminal/Makefile.in | 3 +-
src/qtterminal/QtGnuplotEvent.cpp | 2 +-
src/qtterminal/QtGnuplotItems.cpp | 7 +-
src/qtterminal/QtGnuplotScene.cpp | 43 +-
src/qtterminal/qt_term.cpp | 44 +-
src/save.c | 10 +-
src/set.c | 184 +-
src/show.c | 16 +-
src/stats.c | 13 +-
src/stdfn.h | 6 +-
src/tables.c | 4 +-
src/term.c | 50 +-
src/term_api.h | 10 +-
src/time.c | 4 +-
src/unset.c | 15 +-
src/util.c | 83 +-
src/util3d.c | 34 +-
src/util3d.h | 6 +-
src/version.c | 8 +-
src/wxterminal/Makefile.in | 3 +-
src/wxterminal/gp_cairo.c | 40 +-
src/wxterminal/wxt_gui.cpp | 73 +-
src/wxterminal/wxt_term.h | 4 +-
term/Makefile.in | 3 +-
term/PostScript/prologue.ps | 5 +-
term/PostScript/prologues.h | 25 +-
term/aquaterm.trm | 54 +-
term/cairo.trm | 27 +-
term/cgm.trm | 6 +-
term/dumb.trm | 98 +-
term/estimate.trm | 4 +-
term/gd.trm | 6 +-
term/lua.trm | 20 +-
term/lua/gnuplot-tikz.lua | 8 +-
term/post.trm | 29 +-
term/pslatex.trm | 10 +-
term/tkcanvas.trm | 2475 +++++++++++++++++++----
term/wxt.trm | 29 +-
term/x11.trm | 9 +-
tutorial/Makefile.in | 3 +-
106 files changed, 4989 insertions(+), 1882 deletions(-)
diff --cc debian/changelog
index f972f2d,d8db4b3..b866f00
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,48 +1,54 @@@
+ gnuplot5 (5.0.3+dfsg1-2) unstable; urgency=medium
+
+ * [5b904ca] Revert previous "provides-option". (Closes: #814415)
+
+ -- Anton Gladky <gladk at debian.org> Fri, 12 Feb 2016 20:25:36 +0100
+
+ gnuplot5 (5.0.3+dfsg1-1) unstable; urgency=medium
+
+ * [4b3a3ce] Imported Upstream version 5.0.3+dfsg1
+ * [8767584] Update patches.
+ * [1bcf48b] Fix format not a string error.
+ * [0e4ff3f] Apply cme fix dpkg.
+ * [6a42bd9] Add Provides-section for gnuplot4. Prepare for gnuplot4 removal.
+
+ -- Anton Gladky <gladk at debian.org> Mon, 08 Feb 2016 13:30:56 +0100
+
+ gnuplot5 (5.0.2+dfsg1-2) unstable; urgency=medium
+
+ * [7bb549d] Fix font size on wxt-terminal. (Closes: #810943)
+ * [5a638de] Update d/copyright.
+
+ -- Anton Gladky <gladk at debian.org> Mon, 18 Jan 2016 09:08:36 +0100
+
+ gnuplot5 (5.0.2+dfsg1-1) unstable; urgency=medium
+
+ * [d183a84] Remove so-files from d/copyright (fixed by upstream)
+ * [9a496d5] Imported Upstream version 5.0.2+dfsg1. (Closes: #806039)
+ * [5be40e0] Refresh patches.
+ * [65d724b] Update d/copyright.
+ * [09f724d] Add dh-lua to BD.
+
+ -- Anton Gladky <gladk at debian.org> Tue, 12 Jan 2016 08:11:01 +0100
+
+ gnuplot5 (5.0.1+dfsg1-3) unstable; urgency=medium
+
+ [ Martin Pitt <martin.pitt at ubuntu.com> ]
+ * Add 13_no_pie.patch: Don't build with -fPIE, Qt barfs on that with
+ gcc >= 5. (http://code.qt.io/cgit/qt/qtbase.git/commit/?id=3eca75d)
+ (Closes: #795076)
+ * debian/rules: Also drop "pie" from hardening flags. Instead, build with
+ -fPIC; it's conceptually wrong, but it's what the above Qt check insists
+ on.
+
+ -- Anton Gladky <gladk at debian.org> Tue, 11 Aug 2015 22:07:13 +0200
+
+gnuplot5 (5.0.1+dfsg1-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Anton Gladky <gladk at debian.org> Thu, 16 Jul 2015 22:30:16 +0300
+
gnuplot5 (5.0.1+dfsg1-2) unstable; urgency=medium
[ Vincent Lefevre ]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gnuplot5.git
More information about the debian-science-commits
mailing list