[gnuplot5] 01/02: Merge.

Anton Gladky gladk at moszumanska.debian.org
Thu Jul 16 19:54:41 UTC 2015


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

gladk pushed a commit to branch jessie-backports
in repository gnuplot5.

commit 52cc9f4d410d4d835f486bd58e7a8bd9444d0764
Merge: 517a642 b31926d
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Jul 16 22:29:48 2015 +0300

    Merge.

 ChangeLog                                   | 555 +++++++++++++++++++++++++-
 Makefile.maint                              |   1 -
 NEWS                                        |  45 +++
 PATCHLEVEL                                  |   2 +-
 RELEASE_NOTES                               | 104 +++--
 compile                                     |   0
 config.hin                                  |   2 +-
 configure                                   |  52 +--
 configure.in                                |  18 +-
 configure.vms                               |   4 +-
 debian/changelog                            |  16 +
 debian/control                              |   3 +-
 debian/patches/04_fix_libexecdir.diff       |   8 +-
 debian/patches/05_default_gd_font.diff      |  10 +-
 debian/patches/07_doc.patch                 |  10 +-
 debian/patches/08_disable_demo_plugin.patch |  58 ++-
 debian/patches/09_remove_beos.patch         |  18 +-
 debian/patches/10_removepicins.patch        |  32 +-
 debian/patches/11_fix_linkage_wx.patch      |   8 +-
 debian/patches/12_info.patch                |  91 +++++
 debian/patches/series                       |   1 +
 debian/rules                                |   5 +-
 debian/watch                                |   2 +-
 demo/Makefile.am                            |  47 ++-
 demo/Makefile.am.in                         |   2 +-
 demo/Makefile.in                            |  47 ++-
 demo/ellipses_style.dem                     |   6 +-
 demo/heatmaps.dem                           |   2 +-
 demo/html/Makefile                          |  20 +-
 demo/layout.dem                             |   2 +-
 demo/matrix_index.dem                       |  43 ++
 demo/plugin/Makefile                        | 594 ----------------------------
 demo/plugin/Makefile.am                     |   4 +-
 demo/plugin/Makefile.in                     |   3 +-
 demo/timedat.dat                            |   1 +
 docs/Makefile.am                            |  12 +-
 docs/Makefile.in                            |  12 +-
 docs/gnuplot.doc                            | 154 ++++++--
 docs/titlepag.tex                           |   4 +-
 m4/apple.m4                                 |   6 +-
 src/axis.c                                  |  17 +-
 src/axis.h                                  |   3 +-
 src/boundary.c                              |  53 ++-
 src/color.c                                 |   9 +-
 src/command.c                               | 111 +++++-
 src/command.h                               |   3 +-
 src/datafile.c                              |  46 ++-
 src/dynarray.c                              |   4 +-
 src/fit.c                                   | 105 ++---
 src/fit.h                                   |   3 +-
 src/gadgets.c                               |  25 +-
 src/gadgets.h                               |   9 +-
 src/graph3d.c                               |  40 +-
 src/graphics.c                              | 181 +++++----
 src/graphics.h                              |   6 +-
 src/hidden3d.c                              |  18 +-
 src/interpol.c                              | 106 ++---
 src/misc.c                                  |  90 +++--
 src/mouse.c                                 |   6 +-
 src/multiplot.c                             | 151 +++++--
 src/plot2d.c                                |  87 ++--
 src/qtterminal/QtGnuplotEvent.cpp           |  13 +-
 src/qtterminal/QtGnuplotItems.cpp           |   2 +-
 src/qtterminal/QtGnuplotScene.cpp           |  12 +-
 src/qtterminal/qt_term.cpp                  |   2 +-
 src/save.c                                  |  93 ++---
 src/set.c                                   |  77 +++-
 src/setshow.h                               |   3 +-
 src/show.c                                  |  58 +--
 src/stats.c                                 |  99 ++---
 src/tables.c                                |  10 +-
 src/tables.h                                |   6 +-
 src/tabulate.c                              |  11 +-
 src/term.c                                  |  97 ++++-
 src/term_api.h                              |  14 +-
 src/time.c                                  |  47 ++-
 src/unset.c                                 |  24 +-
 src/util.c                                  |  27 +-
 src/util3d.c                                |  21 +-
 src/version.c                               |   6 +-
 src/wxterminal/gp_cairo.c                   |   8 +-
 src/wxterminal/wxt_gui.cpp                  |  12 +-
 term/aquaterm.trm                           |   4 +-
 term/caca.trm                               |   8 +-
 term/cairo.trm                              |  11 +-
 term/emf.trm                                |   9 +-
 term/estimate.trm                           |  20 +-
 term/fig.trm                                | 110 +++++-
 term/gd.trm                                 |  50 ++-
 term/pslatex.trm                            |   4 +-
 term/tek.trm                                | 294 ++++++++++----
 term/tkcanvas.trm                           |  48 ++-
 term/x11.trm                                |  13 +-
 93 files changed, 2688 insertions(+), 1602 deletions(-)

diff --cc debian/changelog
index 4821509,89a6fb9..f6a67f7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,25 @@@
+ gnuplot5 (5.0.1+dfsg1-2) unstable; urgency=medium
+ 
+   [ Vincent Lefevre ]
+   * Team upload.
+   * [1171a98] Provide info manual. (Closes: #778757)
+ 
+  -- Anton Gladky <gladk at debian.org>  Mon, 29 Jun 2015 23:36:42 +0200
+ 
+ gnuplot5 (5.0.1+dfsg1-1) unstable; urgency=medium
+ 
+   * [c0fd77e] Imported Upstream version 5.0.1+dfsg
+   * [be6c05e] Add suffix to uscan tarball.
+   * [47f23a2] Refresh patches.
+ 
+  -- Anton Gladky <gladk at debian.org>  Wed, 17 Jun 2015 17:54:45 +0200
+ 
 +gnuplot5 (5.0.0+dfsg1-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Anton Gladky <gladk at debian.org>  Wed, 06 May 2015 22:12:07 +0200
 +
  gnuplot5 (5.0.0+dfsg1-1) unstable; urgency=medium
  
    * [6654139] Update description of doc.patch.

-- 
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