version bump

I have a native package at this point, so I'll make new tags ONLY when a new
packaged release is cut. If this ever changes, a watch file will be re-added

Changes

@@ -0,0 +1,70 @@
+feedgnuplot (1.22)
+
+  * removed --size option
+
+ -- Dima Kogan <dima@secretsauce.net>  Mon, 03 Sep 2012 08:33:26 -0700
+
+feedgnuplot (1.21)
+
+  * removed the POD from the script to its own file
+  * fixed regression to allow no given extracmds, histogram or y2
+    options
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 02 Sep 2012 23:52:21 -0700
+
+feedgnuplot (1.20)
+
+  * no longer hardcoding 'x11' as the default terminal
+  * added histogram support
+  * generic terminals can now be requested
+  * --extracmds, --histogram, --y2 can now take comma-separated lists
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 31 Aug 2012 01:35:50 -0700
+
+feedgnuplot (1.19)
+
+  * added --geometry option to specify plot dimensions
+
+ -- Dima Kogan <dima@secretsauce.net>  Sat, 11 Feb 2012 21:04:42 -0800
+
+feedgnuplot (1.18)
+
+  * data-ids can now include characters such as -. Any non-whitespace
+    works
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 27 Dec 2011 16:47:36 -0800
+
+feedgnuplot (1.17)
+
+  [ Dima Kogan ]
+  * POD: removed -Winteractive, since this was apparently a mawk-ism
+  * added zsh and bash completions
+
+  [ Hermann Schwarting ]
+  * add build dependency libtest-script-run-perl
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 20 Nov 2011 19:17:22 -0800
+
+feedgnuplot (1.16)
+
+  * Some POD fixes
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 11 Nov 2011 00:10:18 -0800
+
+feedgnuplot (1.15)
+
+  * Renamed main script from feedGnuplot to feedgnuplot
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 16 Oct 2011 11:58:15 -0700
+
+feedgnuplot (1.14)
+
+  * added 'clear' command, documented commands
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 22 May 2011 15:25:28 -0700
+
+feedgnuplot (1.13)
+
+  * Better streaming plot control
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 26 Apr 2011 14:24:09 -0700

INSTALL

@@ -1,8 +1,9 @@
 If running on a Debian-based OS (this includes Ubuntu), it is highly recommended
 to install this program as a package by doing
 
+   ln -fs package_definitions/debian debian
    dpkg-buildpackage -us -uc -b
-   sudo dpkg -i feedgnuplot*.deb
+   sudo dpkg -i ../feedgnuplot*.deb
 
 This builds a debian package and installs it.
 

LICENSE

@@ -0,0 +1,8 @@
+This library is distributed under the terms of the GNU GPL:
+
+http://www.gnu.org/licenses/gpl.html
+
+
+or the Artistic license:
+
+http://dev.perl.org/licenses/artistic.html

MANIFEST

@@ -4,3 +4,5 @@ bin/feedgnuplot
 bin/feedgnuplot.pod
 t/00-load.t
 t/manifest.t
+Changes
+LICENSE

Makefile.PL

@@ -4,14 +4,14 @@ use ExtUtils::MakeMaker;
 
 sub parseversion
 {
-# grab the version number from the debian changelog file. I look for lines line
+# grab the version number from the changelog. I look for lines line
 #
-# libpackage-perl (0.02) unstable; urgency=low
+# libpackage-perl (0.02)
 #
 # I parse out the 0.02 part
-  open DCH, 'debian/changelog' or die "Couldn't open debian/changelog";
+  open DCH, 'Changes' or die "Couldn't open 'Changes'";
   my ($version) = <DCH> =~ /^\S+ \s* \( ([0-9\.]+) \)/x
-    or die "Couldn't parse version from debian/changelog";
+    or die "Couldn't parse version from 'Changes'";
   close DCH;
 
   return $version;
@@ -29,6 +29,13 @@ sub MY::libscan
     return $self->SUPER::libscan ($file);
 }
 
+# I want my manpage to go into the man section '1', NOT '1p'. Here I add a
+# snippet to the end of the generated Makefile to force this
+sub MY::postamble
+{
+  return "MAN1EXT := 1\n";
+}
+
 
 WriteMakefile
   (

bin/feedgnuplot

@@ -104,7 +104,7 @@ sub interpretCommandline
              'circles', 'legend=s{2}', 'autolegend!', 'xlabel=s', 'ylabel=s', 'y2label=s', 'zlabel=s',
              'title=s', 'xlen=f', 'ymin=f', 'ymax=f', 'xmin=f', 'xmax=f', 'y2min=f', 'y2max=f',
              'zmin=f', 'zmax=f', 'y2=s@', 'curvestyle=s{2}', 'curvestyleall=s', 'extracmds=s@',
-             'size=s', 'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!',
+             'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!',
              'histogram=s@', 'binwidth=f', 'histstyle=s',
              'terminal=s',
              'extraValuesPerPoint=i', 'help', 'dump',
@@ -355,15 +355,13 @@ sub mainThread
       # set a square aspect ratio. Gnuplot does this differently for 2D and 3D plots
       if(! $options{'3d'})
       {
-        $options{size} = '' unless defined $options{size};
+        print(PIPE "set size ratio -1\n");
-        $options{size} .= ' ratio -1';
       }
       else
       {
         print(PIPE "set view equal xyz\n");
       }
     }
-    print(PIPE "set size $options{size}\n")                     if defined $options{size};
 
     if($options{square_xy})
     {

bin/feedgnuplot.pod

@@ -329,8 +329,6 @@ As an example, if line 3 of the input is "0 9 1 20"
                        for instance. Can be passed multiple times, or passed a comma-
                        separated list
 
-  --size  xxx          Gnuplot size option
-
   --square             Plot data with aspect ratio 1. For 3D plots, this controls the
                        aspect ratio for all 3 axes
 

completions/bash/feedgnuplot

@@ -27,7 +27,6 @@ complete -W                                     \
     --y2                                        \
     --curvestyleall                             \
     --extracmds                                 \
-    --size                                      \
     --square                                    \
     --square_xy                                 \
     --hardcopy                                  \

completions/zsh/_feedgnuplot

@@ -28,7 +28,6 @@ _arguments -S
     '*--y2:plot to place on the Y2 axis:'                                               \
     '--curvestyleall[Additional styles for ALL curves]:'                                \
     '*--extracmds[Additional gnuplot commands]:'                                        \
-    '--size[Gnuplot size option]:'                                                      \
     '--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]:'                                                       \

debian/changelog

@@ -1,3 +1,23 @@
+feedgnuplot (1.22-2) experimental; urgency=low
+
+  * added Anton Gladky as an Uploader
+  * added doc-base definition
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 14 Sep 2012 01:31:34 -0700
+
+feedgnuplot (1.22-1) experimental; urgency=low
+
+  * debianization split from the upstream source
+  * package now uploaded to Debian (Closes: #686413)
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 11 Sep 2012 11:32:30 -0700
+
+feedgnuplot (1.22) unstable; urgency=low
+
+  * removed --size option
+
+ -- Dima Kogan <dima@secretsauce.net>  Mon, 03 Sep 2012 08:33:26 -0700
+
 feedgnuplot (1.21) unstable; urgency=low
 
   * removed the POD from the script to its own file

debian/control

@@ -1,17 +1,20 @@
 Source: feedgnuplot
-Section: perl
+Section: science
-Priority: optional
+Priority: extra
-Build-Depends: debhelper (>= 7), libtest-script-run-perl
+Build-Depends: debhelper (>= 7.0.50~), libtest-script-run-perl, perl
-Build-Depends-Indep: perl
+Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-Maintainer: Dima Kogan <dima@secretsauce.net>
+Uploaders: Dima Kogan <dima@secretsauce.net>, Anton Gladky <gladky.anton@gmail.com>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 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
+DM-Upload-Allowed: yes
 
 Package: feedgnuplot
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, gnuplot
-Description: A pipe-oriented frontend to Gnuplot
+Description: Pipe-oriented frontend to Gnuplot
- This is a flexible, command-line-oriented frontend to Gnuplot. It creates
+ Flexible, command-line-oriented frontend to Gnuplot. Creates plots from data
- plots from data coming in on STDIN or given in a filename passed on the
+ coming in on STDIN or given in a filename passed on the commandline. Various
- commandline. Various data representations are supported, as is hardcopy
+ data representations are supported, as is hardcopy output and streaming display
- output and streaming display of live data.
+ of live data.

debian/copyright

@@ -1,13 +1,9 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Maintainer: Dima Kogan, <dima at secretsauce.net>
+Source: https://github.com/dkogan/feedgnuplot
-Source: http://search.cpan.org/dist/feedGnuplot/
+Upstream-Contact: Dima Kogan, <dima@secretsauce.net>
-Name: feedgnuplot
+Upstream-Name: feedgnuplot
 
 Files: *
-Copyright: Dima Kogan, <dima at secretsauce.net>
-License: 
-
-Files: debian/*
 Copyright: 2011, Dima Kogan <dima@secretsauce.net>
 License: Artistic or 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/gbp.conf

@@ -1,5 +1,7 @@
 [DEFAULT]
-upstream-tree = branch
+debian-branch = debian
-upstream-branch = master
+upstream-tree = tag
-debian-branch = master
+debian-tag = debian/%(version)s
-debian-tag = debian-%(version)s
+pristine-tar = False
+sign-tags = True
+sign-changelog = True

debian/rules

@@ -2,3 +2,11 @@
 
 %:
 	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

@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)

debian/watch

@@ -1,2 +1,2 @@
-version=3
+version = 3
-http://search.cpan.org/dist/feedGnuplot/   .*/feedgnuplot-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
+https://github.com/dkogan/feedgnuplot/tags .*/tarball/v(\d[\d\.]+)

package_definitions/debian/changelog

@@ -0,0 +1,118 @@
+feedgnuplot (1.23) unstable; urgency=low
+
+  * debian packaging cleanup
+  * package now uploaded to Debian (Closes: #686413)
+
+ -- Dima Kogan <dima@secretsauce.net>  Mon, 10 Sep 2012 20:47:40 -0700
+
+feedgnuplot (1.22) unstable; urgency=low
+
+  * removed --size option
+
+ -- Dima Kogan <dima@secretsauce.net>  Mon, 03 Sep 2012 08:33:26 -0700
+
+feedgnuplot (1.21) unstable; urgency=low
+
+  * removed the POD from the script to its own file
+  * fixed regression to allow no given extracmds, histogram or y2
+    options
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 02 Sep 2012 23:52:21 -0700
+
+feedgnuplot (1.20) unstable; urgency=low
+
+  * no longer hardcoding 'x11' as the default terminal
+  * added histogram support
+  * generic terminals can now be requested
+  * --extracmds, --histogram, --y2 can now take comma-separated lists
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 31 Aug 2012 01:35:50 -0700
+
+feedgnuplot (1.19) unstable; urgency=low
+
+  * added --geometry option to specify plot dimensions
+
+ -- Dima Kogan <dima@secretsauce.net>  Sat, 11 Feb 2012 21:04:42 -0800
+
+feedgnuplot (1.18) unstable; urgency=low
+
+  * data-ids can now include characters such as -. Any non-whitespace
+    works
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 27 Dec 2011 16:47:36 -0800
+
+feedgnuplot (1.17) unstable; urgency=low
+
+  [ Dima Kogan ]
+  * POD: removed -Winteractive, since this was apparently a mawk-ism
+  * added zsh and bash completions to the package
+
+  [ Hermann Schwarting ]
+  * add build dependency libtest-script-run-perl
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 20 Nov 2011 19:17:22 -0800
+
+feedgnuplot (1.16) unstable; urgency=low
+
+  * deb version parser now works for any package name
+  * Some POD fixes
+  * now building a native package
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 11 Nov 2011 00:10:18 -0800
+
+feedgnuplot (1.15-2) unstable; urgency=low
+
+  * added source format for the debianization
+  * added configuration to let git-buildpackage build this package
+  * standards bump to make lintian happier
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 23 Oct 2011 13:38:15 -0700
+
+feedgnuplot (1.15-1) unstable; urgency=low
+
+  * Renamed main script from feedGnuplot to feedgnuplot
+  * Slightly improved packaging, added instructions, etc
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 16 Oct 2011 11:58:15 -0700
+
+feedgnuplot (1.14-1) unstable; urgency=low
+
+  * New upstream release (added 'clear' command, documented commands)
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 22 May 2011 15:25:28 -0700
+
+feedgnuplot (1.13-1) unstable; urgency=low
+
+  * New upstream release (Better streaming plot control)
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 26 Apr 2011 14:24:09 -0700
+
+feedgnuplot (1.12-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 19 Apr 2011 11:02:23 -0700
+
+feedgnuplot (1.11-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Dima Kogan <dima@secretsauce.net>  Sat, 09 Apr 2011 14:10:21 -0700
+
+feedgnuplot (1.10-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Dima Kogan <dima@secretsauce.net>  Sat, 09 Apr 2011 14:08:06 -0700
+
+feedgnuplot (1.09-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 03 Apr 2011 17:23:38 -0700
+
+feedgnuplot (1.08-1) unstable; urgency=low
+
+  * Initial debianized release.
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 6 Feb 2011 15:58:22 -0800

package_definitions/debian/compat

@@ -0,0 +1 @@
+7

package_definitions/debian/control

@@ -0,0 +1,20 @@
+Source: feedgnuplot
+Section: science
+Priority: extra
+Build-Depends: debhelper (>= 7), libtest-script-run-perl, perl
+Maintainer: Dima Kogan <dima@secretsauce.net>
+Uploaders: Dima Kogan <dima@secretsauce.net>
+Standards-Version: 3.9.3
+Homepage: https://github.com/dkogan/feedgnuplot
+Vcs-Git: git://github.com/dkogan/feedgnuplot.git
+Vcs-Browser: https://github.com/dkogan/feedgnuplot
+DM-Upload-Allowed: yes
+
+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.

package_definitions/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'.

package_definitions/debian/feedgnuplot.install

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

package_definitions/debian/gbp.conf

@@ -0,0 +1,5 @@
+[DEFAULT]
+upstream-tree = branch
+upstream-branch = master
+debian-branch = master
+debian-tag = debian-%(version)s

package_definitions/debian/rules

@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@

package_definitions/debian/source/format

@@ -0,0 +1 @@
+3.0 (native)