changelog bump

with --persist enabled even something basic like

 seq 5 | feedgnuplot --terminal dumb

does not work. feedgnuplot simply sits there doing nothing. This is likely a
gnuplot bug. Those boards run an older gnuplot build, and I can't easily install
a new one to test. It's possible the newer gnuplots fix this, but it's easier to
release a new feedgnuplot instead

Changes

@@ -1,154 +1,3 @@
-feedgnuplot (1.54)
-
-  * Added --every and --everyall to decimate the input data
-  * --timefmt can be used with --histogram
-
- -- Dima Kogan <dkogan@debian.org>  Fri, 17 Apr 2020 14:06:55 -0700
-
-feedgnuplot (1.53)
-
-  * Full support for all 4 axes. Added --x2...
-
- -- Dima Kogan <dkogan@debian.org>  Wed, 08 Jan 2020 18:55:29 -0800
-
-feedgnuplot (1.52)
-
-  * Added --squarexy and --square-xy as synonyms to --square_xy
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 25 Aug 2019 15:32:37 -0700
-
-feedgnuplot (1.51)
-
-  * Added .gp "terminal" to create self-plotting gnuplot files
-
- -- Dima Kogan <dima@secretsauce.net>  Sat, 29 Sep 2018 10:56:30 -0700
-
-feedgnuplot (1.50)
-
-  * Script waits for the plot window to close before exiting
-      Instead of sleeping forever. This is really nice! I no longer need
-      to quit the plot window AND then C-c. Quitting the plot window is
-      now sufficient
-  * by default --image sets range noextend
-  * tab-completion knows about the fnormal distribution
-
- -- Dima Kogan <dkogan@debian.org>  Fri, 24 Aug 2018 13:11:05 -0700
-
-feedgnuplot (1.49)
-
-  * --vnl now works with plots that have rangesize > 1
-  * zsh completion: --xlen argument isn't optional
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 16 Mar 2018 13:52:28 -0700
-
-feedgnuplot (1.48)
-
-  * --vnlog works properly with --domain
-
- -- Dima Kogan <dima@secretsauce.net>  Sat, 24 Feb 2018 12:33:50 -0800
-
-feedgnuplot (1.47)
-
-  * Fixed typo. Everything is un-broken now
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 23 Feb 2018 10:21:13 -0800
-
-feedgnuplot (1.46)
-
-  * Added --tuplesize and --tuplesizeall as alternatives to --rangesize
-    and --rangesizeall. Both forms are supported.
-  * Vnlog integration
-
- -- Dima Kogan <dima@secretsauce.net>  Thu, 22 Feb 2018 23:37:54 -0800
-
-feedgnuplot (1.45)
-
-  * zsh completion: --hardcopy, --image  suggest filenames
-  * --image now produces a nicer legend: just the filename
-  * --curvestyle now overrides --curvestyleall
-    - This is a bug fix
-  * The version is now treated as a string not as a number
-    - So "1.40" is distinct from "1.4"
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 29 Oct 2017 13:56:28 -0700
-
-feedgnuplot (1.44)
-
-  * --image draws its output beneath everything else
-
- -- Dima Kogan <dima@secretsauce.net>  Tue, 20 Jun 2017 16:44:30 -0700
-
-feedgnuplot (1.43)
-
-  * Added --image
-
- -- Dima Kogan <dima@secretsauce.net>  Mon, 19 Jun 2017 13:12:38 -0700
-
-feedgnuplot (1.42)
-
-  * Data can now come from STDIN or files on the cmdline.
-    This fixes a regression. Self-plotting data files work again
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 31 Mar 2017 15:38:47 -0700
-
-feedgnuplot (1.41)
-
-  * Histograms: --xlen can coexist with --xmin/--xmax
-  * Histograms: work as expected with --xlen and --monotonic
-  * Histograms: better sanity checking of options
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 24 Feb 2017 23:42:28 -0800
-
-feedgnuplot (1.40)
-
-  * If the options couldn't be parsed I don't dump the whole manpage
-  * --style and --rangesize can now take a comma-separated list of IDs
-  * 'any' is from List::MoreUtils, not List::Util
-  * the sleep-forever delay at end is now > 1000 days
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 25 Nov 2016 14:45:06 -0800
-
-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

INSTALL

@@ -10,11 +10,4 @@ Without a package, an installation can be done with
          make
          make install
 
-This installs feedgnuplot to /usr/local. Adjust the paths as required.
+This installs feedgnuplot to /usr/local. Adjust the paths as required
-
-Also, note that this is a self-contained utility. Usually running from the tree
-works just fine:
-
-         git clone https://github.com/dkogan/feedgnuplot.git
-         cd feedgnuplot/bin
-         ./feedgnuplot ...

Makefile.PL

@@ -20,9 +20,9 @@ sub parseversion
 
   while(<PL>)
   {
-    if( /VERSION = '([0-9\.]+)'/ )
+    if( /VERSION = ([0-9\.]+)/ )
     {
-      if ( $1 ne $version )
+      if ( $1 != $version )
       {
         die "Version mismatch. Changes says version is '$version', but 'bin/feedgnuplot' says it is '$1'";
       }
@@ -64,7 +64,6 @@ WriteMakefile
    PL_FILES                   => {},
    EXE_FILES                  => [ 'bin/feedgnuplot' ],
    BUILD_REQUIRES             => { 'String::ShellQuote' => 0,
-                                   'List::MoreUtils'    => 0,
                                    'IPC::Run'           => 0},
    dist                       => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
    clean                      => { FILES => 'feedgnuplot-*' },

README.pod

@@ -0,0 +1 @@
+bin/feedgnuplot

completions/bash/feedgnuplot

@@ -9,8 +9,6 @@ complete -W               \
     --curvestyleall       \
     --style               \
     --styleall            \
-    --every               \
-    --everyall            \
     --with                \
     --dataid              \
     --domain              \
@@ -19,13 +17,9 @@ complete -W               \
     --extraValuesPerPoint \
     --rangesizeall        \
     --rangesize           \
-    --tuplesizeall        \
-    --tuplesize           \
     --extracmds           \
     --set                 \
     --unset               \
-    --equation            \
-    --image               \
     --geometry            \
     --hardcopy            \
     --help                \
@@ -37,31 +31,23 @@ complete -W               \
     --monotonic           \
     --points              \
     --square              \
-    --square-xy           \
+    --square_xy           \
     --stream              \
     --terminal            \
     --timefmt             \
     --title               \
     --version             \
-    --x2                  \
-    --y2                  \
-    --x2y1                \
-    --x1y2                \
-    --x2y2                \
     --xlabel              \
     --xlen                \
     --xmax                \
     --xmin                \
-    --x2label             \
+    --y2                  \
-    --x2max               \
-    --x2min               \
-    --ylabel              \
-    --ymax                \
-    --ymin                \
     --y2label             \
     --y2max               \
     --y2min               \
+    --ylabel              \
+    --ymax                \
+    --ymin                \
     --zlabel              \
     --zmax                \
-    --zmin                \
+    --zmin' feedgnuplot
-    --vnlog ' feedgnuplot

completions/zsh/_feedgnuplot

@@ -10,59 +10,46 @@ _arguments -S
     '--points'                                                                    \
     '--circles'                                                                   \
     '--xlabel:X-axis label:'                                                      \
-    '--x2label:X2-axis label:'                                                    \
     '--ylabel:Y-axis label:'                                                      \
     '--y2label:Y2-axis label:'                                                    \
     '--zlabel:Z-axis label:'                                                      \
+    '--zlabel:Z-axis label:'                                                      \
     '--title:Plot title:'                                                         \
     '--autolegend[Label each plot with its data ID]'                              \
-    '(--3d)--xlen[the size of the x-window to plot]:window size:'                 \
+    '(--3d)--xlen[the size of the x-window to plot]::window size:'                \
     '(--xlen)--xmin:min X:'                                                       \
     '(--xlen)--xmax:max X:'                                                       \
-    '--x2min:min X2:'                                                             \
-    '--x2max:max X2:'                                                             \
     '--ymin:min Y:'                                                               \
     '--ymax:max Y:'                                                               \
     '--y2min:min Y2:'                                                             \
     '--y2max:max Y2:'                                                             \
     '--zmin:min Z:'                                                               \
     '--zmax:max Z:'                                                               \
-    '*--x2:curve to place on the X2Y1 axis:'                                      \
+    '*--y2:plot to place on the Y2 axis:'                                         \
-    '*--y2:curve to place on the X1Y2 axis:'                                      \
-    '*--x2y1:curve to place on the X2Y1 axis:'                                    \
-    '*--x1y2:curve to place on the X1Y2 axis:'                                    \
-    '*--x2y2:curve to place on the X2Y2 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'             \
     '*--extracmds[Additional gnuplot commands]:command'                           \
     '*--set[Additional 'set' gnuplot commands]:set-option'                        \
     '*--unset[Additional 'unset' gnuplot commands]:unset-option'                  \
-    '*--equation[Raw symbolic equation]:equation'                                 \
-    '--image[Image file to render beneath the data]:image:_files -g "(#i)*.(jpg|jpeg|png|gif)"' \
     '--square[Plot data with square aspect ratio]'                                \
-    '--square-xy[For 3D plots, set square aspect ratio for ONLY the x,y axes]'    \
+    '--square_xy[For 3D plots, set square aspect ratio for ONLY the x,y axes]'    \
-    '--hardcopy[Plot to a file]:new image filename:_files -g "(#i)*.(jpg|jpeg|png|gif)"' \
+    '--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)--tuplesizeall[How many values are given for each data tuple]:N'\
-    '*--tuplesize[How many values comprise a data tuple in this curve]:curve id: :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:'                   \
-    '*--every[Decimation factor for a curve]:curve id: :decimation factor:'       \
-    '--everyall[Decimation factor for ALL curves]:decimation factor'              \
     '(--3d)*--histogram:plot to treat as a histogram:'                            \
     '--binwidth:Histogram bin width:'                                             \
-    '--histstyle:Style of histogram:(frequency fnormal unique cumulative cnormal)' \
+    '--histstyle:Style of histogram:(frequency unique cumulative cnormal)'        \
     '--terminal:Terminal options to set with "set terminal":'                     \
     '*--legend[Legend for a curve]:curve id: :legend:'                            \
     '--exit[Exit gnuplot after making the plot]'                                  \
     '--version'                                                                   \
     '--help'                                                                      \
-    '--timefmt[Format for time/date data]:time format'                            \
+    '--timefmt[Format for time/date data]:time format'
-    '--vnlog[column IDs come from a vnlog header]'

debian/changelog

@@ -1,151 +1,8 @@
-feedgnuplot (1.54-1) unstable; urgency=medium
+feedgnuplot (1.34stir1-1) unstable; urgency=medium
 
-  * New upstream release
+  * disabled --persist because on our arm board it confuses things
-    - Added --every and --everyall to decimate the input data
-    - --timefmt can be used with --histogram
 
- -- Dima Kogan <dkogan@debian.org>  Fri, 17 Apr 2020 14:21:07 -0700
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 22 Aug 2014 14:59:05 -0700
-
-feedgnuplot (1.53-1) unstable; urgency=medium
-
-  * New upstream release
-    - Full support for all 4 axes. Added --x2...
-
- -- Dima Kogan <dkogan@debian.org>  Wed, 08 Jan 2020 18:59:29 -0800
-
-feedgnuplot (1.52-1) unstable; urgency=medium
-
-  [ Jelmer Vernooij ]
-  * Use secure copyright file specification URI.
-  * Trim trailing whitespace.
-
-  [ Dima Kogan ]
-  * New upstream release
-    - --square-xy and --squarexy as synonyms for --square_xy
-
- -- Dima Kogan <dkogan@debian.org>  Sun, 25 Aug 2019 15:34:56 -0700
-
-feedgnuplot (1.51-1) unstable; urgency=medium
-
-  * Added .gp "terminal" to create self-plotting gnuplot files
-
- -- Dima Kogan <dkogan@debian.org>  Sat, 29 Sep 2018 11:00:40 -0700
-
-feedgnuplot (1.50-1) unstable; urgency=medium
-
-  * Script waits for the plot window to close before exiting
-      Instead of sleeping forever. This is really nice! I no longer need
-      to quit the plot window AND then C-c. Quitting the plot window is
-      now sufficient
-  * by default --image sets range noextend
-  * tab-completion knows about the fnormal distribution
-
- -- Dima Kogan <dkogan@debian.org>  Fri, 24 Aug 2018 13:16:35 -0700
-
-feedgnuplot (1.49-2) unstable; urgency=medium
-
-  * Updated Vcs-... tags to salsa
-
- -- Dima Kogan <dkogan@debian.org>  Sun, 17 Jun 2018 22:18:18 -0700
-
-feedgnuplot (1.49-1) unstable; urgency=medium
-
-  * --vnl now works with plots that have rangesize > 1
-  * zsh completion: --xlen argument isn't optional
-
- -- Dima Kogan <dkogan@debian.org>  Fri, 16 Mar 2018 13:56:27 -0700
-
-feedgnuplot (1.48-1) unstable; urgency=medium
-
-  * Added --tuplesize and --tuplesizeall
-  * vnlog integration
-
- -- Dima Kogan <dkogan@debian.org>  Sat, 24 Feb 2018 12:56:05 -0800
-
-feedgnuplot (1.45-1) unstable; urgency=medium
-
-  * zsh completion: --hardcopy, --image  suggest filenames
-  * --image now produces a nicer legend: just the filename
-  * --curvestyle now overrides --curvestyleall
-    - This is a bug fix
-  * The version is now treated as a string not as a number
-    - So "1.40" is distinct from "1.4"
-
- -- Dima Kogan <dkogan@debian.org>  Sun, 29 Oct 2017 14:06:26 -0700
-
-feedgnuplot (1.44-1) unstable; urgency=medium
-
-  * --image always goes on the FRONT of the equation list
-
- -- Dima Kogan <dkogan@debian.org>  Tue, 20 Jun 2017 16:45:42 -0700
-
-feedgnuplot (1.43-1) unstable; urgency=medium
-
-  * added --image as a convenience wrapper for --equation
-
- -- Dima Kogan <dkogan@debian.org>  Mon, 19 Jun 2017 13:16:18 -0700
-
-feedgnuplot (1.42-1) unstable; urgency=medium
-
-  * Upstream update:
-    - Fixed regression: data can now come from STDIN or files on the
-      cmdline
-    - reworded manpage of --exit
-
- -- Dima Kogan <dkogan@debian.org>  Tue, 25 Apr 2017 11:02:18 -0700
-
-feedgnuplot (1.41-1) unstable; urgency=medium
-
-  * Upstream update:
-    - Histograms: --xlen can coexist with --xmin/--xmax
-    - Histograms: work as expected with --xlen and --monotonic
-    - Histograms: better sanity checking of options
-
- -- Dima Kogan <dkogan@debian.org>  Fri, 24 Feb 2017 23:53:27 -0800
-
-feedgnuplot (1.40-1) unstable; urgency=medium
-
-  * Upstream update:
-    - If the options couldn't be parsed I don't dump the whole manpage
-    - --style and --rangesize can now take a comma-separated list of IDs
-    - 'any' is from List::MoreUtils, not List::Util
-    - the sleep-forever delay at end is now > 1000 days
-
- -- Dima Kogan <dkogan@debian.org>  Fri, 25 Nov 2016 14:49:36 -0800
-
-feedgnuplot (1.39-1) unstable; urgency=medium
-
-  * Upstream update:
-    - by default, histograms are plotted in expected ways
-    - No enhanced text mode in hardcopies, slightly larger font size
-
- -- Dima Kogan <dkogan@debian.org>  Sat, 15 Oct 2016 20:45:15 -0700
-
-feedgnuplot (1.37-1) unstable; urgency=medium
-
-  * Upstream update: At the end of a streaming plot, include the last
-    chunk of data
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 01 Jan 2016 08:14:23 -0800
-
-feedgnuplot (1.36-1) unstable; urgency=medium
-
-  * Upstream update: added --equation to plot symbolic equations
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 13 Nov 2015 11:14:30 -0800
-
-feedgnuplot (1.35-1) unstable; urgency=medium
-
-  * Upstream update: fancier handling of termination conditions, no more
-    threading code
-
- -- Dima Kogan <dima@secretsauce.net>  Mon, 02 Nov 2015 13:55:32 -0800
-
-feedgnuplot (1.34-2) unstable; urgency=medium
-
-  * Depends now works with the 'gnuplot5' packages
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 10 Oct 2014 14:05:17 -0700
 
 feedgnuplot (1.34-1) unstable; urgency=medium
 

debian/control

@@ -3,18 +3,15 @@ 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 <dkogan@debian.org>
+Uploaders: Dima Kogan <dima@secretsauce.net>
 Standards-Version: 3.9.4
 Homepage: https://github.com/dkogan/feedgnuplot
-Vcs-Browser: https://salsa.debian.org/science-team/feedgnuplot
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/feedgnuplot.git
-Vcs-Git: https://salsa.debian.org/science-team/feedgnuplot.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/feedgnuplot.git
 
 Package: feedgnuplot
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends},
+Depends: ${misc:Depends}, ${perl:Depends}, gnuplot-qt | gnuplot-x11 | gnuplot-nox
-         liblist-moreutils-perl,
-         gnuplot-qt | gnuplot-x11 | gnuplot-nox | gnuplot5-qt | gnuplot5-x11 | gnuplot5-nox | gnuplot
-Suggests: vnlog
 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

debian/copyright

@@ -1,4 +1,4 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+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

debian/feedgnuplot.install

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

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}