[DRE-commits] [SCM] ruby-gnuplot.git branch, master, updated. upstream/2.3.6-14-gbb5f0df

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit ed7c47c678681d4dfa8f266d2aa5baa34aaa49b1
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon Jun 11 00:07:56 2012 +0200

    Refresh fix-tests.patch

diff --git a/debian/patches/fix-tests.patch b/debian/patches/fix-tests.patch
index dcceb46..1e4dd22 100644
--- a/debian/patches/fix-tests.patch
+++ b/debian/patches/fix-tests.patch
@@ -2,17 +2,17 @@ Description: Fix tests so that they can run non-interactively
 Author: Lucas Nussbaum <lucas at debian.org>
 Origin: vendor
 Forwarded: not-needed
-Last-Update: 2011-06-04
+Last-Update: 2012-06-11
 
---- ruby-gnuplot-2.3.6.orig/test/sinwave.rb
-+++ ruby-gnuplot-2.3.6/test/sinwave.rb
+--- a/test/sinwave.rb
++++ b/test/sinwave.rb
 @@ -1,4 +1,4 @@
 -require '../lib/gnuplot'
 +require 'gnuplot'
  
  Gnuplot.open do |gp|
    Gnuplot::Plot.new( gp ) do |plot|
-@@ -7,6 +7,7 @@ Gnuplot.open do |gp|
+@@ -7,6 +7,7 @@
      plot.title  "Sin Wave Example"
      plot.ylabel "x"
      plot.xlabel "sin(x)"
@@ -20,15 +20,15 @@ Last-Update: 2011-06-04
      
      plot.data << Gnuplot::DataSet.new( "sin(x)" ) do |ds|
        ds.with = "lines"
---- ruby-gnuplot-2.3.6.orig/test/multtest.rb
-+++ ruby-gnuplot-2.3.6/test/multtest.rb
+--- a/test/multtest.rb
++++ b/test/multtest.rb
 @@ -1,4 +1,4 @@
 -require '../lib/gnuplot'
 +require 'gnuplot'
  
  # File.open( "gnuplot.dat", "w") do |gp|
  Gnuplot.open do |gp|
-@@ -8,6 +8,7 @@ Gnuplot.open do |gp|
+@@ -8,6 +8,7 @@
      plot.title  "Sin Wave Example"
      plot.ylabel "x"
      plot.xlabel "sin(x)"
@@ -36,15 +36,15 @@ Last-Update: 2011-06-04
      
      x = (0..50).collect { |v| v.to_f }
      y = x.collect { |v| v ** 2 }
---- ruby-gnuplot-2.3.6.orig/test/arrtest.rb
-+++ ruby-gnuplot-2.3.6/test/arrtest.rb
+--- a/test/arrtest.rb
++++ b/test/arrtest.rb
 @@ -1,4 +1,4 @@
 -require '../lib/gnuplot'
 +require 'gnuplot'
  
  Gnuplot.open do |gp|
    Gnuplot::Plot.new( gp ) do |plot|
-@@ -6,6 +6,7 @@ Gnuplot.open do |gp|
+@@ -6,6 +6,7 @@
      plot.title  "Array Plot Example"
      plot.ylabel "x"
      plot.xlabel "x^2"
@@ -52,15 +52,15 @@ Last-Update: 2011-06-04
      
      x = (0..50).collect { |v| v.to_f }
      y = x.collect { |v| v ** 2 }
---- ruby-gnuplot-2.3.6.orig/test/histtest.rb
-+++ ruby-gnuplot-2.3.6/test/histtest.rb
+--- a/test/histtest.rb
++++ b/test/histtest.rb
 @@ -1,4 +1,4 @@
 -require '../lib/gnuplot'
 +require 'gnuplot'
  
  Gnuplot.open do |gp|
      gp << "bin(x, s) = s*int(x/s)\n"
-@@ -7,6 +7,7 @@ Gnuplot.open do |gp|
+@@ -7,6 +7,7 @@
  	plot.title  "Histogram"
  	plot.xlabel "x"
  	plot.ylabel "frequency"
@@ -68,8 +68,8 @@ Last-Update: 2011-06-04
  
  	x = (0..500).collect { |v| (rand()-0.5)**3 }
  	plot.data << Gnuplot::DataSet.new( [x] ) do |ds|
---- ruby-gnuplot-2.3.6.orig/test/test_gnuplot.rb
-+++ ruby-gnuplot-2.3.6/test/test_gnuplot.rb
+--- a/test/test_gnuplot.rb
++++ b/test/test_gnuplot.rb
 @@ -1,6 +1,6 @@
  # -*- ruby -*-
  
@@ -78,39 +78,58 @@ Last-Update: 2011-06-04
  require 'test/unit'
  
  class StdDataTest < Test::Unit::TestCase
---- ruby-gnuplot-2.3.6.orig/examples/discrete_points.rb
-+++ ruby-gnuplot-2.3.6/examples/discrete_points.rb
-@@ -6,6 +6,7 @@ Gnuplot.open do |gp|
+--- a/examples/discrete_points.rb
++++ b/examples/discrete_points.rb
+@@ -6,7 +6,8 @@
      plot.title  "Array Plot Example"
-     plot.ylabel "x"
-     plot.xlabel "x^2"
+     plot.ylabel "x^2"
+     plot.xlabel "x"
+-    
 +    plot.set "terminal", "dumb"
-     
++
      x = (0..50).collect { |v| v.to_f }
      y = x.collect { |v| v ** 2 }
---- ruby-gnuplot-2.3.6.orig/examples/multiple_data_sets.rb
-+++ ruby-gnuplot-2.3.6/examples/multiple_data_sets.rb
-@@ -7,6 +7,7 @@ Gnuplot.open do |gp|
+ 
+--- a/examples/multiple_data_sets.rb
++++ b/examples/multiple_data_sets.rb
+@@ -7,6 +7,7 @@
      plot.title  "Sin Wave Example"
-     plot.ylabel "x"
-     plot.xlabel "sin(x)"
+     plot.ylabel "sin(x)"
+     plot.xlabel "x"
 +    plot.set "terminal", "dumb"
      
      x = (0..50).collect { |v| v.to_f }
      y = x.collect { |v| v ** 2 }
---- ruby-gnuplot-2.3.6.orig/examples/sin_wave.rb
-+++ ruby-gnuplot-2.3.6/examples/sin_wave.rb
-@@ -7,6 +7,7 @@ Gnuplot.open do |gp|
+--- a/examples/sin_wave.rb
++++ b/examples/sin_wave.rb
+@@ -7,6 +7,7 @@
      plot.title  "Sin Wave Example"
-     plot.ylabel "x"
-     plot.xlabel "sin(x)"
+     plot.ylabel "sin(x)"
+     plot.xlabel "x"
 +    plot.terminal "dumb"
      
      plot.data << Gnuplot::DataSet.new( "sin(x)" ) do |ds|
        ds.with = "lines"
-@@ -14,4 +15,4 @@ Gnuplot.open do |gp|
-     end
+@@ -15,4 +16,4 @@
+     
+   end
+   sleep 10
+-end
+\ No newline at end of file
++end
+--- a/examples/histogram.rb
++++ b/examples/histogram.rb
+@@ -6,6 +6,7 @@
+     plot.title  "Histogram example"
+     plot.style  "data histograms"
+     plot.xtics  "nomirror rotate by -45"
++    plot.terminal "dumb"
      
+     titles = %w{decade Austria Hungary  Belgium} 
+     data = [
+@@ -29,4 +30,4 @@
+     end
+   
    end
 -end
 \ No newline at end of file

-- 
ruby-gnuplot.git