version bump

This reverts commit 9d98b84546.
This doesn't belong in the debian branch

Changes

@@ -1,22 +1,3 @@
-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

bin/feedgnuplot

@@ -15,7 +15,7 @@ use Text::ParseWords; # for shellwords
 use Pod::Usage;
 use Time::Piece;
 
-my $VERSION = 1.44;
+my $VERSION = 1.41;
 
 my %options;
 interpretCommandline();
@@ -41,10 +41,17 @@ my $last_replot_time = [gettimeofday];
 
 # whether the previous replot was timer based
 my $last_replot_is_from_timer = 1;
+
+
+my $prev_timed_replot_time = [gettimeofday];
 my $this_replot_is_from_timer;
+my $stdin    = IO::Handle->new();
+die "Couldn't open STDIN" unless $stdin->fdopen(fileno(STDIN),"r");
+my $selector = IO::Select->new( $stdin );
 
 
 
+mainThread();
 
 
 
@@ -109,13 +116,13 @@ sub interpretCommandline
              'style=s{2}', 'curvestyle=s{2}', 'curvestyleall=s', 'styleall=s', 'with=s', 'extracmds=s@', 'set=s@', 'unset=s@',
              'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'timefmt=s',
              'equation=s@',
-             'image=s',
              'histogram=s@', 'binwidth=f', 'histstyle=s',
              'terminal=s',
              'rangesize=s{2}', 'rangesizeall=i', 'extraValuesPerPoint=i',
              'help', 'dump', 'exit', 'version',
              'geometry=s') or exit 1;
 
+
   # handle various cmdline-option errors
   if ( $options{help} )
   {
@@ -420,27 +427,6 @@ sub interpretCommandline
       }
     }
   }
-
-  # deal with --image. I just fill in --equation, and reverse the y extents if
-  # none are explicitly given
-  if( defined $options{image} )
-  {
-      # images generally have the origin at the top-left instead of the
-      # bottom-left, so given nothing else, I flip the y axis
-      if( !defined $options{ymin} && !defined $options{ymax} &&
-          ! any { /^ *yrange\b/ } @{$options{set}} )
-      {
-          push @{$options{set}}, "yrange [:] reverse";
-      }
-
-      if ( ! -r $options{image} )
-      {
-          die "Couldn't read image '$options{image}'";
-      }
-
-      unshift @{$options{equation}}, qq{"$options{image}" binary filetype=auto flipy with rgbimage};
-      delete $options{image};
-  }
 }
 
 sub getGnuplotVersion
@@ -493,66 +479,16 @@ sub makeDomainNumeric
 }
 
 
-my $prev_timed_replot_time = [gettimeofday];
-my $pipe_in;
-my $selector;
-my $line_number = 0;
-my $is_stdin = !@ARGV; # read stdin only if no data files given on the cmdline
-sub openNextFile
-{
-    my $fd;
-    if($is_stdin)
-    {
-        $fd = IO::Handle->new();
-        $fd->fdopen(fileno(STDIN), "r") or die "Couldn't open STDIN";
-    }
-    else
-    {
-        my $filename = shift @ARGV;
-        $fd = IO::File->new($filename, "r") or die "Couldn't open file '$filename'";
-    }
-
-    my $selector = IO::Select->new( $fd );
-    return ($fd, $selector);
-}
 sub getNextLine
 {
-    sub getline_internal
-    {
-        while(1)
-        {
-            my $line = $pipe_in->getline();
-            if( !$is_stdin && !defined $line && $pipe_in->eof() && @ARGV)
-            {
-                # I got to the end of one file, so open the next one (which I'm
-                # sure exists)
-                ($pipe_in, $selector) = openNextFile();
-                next;
-            }
-            return $line;
-        }
-    }
-
-
-
-
-
-    if( !defined $pipe_in )
-    {
-        ($pipe_in, $selector) = openNextFile();
-    }
-
     while(1)
     {
         $this_replot_is_from_timer = undef;
 
         # if we're not streaming, or we're doing triggered-only replotting, simply
         # do a blocking read
-        if (! $options{stream} || $options{stream} < 0)
+        return $stdin->getline()
-        {
+          if (! $options{stream} || $options{stream} < 0);
-            $line_number++;
-            return getline_internal();
-        }
 
 
         my $now = [gettimeofday];
@@ -567,8 +503,7 @@ sub getNextLine
 
         if ($selector->can_read($time_remaining))
         {
-            $line_number++;
+            return $stdin->getline();
-            return getline_internal();
         }
     }
 }
@@ -838,7 +773,7 @@ sub mainThread
       }
       else
       {
-        $domain[0] = $line_number;
+        $domain[0] = $.;
         $domain0_numeric = makeDomainNumeric( $domain[0] );
       }
 
@@ -1147,9 +1082,6 @@ sub pushPoint
 }
 
 
-mainThread();
-
-
 =head1 NAME
 
 feedgnuplot - General purpose pipe-oriented plotting tool
@@ -1751,17 +1683,6 @@ times.
 
 =item
 
-C<--image filename>
-
-Overlays the data on top of a raster image given in C<filename>. This is passed
-through to gnuplot via C<--equation>, and is not interpreted by C<feedgnuplot>
-other than checking for existence. Usually images have their origin at the
-top-left corner, while plots have it in the bottom-left corner instead. Thus if
-the y-axis extents are not specified (C<--ymin>, C<--ymax>, C<--set 'yrange
-...'>) this option will also flip around the y axis to make the image appear
-properly. Since this option is just a passthrough to gnuplot, finer control can
-be achieved by passing in C<--equation> and C<--set yrange ...> directly.
-
 C<--equation xxx>
 
 Gnuplot can plot both data and symbolic equations. C<feedgnuplot> generally
@@ -1880,15 +1801,16 @@ is possible to send the output produced this way to gnuplot directly.
 
 C<--exit>
 
-This controls what happens when the input data is exhausted, or when some part
+This controls the details of what happens when the input data is exhausted, or
-of the C<feedgnuplot> pipeline is killed. This option does different things
+when some part of the C<feedgnuplot> pipeline is killed. This option does
-depending on whether C<--stream> is active, so read this closely.
+different things depending on whether C<--stream> is active, so read this
+closely.
 
 With interactive gnuplot terminals (qt, x11, wxt), the plot windows live in a
 separate process from the main C<gnuplot> process. It is thus possible for the
 main C<gnuplot> process to exit, while leaving the plot windows up (a caveat is
-that such decapitated windows aren't interactive). There are 3 possible states
+that such decapitated windows aren't interactive). To be clear, there are 3
-of the polotting pipeline:
+possible states:
 
 =over
 
@@ -1903,35 +1825,35 @@ prompt available
 
 =back
 
-The possibilities are:
+The C<--exit> option controls the details of this behavior. The possibilities
+are:
 
 =over
 
-=item No C<--stream>, all data read in
+=item No C<--stream>, input pipe is exhausted (all data read in)
 
 =over
 
-=item no C<--exit> (default)
+=item default; no C<--exit>
 
 Alive. Need to Ctrl-C to get back into the shell
 
 =item C<--exit>
 
 Half-alive. Non-interactive prompt up, and the shell accepts new commands.
-Without C<--stream> the goal is to show a plot, so a Dead state would not be
+Without C<--stream> the goal is to show a plot, so a Dead state is not useful
-useful.
+here.
 
 =back
 
-=item C<--stream>, all data read in or the C<feedgnuplot> process terminated
+=item C<--stream>, input pipe is exhausted (all data read in) or the
+C<feedgnuplot> process terminated
 
 =over
 
-=item no C<--exit> (default)
+=item default; no C<--exit>
 
-Alive. Need to Ctrl-C to get back into the shell. This means that when making
+Alive. Need to Ctrl-C to get back into the shell
-live plots, the first Ctrl-C kills the data feeding process, but leaves the
-final plot up for inspection. A second Ctrl-C kills feedgnuplot as well.
 
 =item C<--exit>
 
@@ -2026,21 +1948,11 @@ in a Thinkpad.
 
 =head2 Plotting points on top of an existing image
 
-This can be done with C<--image>:
+This can be done by using C<--equation> to pass arbitrary plot input to gnuplot:
-
- $ < features_xy.data
-   feedgnuplot --points --domain --image "image.png"
-
-or with C<--equation>:
 
  $ < features_xy.data
    feedgnuplot --points --domain
-     --equation '"image.png" binary filetype=auto flipy with rgbimage'
+     --equation '"image.png" binary filetype=png flipy with rgbimage'
-     --set 'yrange [:] reverse'
-
-The C<--image> invocation is a convenience wrapper for the C<--equation>
-version. Finer control is available with C<--equation>.
-
 
 Here an existing image is given to gnuplot verbatim, and data to plot on top of
 it is interpreted by feedgnuplot as usual. C<flipy> is useful here because

completions/bash/feedgnuplot

@@ -21,7 +21,6 @@ complete -W               \
     --set                 \
     --unset               \
     --equation            \
-    --image               \
     --geometry            \
     --hardcopy            \
     --help                \

completions/zsh/_feedgnuplot

@@ -33,7 +33,6 @@ _arguments -S
     '*--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'                        \
     '--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'                                         \

debian/changelog

@@ -0,0 +1,132 @@
+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
+
+  * Very minor upstream update
+  * gnuplot-nox can no satisfy the gnuplot dependency for feedgnuplot
+
+ -- Dima Kogan <dima@secretsauce.net>  Wed, 06 Aug 2014 15:19:56 -0700
+
+feedgnuplot (1.33-1) unstable; urgency=low
+
+  * Upstream update: fixed incorrect plotting of --timefmt --rangesize
+    plots
+
+ -- Dima Kogan <dima@secretsauce.net>  Thu, 06 Feb 2014 23:19:02 -0800
+
+feedgnuplot (1.32-1) unstable; urgency=low
+
+  * Added --rangesize and --rangesizeall. Different curves can now plot
+    different-size tuples
+
+ -- Dima Kogan <dima@secretsauce.net>  Wed, 05 Feb 2014 14:00:44 -0800
+
+feedgnuplot (1.30-1) unstable; urgency=low
+
+  * made the VCS links canonical
+  * added --set, --unset, --with, --style, --styleall
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 24 Jan 2014 15:50:03 -0800
+
+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,21 @@
+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://anonscm.debian.org/debian-science/packages/feedgnuplot.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/feedgnuplot.git
+
+Package: feedgnuplot
+Architecture: all
+Depends: ${misc:Depends}, ${perl:Depends},
+         liblist-moreutils-perl,
+         gnuplot-qt | gnuplot-x11 | gnuplot-nox | gnuplot5-qt | gnuplot5-x11 | gnuplot5-nox | 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