Merge remote-tracking branch 'gitdebian/debian' into debian

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,24 +1,4 @@
-feedgnuplot (1.26)
+feedgnuplot (1.24) unstable; urgency=low
-
-  * Minor POD fixes
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 20 Oct 2013 01:17:57 -0700
-
-feedgnuplot (1.25)
-
-  * 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)
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 20 Oct 2013 00:09:36 -0700
-
-feedgnuplot (1.24)
 
   * Fixed regression in --monotonic. This works again now
   * moved POD back into the main source file. This fixes the broken usage

MANIFEST

@@ -1,7 +1,7 @@
 Makefile.PL
 MANIFEST
 bin/feedgnuplot
+t/00-load.t
 t/manifest.t
-t/plots.t
 Changes
 LICENSE

Makefile.PL

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

completions/bash/feedgnuplot

@@ -1,46 +1,43 @@
-complete -W               \
+complete -W                                     \
-'                         \
+'                                               \
-    --3d                  \
+    --domain                                    \
-    --autolegend          \
+    --dataid                                    \
-    --binwidth            \
+    --3d                                        \
-    --circles             \
+    --colormap                                  \
-    --colormap            \
+    --stream                                    \
-    --curvestyle          \
+    --lines                                     \
-    --curvestyleall       \
+    --points                                    \
-    --dataid              \
+    --circles                                   \
-    --domain              \
+    --xlabel                                    \
-    --dump                \
+    --ylabel                                    \
-    --exit                \
+    --y2label                                   \
-    --extraValuesPerPoint \
+    --zlabel                                    \
-    --extracmds           \
+    --zlabel                                    \
-    --geometry            \
+    --title                                     \
-    --hardcopy            \
+    --autolegend                                \
-    --help                \
+    --xlen                                      \
-    --histogram           \
+    --xmin                                      \
-    --histstyle           \
+    --xmax                                      \
-    --legend              \
+    --ymin                                      \
-    --lines               \
+    --ymax                                      \
-    --maxcurves           \
+    --y2min                                     \
-    --monotonic           \
+    --y2max                                     \
-    --points              \
+    --zmin                                      \
-    --square              \
+    --zmax                                      \
-    --square_xy           \
+    --y2                                        \
-    --stream              \
+    --curvestyleall                             \
-    --terminal            \
+    --extracmds                                 \
-    --timefmt             \
+    --square                                    \
-    --title               \
+    --square_xy                                 \
-    --version             \
+    --hardcopy                                  \
-    --xlabel              \
+    --maxcurves                                 \
-    --xlen                \
+    --monotonic                                 \
-    --xmax                \
+    --extraValuesPerPoint                       \
-    --xmin                \
+    --dump                                      \
-    --y2                  \
+    --geometry                                  \
-    --y2label             \
+    --curvestyle                                \
-    --y2max               \
+    --histogram                                 \
-    --y2min               \
+    --binwidth                                  \
-    --ylabel              \
+    --histstyle                                 \
-    --ymax                \
+    --terminal                                  \
-    --ymin                \
+    --legend' feedgnuplot
-    --zlabel              \
-    --zmax                \
-    --zmin' feedgnuplot

completions/zsh/_feedgnuplot

@@ -1,48 +1,44 @@
 #compdef feedgnuplot
 
-_arguments -S                                                                     \
+_arguments -S                                                                           \
-    '()--domain[first element of each line is the domain variable]'               \
+    '()--domain[first element of each line is the domain variable]'                     \
-    '--dataid[each data point is preceded by the corresponding ID]'               \
+    '--dataid[each data point is preceded by the corresponding ID]'                     \
-    '(--monotonic --xlen --histogram)--3d'                                        \
+    '(--monotonic --xlen --histogram)--3d'                                              \
-    '--colormap[show a colormapped xy plot]'                                      \
+    '--colormap[show a colormapped xy plot]'                                            \
-    '--stream[Plot the data in realtime]::period in s:'                           \
+    '--stream[Plot the data in realtime]::period in s:'                                 \
-    '--lines'                                                                     \
+    '--lines'                                                                           \
-    '--points'                                                                    \
+    '--points'                                                                          \
-    '--circles'                                                                   \
+    '--circles'                                                                         \
-    '--xlabel:X-axis label:'                                                      \
+    '--xlabel:X-axis label:'                                                            \
-    '--ylabel:Y-axis label:'                                                      \
+    '--ylabel:Y-axis label:'                                                            \
-    '--y2label:Y2-axis label:'                                                    \
+    '--y2label:Y2-axis label:'                                                          \
-    '--zlabel:Z-axis label:'                                                      \
+    '--zlabel:Z-axis label:'                                                            \
-    '--zlabel:Z-axis label:'                                                      \
+    '--zlabel:Z-axis label:'                                                            \
-    '--title:Plot title:'                                                         \
+    '--title:Plot title:'                                                               \
-    '--autolegend[Label each plot with its data ID]'                              \
+    '--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:'                                                       \
+    '--xmin:min X:'                                                                     \
-    '(--xlen)--xmax:max X:'                                                       \
+    '--xmax:max X:'                                                                     \
-    '--ymin:min Y:'                                                               \
+    '--ymin:min Y:'                                                                     \
-    '--ymax:max Y:'                                                               \
+    '--ymax:max Y:'                                                                     \
-    '--y2min:min Y2:'                                                             \
+    '--y2min:min Y2:'                                                                   \
-    '--y2max:max Y2:'                                                             \
+    '--y2max:max Y2:'                                                                   \
-    '--zmin:min Z:'                                                               \
+    '--zmin:min Z:'                                                                     \
-    '--zmax:max Z:'                                                               \
+    '--zmax:max Z:'                                                                     \
-    '*--y2:plot to place on the Y2 axis:'                                         \
+    '*--y2:plot to place on the Y2 axis:'                                               \
-    '--curvestyleall[Additional styles for ALL curves]:style'                     \
+    '--curvestyleall[Additional styles for ALL curves]:'                                \
-    '*--extracmds[Additional gnuplot commands]:command'                           \
+    '*--extracmds[Additional gnuplot commands]:'                                        \
-    '--square[Plot data with square aspect ratio]'                                \
+    '--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]:filename'                                         \
+    '--hardcopy[Plot to a file]:'                                                       \
-    '--maxcurves[The maximum allowed number of curves]:number of curves'          \
+    '--maxcurves[The maximum allowed number of curves]:'                                \
-    '(--3d)--monotonic[Resets plot if an X in the past is seen]'                  \
+    '(--3d)--monotonic[Resets plot if an X in the past is seen]'                        \
-    '--extraValuesPerPoint[How many extra values are given for each data point]:N'\
+    '--extraValuesPerPoint[How many extra values are given for each data point]:'       \
-    '--dump[Instead of printing to gnuplot, print to STDOUT]'                     \
+    '--dump[Instead of printing to gnuplot, print to STDOUT]'                           \
-    '--geometry[The X11 geometry string]:geometry string:'                        \
+    '--geometry[The X11 geometry string]:geometry string:'                              \
-    '*--curvestyle[Additional styles for a curve]:curve id: :style:'              \
+    '*--curvestyle[Additional styles for a curve]:curve id: :style:'                    \
-    '(--3d)*--histogram:plot to treat as a histogram:'                            \
+    '(--3d)*--histogram:plot to treat as a histogram:'                                  \
-    '--binwidth:Histogram bin width:'                                             \
+    '--binwidth:Histogram bin width:'                                                   \
-    '--histstyle:Style of histogram:(frequency unique cumulative cnormal)'        \
+    '--histstyle:Style of histogram:(frequency unique cumulative cnormal)'              \
-    '--terminal:Terminal options to set with "set terminal":'                     \
+    '--terminal:Terminal options to set with "set terminal":'                           \
-    '*--legend[Legend for a curve]:curve id: :legend:'                            \
+    '*--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'

debian/changelog

@@ -0,0 +1,16 @@
+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), libtest-script-run-perl, perl
+Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
+Uploaders: Dima Kogan <dima@secretsauce.net>, Anton Gladky <gladk@debian.org>
+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
+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.pod > 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

t/00-load.t

@@ -0,0 +1,16 @@
+#!/usr/bin/perl
+
+# require a threaded perl for my tests. This block lifted verbatim from the cpantesters wiki
+BEGIN {
+  use Config;
+  if (! $Config{'useithreads'}) {
+    print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
+    exit(0);
+  }
+}
+
+use Test::More tests => 1;
+use Test::Script::Run;
+
+run_ok( 'feedgnuplot', ['--help'], 'feedgnuplot can run');
+