[gnuplot] 01/02: Merge.
Anton Gladky
gladk at moszumanska.debian.org
Tue Nov 4 22:57:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch wheezy-backports
in repository gnuplot.
commit 86818efbc88e965b7e339a4e125809043f7ae5c7
Merge: 8febcfd 7e934d9
Author: Anton Gladky <gladk at debian.org>
Date: Tue Nov 4 21:15:20 2014 +0100
Merge.
ChangeLog | 618 ++++++++++++++++++++-
FAQ.pdf | Bin 220365 -> 168035 bytes
Makefile.am | 2 +-
Makefile.in | 2 +-
NEWS | 62 ++-
PATCHLEVEL | 2 +-
RELEASE_NOTES | 177 ++++++
config/config.mgw | 29 +-
config/config.nt | 27 +-
config/mingw/Makefile | 14 +-
configure.in | 31 +-
debian/NEWS | 27 +
debian/changelog | 96 ++++
debian/control | 97 +++-
debian/copyright | 86 +++
debian/gnuplot-data.install | 2 +
debian/{gnuplot-nox.links => gnuplot-data.links} | 0
debian/gnuplot-nox.install | 4 +-
debian/gnuplot-nox.manpages | 2 +-
debian/gnuplot-nox.menu | 2 +-
debian/gnuplot-nox.postinst | 31 +-
debian/gnuplot-nox.postrm | 26 -
debian/gnuplot-nox.prerm | 10 +
debian/gnuplot-qt.install | 5 +-
debian/gnuplot-qt.links | 1 -
debian/gnuplot-qt.manpages | 2 +-
debian/gnuplot-qt.menu | 2 +-
debian/gnuplot-qt.postinst | 31 +-
debian/gnuplot-qt.postrm | 26 -
debian/gnuplot-qt.prerm | 10 +
debian/gnuplot-tex.install | 1 +
debian/gnuplot-x11.install | 5 +-
debian/gnuplot-x11.links | 1 -
debian/gnuplot-x11.manpages | 2 +-
debian/gnuplot-x11.menu | 2 +-
debian/gnuplot-x11.postinst | 31 +-
debian/gnuplot-x11.postrm | 26 -
debian/gnuplot-x11.prerm | 16 +-
debian/gnuplot.preinst | 12 -
debian/patches/04_fix_libexecdir.diff | 8 +-
debian/patches/05_default_gd_font.diff | 8 +-
debian/patches/08_do_not_set_qt_default_term.patch | 26 -
debian/patches/09_force_texinfo.patch | 10 +-
debian/patches/series | 1 -
debian/rules | 61 +-
debian/source/local-options | 1 -
debian/tests/control | 2 +
debian/tests/testgnuplot | 19 +
demo/Makefile.am | 8 +-
demo/Makefile.in | 8 +-
demo/clipobject.dem | 79 +++
demo/datastrings.dem | 6 +-
demo/timedat.dem | 24 +-
docs/Makefile.in | 2 +-
docs/gnuplot-ja.doc | 132 +++--
docs/gnuplot.doc | 155 +++++-
docs/gnuplot.pdf | Bin 1577735 -> 1592982 bytes
docs/gnuplot.texi | 209 +++++--
docs/pdffigures.tex | 1 -
docs/term-ja.diff | 489 ++++++++--------
docs/titlepag.tex | 13 +-
src/Makefile.am | 2 +-
src/axis.c | 5 +-
src/bitmap.c | 54 +-
src/color.h | 5 +-
src/command.c | 20 +-
src/datafile.c | 167 +++---
src/datafile.h | 10 +-
src/eval.c | 3 +-
src/fit.c | 69 ++-
src/fit.h | 3 +-
src/gadgets.c | 15 +-
src/gadgets.h | 17 +-
src/getcolor.c | 45 +-
src/gp_types.h | 6 +-
src/graph3d.c | 22 +-
src/graphics.c | 167 ++++--
src/graphics.h | 4 +-
src/hidden3d.c | 3 +-
src/internal.c | 25 +-
src/interpol.c | 149 ++++-
src/interpol.h | 4 +-
src/misc.c | 18 +-
src/mouse.c | 49 +-
src/parse.c | 69 ++-
src/plot.c | 55 +-
src/plot2d.c | 75 ++-
src/plot3d.c | 14 +-
src/pm3d.c | 20 +-
src/qtterminal/QtGnuplotScene.cpp | 20 +-
src/qtterminal/QtGnuplotWindow.cpp | 6 +
src/qtterminal/QtGnuplotWindow.h | 1 +
src/qtterminal/qt_term.cpp | 41 +-
src/readline.c | 43 +-
src/save.c | 55 +-
src/set.c | 201 +++++--
src/show.c | 16 +-
src/syscfg.h | 8 +-
src/tables.c | 4 +-
src/term.c | 8 +-
src/time.c | 4 +-
src/unset.c | 5 +-
src/util.c | 10 +-
src/version.c | 8 +-
src/win/wcommon.h | 4 +-
src/win/wgnuplot.exe.manifest64 | 22 +
src/win/wgnuplot.rc | 10 +-
src/win/wgraph.c | 118 ++--
src/win/winmain.c | 80 +--
src/win/winmain.h | 4 +-
src/win/wmenu.c | 71 +--
src/win/wpause.c | 26 +-
src/win/wprinter.c | 25 +-
src/win/wtext.c | 32 +-
src/wxterminal/gp_cairo.c | 8 +-
src/wxterminal/wxt_gui.cpp | 35 +-
src/wxterminal/wxt_gui.h | 11 +-
term/cairo.trm | 7 +-
term/emf.trm | 97 +++-
term/gd.trm | 3 +-
term/js/gnuplot_svg.js | 12 +-
term/pdf.trm | 9 +-
term/post.trm | 6 +-
term/svg.trm | 14 +-
term/tek.trm | 609 +++++++++++++++++++-
term/win.trm | 6 +-
win/README-Windows-ja.txt | 4 +-
win/README-Windows.txt | 14 +-
win/gnuplot.iss | 10 +-
129 files changed, 4158 insertions(+), 1386 deletions(-)
diff --cc debian/changelog
index a7802d7,3112a8b..b30ce35
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,99 +1,106 @@@
+ gnuplot (4.6.6-1) unstable; urgency=medium
+
+ * [5b5e9cd] Imported Upstream version 4.6.6
+ * [0a383da] Refresh patches.
+ * [006e379] Set Standards-Version: 3.9.6. No changes.
+ * [cc0778a] Fix lintian warning in d/copyright.
+
+ -- Anton Gladky <gladk at debian.org> Mon, 29 Sep 2014 19:33:35 +0200
+
+ gnuplot (4.6.5-10) unstable; urgency=medium
+
+ * [684bb08] Depend on the same version of gnuplot-data as a source-version.
+ * [2e069b9] Fix package name in autopkgtest.
+ * [6aae61e] Simplify and update autotest. (Closes: #756156)
+ * [dfdd105] Provide -x11 by -qt. (Closes: #756163)
+
+ -- Anton Gladky <gladk at debian.org> Fri, 01 Aug 2014 19:48:33 +0200
+
+ gnuplot (4.6.5-9) unstable; urgency=medium
+
+ * [754170b] Update version number in Breaks/Replaces. (Closes: #754890)
+ * [3859306] Add missing entries into d./copyright. (Closes: #754872)
+
+ -- Anton Gladky <gladk at debian.org> Tue, 15 Jul 2014 18:58:51 +0200
+
+ gnuplot (4.6.5-8) unstable; urgency=medium
+
+ * [27a6ce3] Add gnuplot-data and move there all arch-independent files.
+ Prevemts circular dependencies. (Closes: #754598)
+ * [5db8c84] Provide by -x11 and -qt the binary gnuplot-nox.
+ (Closes: #754603)
+
+ -- Anton Gladky <gladk at debian.org> Sun, 13 Jul 2014 14:53:47 +0200
+
+ gnuplot (4.6.5-7) unstable; urgency=medium
+
+ * [716ff2d] Update autopkgtest.
+ * [f8828aa] Provide gnuplot4 symlink through update-alternatives
+ * [b5b3c3b] Do not let install -nox together with -x11 or -qt.
+
+ -- Anton Gladky <gladk at debian.org> Sat, 12 Jul 2014 10:46:21 +0200
+
+ gnuplot (4.6.5-6) unstable; urgency=medium
+
+ * [87404d3] Add breaks/replaces construction for gnuplot. (Closes: #754162)
+
+ -- Anton Gladky <gladk at debian.org> Tue, 08 Jul 2014 19:54:12 +0200
+
+ gnuplot (4.6.5-5) unstable; urgency=medium
+
+ * [414feb8] Remove old postinst, postrm and prerm scripts.
+ * [840441d] Do not override autoclean
+ * [43aac33] Rename binaries from gnuplot to gnuplot4-*.
+ * [e065af5], [893f8be] Use update-alternatives to provide gnuplot.
+ * [5829104] Move texmf-files into gnuplot-tex.
+
+ -- Anton Gladky <gladk at debian.org> Tue, 24 Jun 2014 23:51:18 +0200
+
+ gnuplot (4.6.5-4) unstable; urgency=medium
+
+ * [4d67729] Disable wxt-terminal. (Closes: #750045)
+ * [7342432] Increase priority of gnuplot-qt over gnuplot-x11.
+
+ -- Anton Gladky <gladk at debian.org> Wed, 04 Jun 2014 22:51:42 +0200
+
+ gnuplot (4.6.5-3) unstable; urgency=medium
+
+ * [5aef72d] Fix typo in control-file. (Closes: #749820)
+
+ -- Anton Gladky <gladk at debian.org> Fri, 30 May 2014 07:40:33 +0200
+
+ gnuplot (4.6.5-2) unstable; urgency=medium
+
+ [ Olly Betts ]
+ * [cd3b9ce] Update to use wxwidgets3.0. (Closes: #741072)
+
+ [ Anton Gladky ]
+ * [10a8dbc] Set the default gnuplot binary to gnuplot-x11. (Closes: #741073)
+ * [aef3b6a] Fix manpage for gnuplot-nox. (Closes: #744218)
+ * [dfd3a27] Add autopkgtests.
+
+ -- Anton Gladky <gladk at debian.org> Thu, 29 May 2014 18:17:09 +0200
+
+ gnuplot (4.6.5-1) unstable; urgency=medium
+
+ * [aec9b9b] Imported Upstream version 4.6.5
+
+ -- Anton Gladky <gladk at debian.org> Fri, 28 Feb 2014 23:20:14 +0100
+
+ gnuplot (4.6.4-2) unstable; urgency=medium
+
+ * [67fb69c] Add texlive-fonts-recommended to Build-Depends. (Closes: #738212)
+ * [bf524ce] Set Standards-Version: 3.9.5. No changes.
+
+ -- Anton Gladky <gladk at debian.org> Sat, 08 Feb 2014 20:44:33 +0100
+
+gnuplot (4.6.4-1~bpo70+1) wheezy-backports; urgency=low
+
+ * Rebuild for wheezy-backports.
+ * Replace libgd2-dev by libgd2-noxpm-dev in BD.
+
+ -- Anton Gladky <gladk at debian.org> Wed, 23 Oct 2013 22:12:28 +0200
+
gnuplot (4.6.4-1) unstable; urgency=low
* [9fbd2a7] Add python-gnuplot, feedgnuplot, libgnuplot-iostream-dev
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gnuplot.git
More information about the debian-science-commits
mailing list