version bump

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

Changes

@@ -1,27 +1,3 @@
-feedgnuplot (1.42) unstable; urgency=medium
-
-  * 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

Makefile.PL

@@ -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-*' },

bin/feedgnuplot

@@ -8,14 +8,13 @@ use Getopt::Long;
 use Time::HiRes qw( usleep gettimeofday tv_interval );
 use IO::Handle;
 use IO::Select;
-use List::Util qw( first );
-use List::MoreUtils 'any';
+use List::Util qw( first any );
 use Scalar::Util qw( looks_like_number );
 use Text::ParseWords; # for shellwords
 use Pod::Usage;
 use Time::Piece;
 
-my $VERSION = 1.42;
+my $VERSION = 1.39;
 
 my %options;
 interpretCommandline();
@@ -41,26 +40,22 @@ 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();
 
 
 
 
 
-
-
-
-sub getRangeSize
-{
-    my ($id) = @_;
-
-    # I'd like to use //, but I guess some people are still on perl 5.8
-    return
-      exists $options{rangesize_hash}{$id} ?
-      $options{rangesize_hash}{$id} :
-      $options{rangesize_default};
-}
-
 sub interpretCommandline
 {
   # if I'm using a self-plotting data file with a #! line, then $ARGV[0] will contain ALL of the
@@ -113,7 +108,10 @@ sub interpretCommandline
              'terminal=s',
              'rangesize=s{2}', 'rangesizeall=i', 'extraValuesPerPoint=i',
              'help', 'dump', 'exit', 'version',
-             'geometry=s') or exit 1;
+             'geometry=s') or pod2usage( -exitval => 1,
+                                         -verbose => 1, # synopsis and args
+                                         -output  => \*STDERR );
+
 
   # handle various cmdline-option errors
   if ( $options{help} )
@@ -129,6 +127,13 @@ sub interpretCommandline
     exit 0;
   }
 
+  # expand options that are given as comma-separated lists
+  for my $listkey (qw(histogram y2))
+  {
+    @{$options{$listkey}} = map split('\s*,\s*', $_), @{$options{$listkey}}
+      if defined $options{$listkey};
+  }
+
   # --style and --curvestyle are synonyms, as are --styleall and
   # --curvestyleall, so fill that in
   if( $options{styleall} )
@@ -152,33 +157,6 @@ sub interpretCommandline
     delete $options{with};
   }
 
-
-  # expand options that are given as comma-separated lists
-  for my $listkey (qw(histogram y2))
-  {
-    @{$options{$listkey}} = map split('\s*,\s*', $_), @{$options{$listkey}}
-      if defined $options{$listkey};
-  }
-  for my $listkey (qw(curvestyle rangesize))
-  {
-      next unless defined $options{$listkey};
-      my @in = @{$options{$listkey}};
-      my $N = @in / 2;
-      my @out;
-      for my $i (0..$N-1)
-      {
-          my $key   = $in[2*$i];
-          my $value = $in[2*$i + 1];
-          for my $key_new (split('\s*,\s*', $key))
-          {
-              push @out, $key_new, $value;
-          }
-      }
-
-      @{$options{$listkey}} = @out;
-  }
-
-
   # If we're plotting histograms, then set the default histogram options for
   # each histogram curve
   #
@@ -225,10 +203,7 @@ sub interpretCommandline
 
 
   # I now set up the rangesize to always be
-  #
   #  $options{rangesize_hash}{$id} // $options{rangesize_default}
-  #
-  # which is available as getRangeSize($id)
   if ( $options{rangesizeall} )
   {
       $options{rangesize_default} = $options{rangesizeall};
@@ -287,13 +262,6 @@ sub interpretCommandline
     $options{curvestyleall} .= ' palette';
   }
 
-  if ( defined $options{binwidth} && !@{$options{histogram}} )
-  {
-    print STDERR "--binwidth doesn't make sense without any histograms\n";
-    exit -1;
-  }
-
-
   if ( $options{'3d'} )
   {
     if ( !$options{domain} )
@@ -326,7 +294,7 @@ sub interpretCommandline
       exit -1;
     }
 
-    if ( @{$options{histogram}} )
+    if ( defined $options{binwidth} || @{$options{histogram}} )
     {
       print STDERR "--3d does not make sense with histograms\n";
       exit -1;
@@ -360,16 +328,6 @@ sub interpretCommandline
       print STDERR "--square_xy only makes sense with --3d\n";
       exit -1;
     }
-
-    for my $hist_curve(@{$options{histogram}})
-    {
-        my $hist_dim = getRangeSize($hist_curve);
-        if( $hist_dim != 1 )
-        {
-            print STDERR "I only support 1D histograms, but curve '$hist_curve' has '$hist_dim'-D data\n";
-            exit -1;
-        }
-    }
   }
 
   if(defined $options{xlen} && !$options{stream} )
@@ -379,8 +337,7 @@ sub interpretCommandline
   }
 
   if($options{stream} && defined $options{xlen} &&
-     ( defined $options{xmin} || defined $options{xmax}) &&
-    !defined $options{histogram})
+     ( defined $options{xmin} || defined $options{xmax}))
   {
     print STDERR "With --stream and --xlen the X bounds are set, so neither --xmin nor --xmax make sense\n";
     exit -1;
@@ -471,66 +428,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)
-        {
-            $line_number++;
-            return getline_internal();
-        }
+        return $stdin->getline()
+          if (! $options{stream} || $options{stream} < 0);
 
 
         my $now = [gettimeofday];
@@ -545,8 +452,7 @@ sub getNextLine
 
         if ($selector->can_read($time_remaining))
         {
-            $line_number++;
-            return getline_internal();
+            return $stdin->getline();
         }
     }
 }
@@ -816,7 +722,7 @@ sub mainThread
       }
       else
       {
-        $domain[0] = $line_number;
+        $domain[0] = $.;
         $domain0_numeric = makeDomainNumeric( $domain[0] );
       }
 
@@ -824,10 +730,20 @@ sub mainThread
 
       while(@fields)
       {
-          if($options{dataid}) { $id = shift @fields; }
-          else                 { $id++;               }
+          if($options{dataid})
+          {
+              $id = shift @fields;
+          }
+          else
+          {
+              $id++;
+          }
+
+          # I'd like to use //, but I guess some people are still on perl 5.8
+          my $rangesize = exists $options{rangesize_hash}{$id} ?
+            $options{rangesize_hash}{$id} :
+            $options{rangesize_default};
 
-          my $rangesize = getRangeSize($id);
           last if @fields < $rangesize;
 
           pushPoint(getCurve($id),
@@ -870,7 +786,7 @@ sub mainThread
     # we persist gnuplot, so we shouldn't need this sleep. However, once
     # gnuplot exits, but the persistent window sticks around, you can no
     # longer interactively zoom the plot. So we still sleep
-    sleep(100000000) unless $options{dump} || $options{exit};
+    sleep(100000) unless $options{dump} || $options{exit};
 }
 
 sub pruneOldData
@@ -951,7 +867,12 @@ sub updateCurveOptions
       # as 1 + rangesize). I also need to start the range at the first column
       # past the timefmt
 
-      my @rest = map {$_ + $options{timefmt_Ncols}} (1..getRangeSize($id));
+      # I'd like to use //, but I guess some people are still on perl 5.8
+      my $rangesize = exists $options{rangesize_hash}{$id} ?
+        $options{rangesize_hash}{$id} :
+        $options{rangesize_default};
+
+      my @rest = map {$_ + $options{timefmt_Ncols}} (1..$rangesize);
 
       $usingoptions = "using 1:" . join(':', @rest);
   }
@@ -982,22 +903,6 @@ sub getCurve
     $curveIndices{$id} =  $#curves;
 
     updateCurveOptions($curves[$#curves], $id);
-
-
-    # --xlen has a meaning if we're not plotting histograms at all or if we're
-    # plotting ONLY histograms. If we're doing both at the same time, there's no
-    # consistent way to assign meaning to xlen
-    if ( defined $options{xlen} &&
-
-         # have at least some histograms
-         @{$options{histogram}} &&
-
-         # there are more curves than histogram curves, i.e. there're some
-         # non-histogram curves
-         @curves > @{$options{histogram}} ) {
-        print STDERR "--xlen only makes sense when plotting ONLY histograms or ONLY NON-histograms\n";
-        exit -1;
-    }
   }
   return $curves[$curveIndices{$id}];
 }
@@ -1025,10 +930,6 @@ sub setCurveAsHistogram
   my ($id, $str) = @_;
 
   my $curve = getCurve($id);
-
-  # With histograms I have 2d plots with rangesize=1. I thus give gnuplot two
-  # values for each point: a domain and a range. For histograms I ignore the
-  # domain, so I get the statistics of the 2nd column: $2
   $curve->{histoptions} = 'using (histbin($2)):(1.0) smooth ' . $options{histstyle};
 
   updateCurveOptions($curve, $id);
@@ -1096,11 +997,7 @@ sub replot
         # seconds-since-the-epoch BACK to the timefmt. Sheesh
         ($xmin, $xmax) = map {Time::Piece->strptime( $_, '%s' )->strftime( $options{timefmt} ) } ($xmin, $xmax);
       }
-
-      # if we have any histograms, then I'm not really visualizing the domain at
-      # all, and I don't set the range.
-      sendRangeCommand( "xrange", $xmin, $xmax )
-        unless @{$options{histogram}};
+      sendRangeCommand( "xrange", $xmin, $xmax );
     }
 
     plotStoredData();
@@ -1125,9 +1022,6 @@ sub pushPoint
 }
 
 
-mainThread();
-
-
 =head1 NAME
 
 feedgnuplot - General purpose pipe-oriented plotting tool
@@ -1352,12 +1246,7 @@ windowsize> can be given. This will create an constantly-updating, scrolling
 view of the recent past. C<windowsize> should be replaced by the desired length
 of the domain window to plot, in domain units (passed-in values if C<--domain>
 or line numbers otherwise). If the domain is a time/date via C<--timefmt>, then
-C<windowsize> is and I<integer> in seconds. If we're plotting a histogram, then
-C<--xlen> causes a histogram over a moving window to be computed. The subtlely
-here is that with a histogram you don't actually I<see> the domain since only
-the range is analyzed. But the domain is still there, and can be utilized with
-C<--xlen>. With C<--xlen> we can plot I<only> histograms or I<only>
-I<non>-histograms.
+C<windowsize> is and I<integer> in seconds.
 
 =head3 Special data commands
 
@@ -1390,9 +1279,7 @@ This command causes feedgnuplot to exit.
 The script is able to produce hardcopy output with C<--hardcopy outputfile>. The
 output type can be inferred from the filename, if B<.ps>, B<.eps>, B<.pdf>,
 B<.svg> or B<.png> is requested. If any other file type is requested,
-C<--terminal> I<must> be passed in to tell gnuplot how to make the plot. If
-C<--terminal> is passed in, then the C<--hardcopy> argument only provides the
-output filename.
+C<--terminal> I<must> be passed in to tell gnuplot how to make the plot.
 
 =head2 Self-plotting data files
 
@@ -1591,12 +1478,7 @@ C<--xlen xxx>
 
 When using C<--stream>, sets the size of the x-window to plot. Omit this or set
 it to 0 to plot ALL the data. Does not make sense with 3d plots. Implies
-C<--monotonic>. If we're plotting a histogram, then C<--xlen> causes a histogram
-over a moving window to be computed. The subtlely here is that with a histogram
-you don't actually I<see> the domain since only the range is analyzed. But the
-domain is still there, and can be utilized with C<--xlen>. With C<--xlen> we can
-plot I<only> histograms or I<only> I<non>-histograms.
-
+C<--monotonic>
 
 =item
 
@@ -1638,9 +1520,8 @@ specified for this curve (C<--curvestyle>) or all curves (C<--with>,
 C<--curvestyleall>) then the default histogram style is set: filled boxes with
 borders. This is what the user generally wants. This works with C<--domain>
 and/or C<--stream>, but in those cases the x-value is used I<only> to cull old
-data because of C<--xlen> or C<--monotonic>. I.e. the domain values are I<not>
-drawn in any way. Can be passed multiple times, or passed a comma- separated
-list
+data because of C<--xlen> or C<--monotonic>. I.e. the x-values are I<not> drawn
+in any way. Can be passed multiple times, or passed a comma- separated list
 
 =item
 
@@ -1667,10 +1548,9 @@ report 0 or 1. 'cumulative' is the integral of the 'frequency' histogram.
 C<--style curveID style>
 
 Additional styles per curve. With C<--dataid>, curveID is the ID. Otherwise,
-it's the index of the curve, starting at 0. curveID can be a comma-separated
-list of IDs to which the given style should apply. Use this option multiple
-times for multiple curves. C<--styleall> does I<not> apply to curves that have a
-C<--style>.
+it's the index of the curve, starting at 0. Use this option multiple times for
+multiple curves. C<--styleall> does I<not> apply to curves that have a
+C<--style>
 
 =item
 
@@ -1773,17 +1653,16 @@ For 3D plots, set square aspect ratio for ONLY the x,y axes
 C<--hardcopy xxx>
 
 If not streaming, output to a file specified here. Format inferred from
-filename, unless specified by C<--terminal>. If C<--terminal> is given,
-C<--hardcopy> sets I<only> the output filename.
+filename, unless specified by C<--terminal>
 
 =item
 
 C<--terminal xxx>
 
 String passed to 'set terminal'. No attempts are made to validate this.
-C<--hardcopy> sets this to some sensible defaults if C<--hardcopy> is set to a
-filename ending in C<.png>, C<.pdf>, C<.ps>, C<.eps> or C<.svg>. If any other
-file type is desired, use both C<--hardcopy> and C<--terminal>
+C<--hardcopy> sets this to some sensible defaults if --hardcopy is given .png,
+.pdf, .ps, .eps or .svg. If any other file type is desired, use both
+C<--hardcopy> and C<--terminal>
 
 =item
 
@@ -1816,10 +1695,6 @@ C<--rangesize> is used to set how many values are needed to represent the range
 of a point for a particular curve. This overrides any defaults that may exist
 for this curve only.
 
-With C<--dataid>, curveID is the ID. Otherwise, it's the index of the curve,
-starting at 0. curveID can be a comma-separated list of IDs to which the given
-rangesize should apply.
-
 =item
 
 C<--rangesizeall xxx>
@@ -1847,15 +1722,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
-of the C<feedgnuplot> pipeline is killed. This option does different things
-depending on whether C<--stream> is active, so read this closely.
+This controls the details of what happens when the input data is exhausted, or
+when some part of the C<feedgnuplot> pipeline is killed. This option does
+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
-of the polotting pipeline:
+that such decapitated windows aren't interactive). To be clear, there are 3
+possible states:
 
 =over
 
@@ -1870,35 +1746,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
-useful.
+Without C<--stream> the goal is to show a plot, so a Dead state is not 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
-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.
+Alive. Need to Ctrl-C to get back into the shell
 
 =item C<--exit>
 
@@ -1980,30 +1856,6 @@ in a Thinkpad.
      --binwidth 10
      --ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
 
-=head2 Plotting a live histogram of the ping round-trip times for the past 20 seconds
-
- $ ping -A -D 8.8.8.8 |
-   perl -anE 'BEGIN { $| = 1; }
-              $F[0] =~ s/[\[\]]//g or next;
-              $F[7] =~ s/.*=//g    or next;
-              say "$F[0] $F[7]"' |
-   feedgnuplot --stream --domain --histogram 0 --binwidth 10 \
-               --xlabel 'Ping round-trip time (s)'  \
-               --ylabel Frequency --xlen 20
-
-=head2 Plotting points on top of an existing image
-
-This can be done by using C<--equation> to pass arbitrary plot input to gnuplot:
-
- $ < features_xy.data
-   feedgnuplot --points --domain
-     --equation '"image.png" binary filetype=png flipy with rgbimage'
-
-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
-usually the y axis points up, but when looking at images, this is usually
-reversed: the origin is the top-left pixel.
-
 =head1 ACKNOWLEDGEMENT
 
 This program is originally based on the driveGnuPlots.pl script from

debian/changelog

@@ -0,0 +1,113 @@
+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,20 @@
+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},
+         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