version bump

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

Changes

@@ -1,73 +1,3 @@
-feedgnuplot (1.55)
-
-  * Fixed regression introduced in 1.54:
-    --style now correctly overrides --with
-
- -- Dima Kogan <dkogan@debian.org>  Mon, 20 Jul 2020 15:51:23 -0700
-
-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

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.
-
-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 ...
+This installs feedgnuplot to /usr/local. Adjust the paths as required

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,8 +17,6 @@ complete -W               \
     --extraValuesPerPoint \
     --rangesizeall        \
     --rangesize           \
-    --tuplesizeall        \
-    --tuplesize           \
     --extracmds           \
     --set                 \
     --unset               \
@@ -37,31 +33,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             \
-    --x2max               \
-    --x2min               \
-    --ylabel              \
-    --ymax                \
-    --ymin                \
+    --y2                  \
     --y2label             \
     --y2max               \
     --y2min               \
+    --ylabel              \
+    --ymax                \
+    --ymin                \
     --zlabel              \
     --zmax                \
-    --zmin                \
-    --vnlog ' feedgnuplot
+    --zmin' feedgnuplot

completions/zsh/_feedgnuplot

@@ -10,28 +10,22 @@ _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: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:'                                    \
+    '*--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'             \
@@ -41,28 +35,23 @@ _arguments -S
     '*--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)"' \
     '--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'                            \
-    '--vnlog[column IDs come from a vnlog header]'
+    '--timefmt[Format for time/date data]:time format'

debian/changelog

@@ -0,0 +1,164 @@
+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
+
+  * 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