changelog bump

These were suggested by paultag@debian.org

1. debian/changelog just has the one entry, to indicate what has changed from
the perspective of a user of this package. The old changes in that file have
never been uploaded to Debian

2. Uploading to unstable instead of experimental

3. Bumped up debhelper compat to 9

4. Removed DM-Upload-Allowed

5. Minor standards bump

Changes

@@ -1,85 +1,3 @@
-feedgnuplot (1.39)
-
-  * by default, histograms are plotted in expected ways
-
- -- Dima Kogan <dima@secretsauce.net>  Sat, 15 Oct 2016 20:45:15 -0700
-
-feedgnuplot (1.38)
-
-  * hardcopy defaults:
-   - no enhanced text mode
-   - larger font size
-
- -- Dima Kogan <dima@secretsauce.net>  Wed, 27 Jul 2016 22:15:11 -0700
-
-feedgnuplot (1.37)
-
-  * At the end of a streaming plot, include the last chunk of data
-  * Added --equation to the completions
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 01 Jan 2016 08:09:43 -0800
-
-feedgnuplot (1.36)
-
-  * Added --equation to plot symbolic equations
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 13 Nov 2015 11:08:26 -0800
-
-feedgnuplot (1.35)
-
-  * replaced a 'say' with 'print'. Should work better with ancient perls
-  * an "exit" command now has effect even with triggered-only replotting
-
-  * More sophisticated handling of termination conditions:
-    - Without --exit, we always end up with an interactive plot when the
-    input data is exhausted or when the user sends a ^C to the pipeline
-    - When streaming, the first ^C does not kill feedgnuplot
-  
-  * Removed threading
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 01 Nov 2015 12:50:33 -0800
-
-feedgnuplot (1.34)
-
-  * Fix for "Use of implicit split to @_ is deprecated". Thanks to Corey
-    Putkunz
-
-  * Declaring feedgnuplot as a package to let MetaCPAN index this
-    distribution
-
- -- Dima Kogan <dima@secretsauce.net>  Wed, 14 May 2014 00:45:24 -0700
-
-feedgnuplot (1.33)
-
-  * fixed incorrect plotting of --timefmt --rangesize plots
-
- -- Dima Kogan <dima@secretsauce.net>  Thu, 06 Feb 2014 23:17:21 -0800
-
-feedgnuplot (1.32)
-
-  * Added --rangesize and --rangesizeall. Different curves can now plot
-    different-size tuples
-
- -- Dima Kogan <dima@secretsauce.net>  Wed, 05 Feb 2014 13:57:58 -0800
-
-feedgnuplot (1.31)
-
-  * Test suite requires gawk to get strftime()
-
- -- Dima Kogan <dima@secretsauce.net>  Sat, 25 Jan 2014 20:49:38 -0800
-
-feedgnuplot (1.30)
-
-  * Added --with, --set, --unset, --style, --styleall
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 24 Jan 2014 15:38:07 -0800
-
-feedgnuplot (1.29)
-
-  * added CPAN meta-data to require IPC::Run at build time
-
- -- Dima Kogan <dima@secretsauce.net>  Wed, 04 Dec 2013 21:12:40 -0800
-
 feedgnuplot (1.28)
 
   * Minor POD update

Makefile.PL

@@ -63,8 +63,7 @@ WriteMakefile
     : ()),
    PL_FILES                   => {},
    EXE_FILES                  => [ 'bin/feedgnuplot' ],
-   BUILD_REQUIRES             => { 'String::ShellQuote' => 0,
-                                   'IPC::Run'           => 0},
+   BUILD_REQUIRES             => { 'String::ShellQuote' => 0},
    dist                       => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
    clean                      => { FILES => 'feedgnuplot-*' },
   );

completions/bash/feedgnuplot

@@ -7,20 +7,12 @@ complete -W               \
     --colormap            \
     --curvestyle          \
     --curvestyleall       \
-    --style               \
-    --styleall            \
-    --with                \
     --dataid              \
     --domain              \
     --dump                \
     --exit                \
     --extraValuesPerPoint \
-    --rangesizeall        \
-    --rangesize           \
     --extracmds           \
-    --set                 \
-    --unset               \
-    --equation            \
     --geometry            \
     --hardcopy            \
     --help                \

completions/zsh/_feedgnuplot

@@ -26,25 +26,17 @@ _arguments -S
     '--zmin:min Z:'                                                               \
     '--zmax:max Z:'                                                               \
     '*--y2:plot to place on the Y2 axis:'                                         \
-    '(--with)--curvestyleall[Additional styles for ALL curves]:style'             \
-    '(--with)--styleall[Additional styles for ALL curves]:style'                  \
-    '(--curvestyleall)--with[Additional styles for ALL curves]:style'             \
+    '--curvestyleall[Additional styles for ALL curves]:style'                     \
     '*--extracmds[Additional gnuplot commands]:command'                           \
-    '*--set[Additional 'set' gnuplot commands]:set-option'                        \
-    '*--unset[Additional 'unset' gnuplot commands]:unset-option'                  \
-    '*--equation[Raw symbolic equation]:equation'                                 \
     '--square[Plot data with square aspect ratio]'                                \
     '--square_xy[For 3D plots, set square aspect ratio for ONLY the x,y axes]'    \
     '--hardcopy[Plot to a file]:filename'                                         \
     '--maxcurves[The maximum allowed number of curves]:number of curves'          \
     '(--3d)--monotonic[Resets plot if an X in the past is seen]'                  \
-    '(--rangesizeall)--extraValuesPerPoint[How many extra values are given for each data range]:N'\
-    '(--extraValuesPerPoint)--rangesizeall[How many values are given for each data range]:N'\
-    '*--rangesize[How many values comprise a data range in this curve]:curve id: :N:' \
+    '--extraValuesPerPoint[How many extra values are given for each data point]:N'\
     '--dump[Instead of printing to gnuplot, print to STDOUT]'                     \
     '--geometry[The X11 geometry string]:geometry string:'                        \
     '*--curvestyle[Additional styles for a curve]:curve id: :style:'              \
-    '*--style[Additional styles for a curve]:curve id: :style:'                   \
     '(--3d)*--histogram:plot to treat as a histogram:'                            \
     '--binwidth:Histogram bin width:'                                             \
     '--histstyle:Style of histogram:(frequency unique cumulative cnormal)'        \

debian/changelog

@@ -0,0 +1,51 @@
+feedgnuplot (1.28-1) unstable; urgency=low
+
+  * Upstream update:
+    - Removed example debianization
+    - Removed unreliable unit tests from automated testing (Closes: #731080)
+  * gnuplot dependency now favors graphical gnuplot packages
+  * Removed Anton Gladky from the Uploaders
+
+ -- Dima Kogan <dima@secretsauce.net>  Wed, 04 Dec 2013 02:05:08 -0800
+
+feedgnuplot (1.26-1) unstable; urgency=low
+
+  [ Dima Kogan ]
+  * Minor POD update
+  * Added test suite
+  * Added initial support for --timefmt. Currently time/date data is
+    supported only at the x-axis domain
+  * Added --exit option for force feedgnuplot to return even if gnuplot
+    may not yet be done rendering (patch by Eric Schulte)
+  * Reformatted the documentation
+  * y2-axis curves no longer have a thicker line by default
+  * --hardcopy now handles piped output (gnuplot 'set output |process'
+    syntax)
+
+  [ Anton Gladky ]
+  * Add libipc-run-perl to Build-Depends to execute tests
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 20 Oct 2013 01:19:51 -0700
+
+feedgnuplot (1.24-2) unstable; urgency=low
+
+  * Now building the html documentation from the correct POD source
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 28 Apr 2013 17:42:52 -0700
+
+feedgnuplot (1.24-1) unstable; urgency=low
+
+  * Fixed regression in --monotonic. This works again now
+  * moved POD back into the main source file. This fixes the broken usage
+    messages
+  * added --version
+  * fixed watchfile to work with newer github pages
+  * priority now optional
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 08 Feb 2013 02:01:32 -0800
+
+feedgnuplot (1.23-2) unstable; urgency=low
+
+  * Initial Debian release (Closes: #686413)
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 30 Oct 2012 11:14:01 -0700

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,19 @@
+Source: feedgnuplot
+Section: science
+Priority: optional
+Build-Depends: debhelper (>= 9), libstring-shellquote-perl, perl, gawk, gnuplot, libipc-run-perl
+Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
+Uploaders: Dima Kogan <dima@secretsauce.net>
+Standards-Version: 3.9.4
+Homepage: https://github.com/dkogan/feedgnuplot
+Vcs-Git: git://git.debian.org/git/debian-science/packages/feedgnuplot.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/feedgnuplot.git
+
+Package: feedgnuplot
+Architecture: all
+Depends: ${misc:Depends}, ${perl:Depends}, gnuplot-qt | gnuplot-x11 | gnuplot
+Description: Pipe-oriented frontend to Gnuplot
+ Flexible, command-line-oriented frontend to Gnuplot. Creates plots from data
+ coming in on STDIN or given in a filename passed on the commandline. Various
+ data representations are supported, as is hardcopy output and streaming display
+ of live data.

debian/copyright

@@ -0,0 +1,24 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://github.com/dkogan/feedgnuplot
+Upstream-Contact: Dima Kogan, <dima@secretsauce.net>
+Upstream-Name: feedgnuplot
+
+Files: *
+Copyright: 2011, Dima Kogan <dima@secretsauce.net>
+License: Artistic or GPL-1+
+
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'.
+
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian GNU/Linux systems, the complete text of version 1 of the
+ General Public License can be found in `/usr/share/common-licenses/GPL-1'.

debian/feedgnuplot.doc-base

@@ -0,0 +1,9 @@
+Document: feedgnuplot
+Title: Feedgnuplot Manual
+Author: Dima Kogan
+Abstract: Formatted manpage for feedgnuplot
+Section: Science/Data Analysis
+
+Format: HTML
+Index: /usr/share/doc/feedgnuplot/feedgnuplot.html
+Files: /usr/share/doc/feedgnuplot/feedgnuplot.html

debian/feedgnuplot.docs

@@ -0,0 +1 @@
+feedgnuplot.html

debian/feedgnuplot.install

@@ -0,0 +1,2 @@
+completions/bash/feedgnuplot /etc/bash_completion.d/
+completions/zsh/_feedgnuplot /usr/share/zsh/vendor-completions

debian/gbp.conf

@@ -0,0 +1,4 @@
+[DEFAULT]
+debian-branch = debian
+upstream-tag = v%(version)s
+pristine-tar = True

debian/rules

@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+override_dh_auto_build:
+	dh_auto_build
+	pod2html --title=feedgnuplot bin/feedgnuplot > feedgnuplot.html
+
+override_dh_auto_clean:
+	rm -rf feedgnuplot.html pod2htm*
+	dh_auto_clean

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/watch

@@ -0,0 +1,4 @@
+version=3
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
+https://github.com/dkogan/feedgnuplot/tags .*/v?(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+# Bart Martens <bartm@debian.org>  Sat, 22 Dec 2012 12:54:18 +0000

feedgnuplot.spec

@@ -1,58 +0,0 @@
-# Sample spec file for rpm-based systems. Debian-based systems already have this
-# packaged, so we do not ship those here
-
-Name:           feedgnuplot
-Version:        1.38
-Release:        1%{?dist}
-Summary:        Pipe-oriented frontend to Gnuplot
-BuildArch:      noarch
-
-License:        Artistic or GPL-1+
-URL:            https://www.github.com/dkogan/feedgnuplot/
-Source0:        https://www.github.com/dkogan/feedgnuplot/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-
-BuildRequires:  /usr/bin/pod2html
-BuildRequires:  perl-String-ShellQuote
-BuildRequires:  perl-ExtUtils-MakeMaker
-BuildRequires:  perl
-BuildRequires:  gawk
-BuildRequires:  gnuplot
-BuildRequires:  perl-IPC-Run
-
-Requires:       gnuplot
-
-%description
-Flexible, command-line-oriented frontend to Gnuplot. Creates plots from data
-coming in on STDIN or given in a filename passed on the commandline. Various
-data representations are supported, as is hardcopy output and streaming display
-of live data.
-
-%prep
-%setup -q
-
-%build
-perl Makefile.PL INSTALLDIRS=vendor
-make
-pod2html --title=feedgnuplot bin/feedgnuplot > feedgnuplot.html
-
-%install
-make install DESTDIR=%{buildroot} PREFIX=/usr
-
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
-cp Changes LICENSE feedgnuplot.html %{buildroot}%{_defaultdocdir}/%{name}
-
-mkdir -p %{buildroot}%{_datadir}/zsh/site-functions
-cp completions/zsh/* %{buildroot}%{_datadir}/zsh/site-functions
-
-mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
-cp completions/bash/* %{buildroot}%{_datadir}/bash-completion/completions
-
-rm -rf %{buildroot}/usr/lib64
-
-
-%files
-%{_bindir}/*
-%{_datadir}/zsh/*
-%{_datadir}/bash-completion/*
-%doc %{_defaultdocdir}/%{name}/*
-%doc %{_mandir}

t/plots.t

@@ -17,20 +17,14 @@ BEGIN {
     exit(0);
   }
 
-  my $gawkversion = `gawk -V`;
-  if( !$gawkversion || $@ )
-  {
-    print("1..0 # Skip: gawk is required for strftime() in the test suite. Skipping tests.\n");
-    exit(0);
-  }
-
-  my $gnuplotVersion = `gnuplot --version`;
-  if( !$gnuplotVersion || $@)
+  open(my $pipe, 'gnuplot --version |');
+  if( !$pipe )
   {
     print("1..0 # Skip: gnuplot not installed. Tests require ver. 4.6.4; feedgnuplot works with any.\n");
     exit(0);
   }
 
+  my $gnuplotVersion = <$pipe>;
   chomp $gnuplotVersion;
   if ($gnuplotVersion ne "gnuplot 4.6 patchlevel 4")
   {
@@ -39,7 +33,7 @@ BEGIN {
   }
 }
 
-use Test::More tests => 58;
+use Test::More tests => 52;
 use File::Temp 'tempfile';
 use IPC::Run 'run';
 use String::ShellQuote;
@@ -326,7 +320,7 @@ tryplot( testname => 'basic line plot with bounds, square aspect ratio',
 EOF
 
 tryplot( testname => 'lines on both axes with labels, legends, titles',
-         cmd      => q{seq 5 | gawk '{print 2*$1, $1*$1}'},
+         cmd      => q{seq 5 | awk '{print 2*$1, $1*$1}'},
          options  => [qw(--lines --points),
                       '--legend', '0', 'data 0',
                       '--title', "Test plot",
@@ -375,7 +369,7 @@ tryplot( testname => 'lines on both axes with labels, legends, titles',
 EOF
 
 tryplot( testname => 'lines on both axes with labels, legends, titles; different styles',
-         cmd      => q{seq 5 | gawk '{print 2*$1, $1*$1}'},
+         cmd      => q{seq 5 | awk '{print 2*$1, $1*$1}'},
          options  => ['--legend', '0', 'data 0',
                       '--title', "Test plot",
                       qw(--y2 1 --y2label y2 --xlabel x --ylabel y --y2max 30),
@@ -425,7 +419,7 @@ tryplot( testname => 'lines on both axes with labels, legends, titles; different
 EOF
 
 tryplot( testname => 'domain plot',
-         cmd      => q{seq 5 | gawk '{print 2*$1, $1*$1}'},
+         cmd      => q{seq 5 | awk '{print 2*$1, $1*$1}'},
          options  => [qw(--lines --points), '--domain'],
          refplot  => <<'EOF' );
 
@@ -471,7 +465,7 @@ tryplot( testname => 'domain plot',
 EOF
 
 tryplot( testname => 'dataid plot',
-         cmd      => q{seq 5 | gawk '{print 2*$1, $1*$1}'},
+         cmd      => q{seq 5 | awk '{print 2*$1, $1*$1}'},
          options  => [qw(--lines --points),
                       qw(--dataid --autolegend)],
          refplot  => <<'EOF' );
@@ -518,7 +512,7 @@ tryplot( testname => 'dataid plot',
 EOF
 
 tryplot( testname => '3d spiral with bounds, labels',
-         cmd      => q{seq 50 | gawk '{print 2*cos($1/5), sin($1/5), $1}'},
+         cmd      => q{seq 50 | awk '{print 2*cos($1/5), sin($1/5), $1}'},
          options  => [qw(--lines --points),
                       qw(--3d --domain --zmin -5 --zmax 45 --zlabel z),
                      '--extracmds', 'set view 60,30'],
@@ -566,7 +560,7 @@ tryplot( testname => '3d spiral with bounds, labels',
 EOF
 
 tryplot( testname => '3d spiral with bounds, labels, square xy aspect ratio',
-         cmd      => q{seq 50 | gawk '{print 2*cos($1/5), sin($1/5), $1}'},
+         cmd      => q{seq 50 | awk '{print 2*cos($1/5), sin($1/5), $1}'},
          options  => [qw(--lines --points),
                       qw(--3d --domain --zmin -5 --zmax 45 --zlabel z),
                      '--extracmds', 'set view 60,30', '--square_xy'],
@@ -614,7 +608,7 @@ tryplot( testname => '3d spiral with bounds, labels, square xy aspect ratio',
 EOF
 
 tryplot( testname => 'Monotonicity check',
-         cmd      => q{seq 10 | gawk '{print (NR-1)%5,NR}'},
+         cmd      => q{seq 10 | awk '{print (NR-1)%5,NR}'},
          options  => [qw(--lines --points --domain --monotonic)],
          refplot  => <<'EOF' );
 
@@ -661,7 +655,7 @@ EOF
 
 
 tryplot( testname => 'basic --timefmt plot',
-         cmd      => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1}'},
+         cmd      => q{seq 5 | awk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1}'},
          options  => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S'],
          refplot  => <<'EOF' );
 
@@ -707,7 +701,7 @@ tryplot( testname => 'basic --timefmt plot',
 EOF
 
 tryplot( testname => '--timefmt plot with bounds',
-         cmd      => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1}'},
+         cmd      => q{seq 5 | awk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1}'},
          options  => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S',
                       '--xmin', '20 Oct 2013 06:05:00',
                       '--xmax', '20 Oct 2013 06:05:20'],
@@ -755,7 +749,7 @@ tryplot( testname => '--timefmt plot with bounds',
 EOF
 
 tryplot( testname => '--timefmt plot with --monotonic',
-         cmd      => q{seq 10 | gawk '{x=(NR-1)%5; print strftime("%d %b %Y %T",1382249107+x,1),$1}'},
+         cmd      => q{seq 10 | awk '{x=(NR-1)%5; print strftime("%d %b %Y %T",1382249107+x,1),$1}'},
          options  => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S',
                       '--monotonic'],
          refplot  => <<'EOF' );
@@ -801,57 +795,10 @@ tryplot( testname => '--timefmt plot with --monotonic',
 
 EOF
 
-tryplot( testname => '--timefmt with custom rangesize',
-         cmd      => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1,$1/10}'},
-         options  => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S',
-                      qw(--with errorbars --rangesizeall 2)],
-         refplot  => <<'EOF' );
-
-
-  5.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------**
-      +          +           +          +          +          +           +          +          *
-      |                                                                                         *
-    5 ++                                                                                       +A
-      |                                                                                         *
-      |                                                                                         *
-      |                                                                                         *
-  4.5 ++                                                                                       **
-      |                                                                  ***                    |
-      |                                                                   *                     |
-    4 ++                                                                  A                    ++
-      |                                                                   *                     |
-      |                                                                   *                     |
-      |                                                                  ***                    |
-  3.5 ++                                                                                       ++
-      |                                           ***                                           |
-      |                                            *                                            |
-    3 ++                                           A                                           ++
-      |                                            *                                            |
-      |                                            *                                            |
-      |                                           ***                                           |
-  2.5 ++                                                                                       ++
-      |                                                                                         |
-      |                     ***                                                                 |
-    2 ++                     A                                                                 ++
-      |                      *                                                                  |
-      |                     ***                                                                 |
-      |                                                                                         |
-  1.5 ++                                                                                       ++
-      |                                                                                         |
-      |                                                                                         |
-    1 A*                                                                                       ++
-      **                                                                                        |
-      |                                                                                         |
-      +          +           +          +          +          +           +          +          +
-  0.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------++
-    05:08      05:08       05:09      05:09      05:10      05:10       05:11      05:11      05:12
-
-EOF
-
 tryplot( testname => 'Error bars (using extraValuesPerPoint)',
-         cmd      => q{seq 5 | gawk '{print $1,$1,$1/10}'},
+         cmd      => q{seq 5 | awk '{print $1,$1,$1/10}'},
          options  => [qw(--domain),
-                      qw(--extraValuesPerPoint 1 --with errorbars)],
+                      qw(--extraValuesPerPoint 1 --curvestyle 0), 'with errorbars'],
          refplot  => <<'EOF' );
 
 
@@ -896,103 +843,6 @@ tryplot( testname => 'Error bars (using extraValuesPerPoint)',
 EOF
 
 
-tryplot( testname => 'Error bars (using rangesizeall)',
-         cmd      => q{seq 5 | gawk '{print $1,$1,$1/10}'},
-         options  => [qw(--domain),
-                      qw(--rangesizeall 2 --with errorbars)],
-         refplot  => <<'EOF' );
-
-
-  5.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------**
-      +          +           +          +          +          +           +          +          *
-      |                                                                                         *
-    5 ++                                                                                       +A
-      |                                                                                         *
-      |                                                                                         *
-      |                                                                                         *
-  4.5 ++                                                                                       **
-      |                                                                  ***                    |
-      |                                                                   *                     |
-    4 ++                                                                  A                    ++
-      |                                                                   *                     |
-      |                                                                   *                     |
-      |                                                                  ***                    |
-  3.5 ++                                                                                       ++
-      |                                           ***                                           |
-      |                                            *                                            |
-    3 ++                                           A                                           ++
-      |                                            *                                            |
-      |                                            *                                            |
-      |                                           ***                                           |
-  2.5 ++                                                                                       ++
-      |                                                                                         |
-      |                     ***                                                                 |
-    2 ++                     A                                                                 ++
-      |                      *                                                                  |
-      |                     ***                                                                 |
-      |                                                                                         |
-  1.5 ++                                                                                       ++
-      |                                                                                         |
-      |                                                                                         |
-    1 A*                                                                                       ++
-      **                                                                                        |
-      |                                                                                         |
-      +          +           +          +          +          +           +          +          +
-  0.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------++
-      1         1.5          2         2.5         3         3.5          4         4.5         5
-
-EOF
-
-
-tryplot( testname => 'Error bars (using rangesize, rangesizeall)',
-         cmd      => q{seq 5 | gawk '{print $1,"vert",$1,$1/10,"horiz",5-$1,$1-$1/5,$1+$1/20}'},
-         options  => [qw(--domain --dataid),
-                      qw(--rangesize vert 2 --rangesizeall 3 --with xerrorbars --style vert), 'with errorbars',
-                      qw(--xmin 1 --xmax 5 --ymin 0.5 --ymax 5.5)],
-         refplot  => <<'EOF' );
-
-
-    +-----------+----------+-----------+----------+-----------+----------+-----------+---------**
-    +           +          +           +          +           +          +           +          *
-    |                                                                                           *
-  5 ++                                                                                         +A
-    |                                                                                           *
-    |                                                                                           *
-    |                                                                                           *
-    |                                                                                          **
-    |                                                                   ***                     |
-    ##                                                                   *                      |
-  4 B#                                                                   A                     ++
-    ##                                                                   *                      |
-    |                                                                    *                      |
-    |                                                                   ***                     |
-    |                                                                                           |
-    |                                            ***                                            |
-    |             #          #                    *                                             |
-  3 ++            #########B##                    A                                            ++
-    |             #          #                    *                                             |
-    |                                             *                                             |
-    |                                            ***                                            |
-    |                                                                                           |
-    |                                                                                           |
-    |                     ***       #                #                                          |
-  2 ++                     A        ##############B###                                         ++
-    |                      *        #                #                                          |
-    |                     ***                                                                   |
-    |                                                                                           |
-    |                                                                                           |
-    |                                                                                           |
-    |                                                  #                      #                 |
-  1 A*                                                 ##################B#####                ++
-    **                                                 #                      #                 |
-    |                                                                                           |
-    +           +          +           +          +           +          +           +          +
-    +-----------+----------+-----------+----------+-----------+----------+-----------+----------+
-    1          1.5         2          2.5         3          3.5         4          4.5         5
-
-EOF
-
-
 SKIP:
 {
 
@@ -1010,7 +860,7 @@ skip "Skipping unreliable tests. Set RUN_ALL_TESTS environment variable to run t
 
 
 tryplot( testname => 'Histogram plot',
-         cmd      => q{seq 50 | gawk '{print $1*$1}'},
+         cmd      => q{seq 50 | awk '{print $1*$1}'},
          options  => [qw(--lines --points),
                       qw(--histo 0 --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'],
          refplot  => <<'EOF' );
@@ -1057,7 +907,7 @@ tryplot( testname => 'Histogram plot',
 EOF
 
 tryplot( testname => 'Cumulative histogram',
-         cmd      => q{seq 50 | gawk '{print $1*$1}'},
+         cmd      => q{seq 50 | awk '{print $1*$1}'},
          options  => [qw(--lines --points),
                       qw(--histo 0 --histstyle cum --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'],
          refplot  => <<'EOF' );
@@ -1104,7 +954,7 @@ tryplot( testname => 'Cumulative histogram',
 EOF
 
 tryplot( testname => 'Circles',
-         cmd      => q{seq 5 | gawk '{print $1,$1,$1/10}'},
+         cmd      => q{seq 5 | awk '{print $1,$1,$1/10}'},
          options  => [qw(--circles --domain)],
          refplot  => <<'EOF' );
 
@@ -1158,7 +1008,7 @@ note( "Starting to run streaming tests. These will take several seconds each" );
 # points, and then "exit", so I should have two frames worth of data plotted. I
 # pre-send a 0 so that the gnuplot autoscaling is always well-defined
 tryplot( testname => 'basic streaming test',
-         cmd      => q{seq 500 | gawk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 1.2");}'},
+         cmd      => q{seq 500 | awk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 1.2");}'},
          options  => [qw(--lines --points --stream)],
          refplot  => <<'EOF' );
 
@@ -1244,7 +1094,7 @@ tryplot( testname => 'basic streaming test',
 EOF
 
 tryplot( testname => 'basic streaming test, twice as fast',
-         cmd      => q{seq 500 | gawk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 0.6");}'},
+         cmd      => q{seq 500 | awk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 0.6");}'},
          options  => [qw(--lines --points --stream 0.4)],
          refplot  => <<'EOF' );
 
@@ -1331,7 +1181,7 @@ EOF
 
 
 tryplot( testname => 'streaming with --xlen',
-         cmd      => q{seq 500 | gawk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 0.6");}'},
+         cmd      => q{seq 500 | awk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 0.6");}'},
          options  => [qw(--lines --points --stream 0.4 --xlen 1.1)],
          refplot  => <<'EOF' );
 
@@ -1417,7 +1267,7 @@ tryplot( testname => 'streaming with --xlen',
 EOF
 
 tryplot( testname => 'streaming with --monotonic',
-         cmd      => q{seq 500 | gawk '{if(NR==11) {print "exit";} else {x=(NR-1)%5; if(x==0) {print -1,-1;} print x,NR;}; fflush(); system("sleep 0.6");}'},
+         cmd      => q{seq 500 | awk '{if(NR==11) {print "exit";} else {x=(NR-1)%5; if(x==0) {print -1,-1;} print x,NR;}; fflush(); system("sleep 0.6");}'},
          options  => [qw(--lines --points --stream 0.4 --domain --monotonic)],
          refplot  => <<'EOF' );
 
@@ -1823,7 +1673,7 @@ tryplot( testname => 'streaming with --monotonic',
 EOF
 
 tryplot( testname => '--timefmt streaming plot with --xlen',
-         cmd      => q{seq 5 | gawk 'BEGIN{ print strftime("%d %b %Y %T",1382249107-1,1),-4;} {if(NR==3) {print "exit";} else{ print strftime("%d %b %Y %T",1382249107+$1,1),$1;} fflush(); system("sleep 0.6")}'},
+         cmd      => q{seq 5 | awk 'BEGIN{ print strftime("%d %b %Y %T",1382249107-1,1),-4;} {if(NR==3) {print "exit";} else{ print strftime("%d %b %Y %T",1382249107+$1,1),$1;} fflush(); system("sleep 0.6")}'},
          options  => ['--points', '--lines',
                       '--domain', '--timefmt', '%d %b %Y %H:%M:%S',
                       qw(--stream 0.4 --xlen 3)],
@@ -1911,7 +1761,7 @@ tryplot( testname => '--timefmt streaming plot with --xlen',
 EOF
 
 tryplot( testname => '--timefmt streaming plot with --monotonic',
-         cmd      => q{seq 10 | gawk '{x=(NR-1)%5; if(x==0) {print strftime("%d %b %Y %T",1382249107-1,-4),-4;} print strftime("%d %b %Y %T",1382249107+x,1),NR; fflush(); system("sleep 0.6")}'},
+         cmd      => q{seq 10 | awk '{x=(NR-1)%5; if(x==0) {print strftime("%d %b %Y %T",1382249107-1,-4),-4;} print strftime("%d %b %Y %T",1382249107+x,1),NR; fflush(); system("sleep 0.6")}'},
          options  => ['--points', '--lines',
                       '--domain', '--timefmt', '%d %b %Y %H:%M:%S',
                       qw(--stream 0.4 --monotonic)],
@@ -2327,7 +2177,7 @@ sub tryplot
   my %args = @_;
 
   my @options = ('--exit',
-                 qw(--unset grid),
+                 '--extracmds', 'unset grid',
                  '--terminal', 'dumb 100,40');
   unshift @options, @{$args{options}};