[DRE-commits] [SCM] ruby-gruff.git branch, master, updated. debian/0.3.7-1
Gunnar Wolf
gwolf at gwolf.org
Wed Jun 26 16:14:43 UTC 2013
The following commit has been merged in the master branch:
commit d0fce25c351926e4a71d599f49a3ea7569de362c
Author: Gunnar Wolf <gwolf at gwolf.org>
Date: Wed Jun 26 11:11:03 2013 -0500
New upstream release
* New upstream release
* Drop patches that have been incorporated upstream: fix_division_by_0,
remove_obsolete_call_from_test_line, sort_needed_for_test_scene.
* Standards-version 3.9.3 → 3.9.4 (no changes needed)
* Drop transitional binary packages
diff --git a/debian/changelog b/debian/changelog
index 5c21594..e8973f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-ruby-gruff (0.3.6-7) UNRELEASED; urgency=low
+ruby-gruff (0.3.7-1) unstable; urgency=low
+
+ [ Cédric Boutillier ]
* Team upload
* debian/patch/drop_require_rubygems: add DEP-3 header
@@ -9,7 +11,15 @@ ruby-gruff (0.3.6-7) UNRELEASED; urgency=low
* Override lintian warning about duplicate description of transitional
packages
- -- Cédric Boutillier <cedric.boutillier at gmail.com> Wed, 04 Jul 2012 17:15:13 +0200
+ [ Gunnar Wolf ]
+
+ * New upstream release
+ * Drop patches that have been incorporated upstream: fix_division_by_0,
+ remove_obsolete_call_from_test_line, sort_needed_for_test_scene.
+ * Standards-version 3.9.3 → 3.9.4 (no changes needed)
+ * Drop transitional binary packages
+
+ -- Gunnar Wolf <gwolf at debian.org> Wed, 26 Jun 2013 11:00:12 -0500
ruby-gruff (0.3.6-6) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b479c33..0561404 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Uploaders: Gunnar Wolf <gwolf at debian.org>
Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.6~), ruby-rmagick, ghostscript
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-gruff.git
Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-gruff.git;a=summary
Homepage: http://nubyonrails.com/pages/gruff
@@ -14,38 +14,7 @@ Package: ruby-gruff
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-rmagick
-Replaces: libgruff-ruby (<< 0.3.6-4~), libgruff-ruby-doc (<< 0.3.6-4~), libgruff-ruby1.8 (<< 0.3.6-4~)
-Breaks: libgruff-ruby (<< 0.3.6-4~), libgruff-ruby-doc (<< 0.3.6-4~), libgruff-ruby1.8 (<< 0.3.6-4~)
-Provides: libgruff-ruby, libgruff-ruby-doc, libgruff-ruby1.8
Description: Ruby library to create beautiful graphs for one or multiple datasets
This Ruby library can generate beautiful graphs for one or multiple datasets
to be included in websites or in documents. The library can be used alone or
with Ruby on Rails.
-
-# Transitional packages
-Package: libgruff-ruby
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends}, ruby-gruff
-Description: Transitional package for ruby-gruff
- This is a transitional package to ease upgrades to the ruby-gruff
- package. It can safely be removed.
-
-Package: libgruff-ruby-doc
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends}, ruby-gruff
-Description: Transitional package for ruby-gruff
- This is a transitional package to ease upgrades to the ruby-gruff
- package. It can safely be removed.
-
-Package: libgruff-ruby1.8
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends}, ruby-gruff
-Description: Transitional package for ruby-gruff
- This is a transitional package to ease upgrades to the ruby-gruff
- package. It can safely be removed.
diff --git a/debian/patches/drop_require_rubygems b/debian/patches/drop_require_rubygems
index bb6bf68..59382ee 100644
--- a/debian/patches/drop_require_rubygems
+++ b/debian/patches/drop_require_rubygems
@@ -4,19 +4,22 @@ Forwarded: not-needed
Index: ruby-gruff/lib/gruff/base.rb
===================================================================
---- ruby-gruff.orig/lib/gruff/base.rb 2011-08-12 16:36:06.000000000 -0500
-+++ ruby-gruff/lib/gruff/base.rb 2011-09-28 10:22:22.000000000 -0500
+--- ruby-gruff.orig/lib/gruff/base.rb 2013-06-26 11:04:40.000000000 -0500
++++ ruby-gruff/lib/gruff/base.rb 2013-06-26 11:04:40.000000000 -0500
@@ -1,4 +1,3 @@
-require 'rubygems'
require 'RMagick'
+ require 'bigdecimal'
- require File.dirname(__FILE__) + '/deprecated'
Index: ruby-gruff/Rakefile
===================================================================
---- ruby-gruff.orig/Rakefile 2011-08-12 16:36:06.000000000 -0500
-+++ ruby-gruff/Rakefile 2011-09-28 10:23:10.000000000 -0500
-@@ -1,4 +1,3 @@
--require 'rubygems'
- require 'hoe'
- $:.unshift(File.dirname(__FILE__) + "/lib")
- require 'gruff'
+--- ruby-gruff.orig/Rakefile 2013-06-26 11:04:40.000000000 -0500
++++ ruby-gruff/Rakefile 2013-06-26 11:04:57.000000000 -0500
+@@ -1,5 +1,5 @@
+-require "rubygems"
+-require "bundler/gem_tasks"
++#require "rubygems"
++#require "bundler/gem_tasks"
+ require 'rake/testtask'
+
+ require 'rake/clean'
diff --git a/debian/patches/fix_division_by_0 b/debian/patches/fix_division_by_0
deleted file mode 100644
index ad17546..0000000
--- a/debian/patches/fix_division_by_0
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix division by zero errors with Ruby1.9
-Author: Serge Prikha <prikha at gmail.com>
-Origin: https://github.com/prikha/gruff/commit/f5098443aba86fc59b02eace6ecad7530d72694b
-Reviewed-by: Cédric Boutillier <cedric.boutillier at gmail.com>
-Applied-Upstream: yes
-Bug: https://github.com/topfunky/gruff/issues/21
-Bug-Debian: http://bugs.debian.org/676206
-Last-Update: 2012-06-06
-
-
----
- lib/gruff/base.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/lib/gruff/base.rb
-+++ b/lib/gruff/base.rb
-@@ -1062,7 +1062,7 @@
- # Return a formatted string representing a number value that should be
- # printed as a label.
- def label(value)
-- label = if (@spread.to_f % @marker_count.to_f == 0) || !@y_axis_increment.nil?
-+ label = if (@spread.to_f % (@marker_count.to_f==0 ? 1 : @marker_count.to_f) == 0) || !@y_axis_increment.nil?
- value.to_i.to_s
- elsif @spread > 10.0
- sprintf("%0i", value)
diff --git a/debian/patches/remove_obsolete_call_from_test_line b/debian/patches/remove_obsolete_call_from_test_line
deleted file mode 100644
index 26b89e6..0000000
--- a/debian/patches/remove_obsolete_call_from_test_line
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Gunnar Wolf <gwolf at debian.org>
-Last-Update: 2011-08-12
-Forwarded: https://github.com/topfunky/gruff/pull/13 (pull request on github)
-Description: test_line test case invokes a nonexisting method - Remove it
- This patch removes only one line. This method's name is not found
- anywhere in the source tree, and it seems to me it's just a leftover
- dropped from the API.
-
-Index: ruby-gruff/test/test_line.rb
-===================================================================
---- ruby-gruff.orig/test/test_line.rb 2011-08-12 17:29:15.000000000 -0500
-+++ ruby-gruff/test/test_line.rb 2011-08-12 17:29:32.000000000 -0500
-@@ -462,7 +462,6 @@
- g.legend_font_size = 12
- g.marker_font_size = 16
- g.hide_dots = false
-- g.label_max_decimals = 1
-
- g.write('test/output/line_jruby_error.png')
- end
diff --git a/debian/patches/series b/debian/patches/series
index 005f581..16f1703 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
drop_require_rubygems
-remove_obsolete_call_from_test_line
-sort_needed_for_test_scene
-fix_division_by_0
diff --git a/debian/patches/sort_needed_for_test_scene b/debian/patches/sort_needed_for_test_scene
deleted file mode 100644
index c14bcfd..0000000
--- a/debian/patches/sort_needed_for_test_scene
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Gunnar Wolf <gwolf at debian.org>
-Last-Update: 2011-08-12
-Forwarded: https://github.com/topfunky/gruff/pull/13 (pull request on github)
-Description: Two methods in Gruff's scene/layers handling need sorting filenames
- The methods rely on the directory listing to be sorted
- alphabetically. This is not always the case - This patch fixes it.
-
-Index: ruby-gruff/lib/gruff/scene.rb
-===================================================================
---- ruby-gruff.orig/lib/gruff/scene.rb 2011-08-12 17:07:46.000000000 -0500
-+++ ruby-gruff/lib/gruff/scene.rb 2011-08-12 17:08:02.000000000 -0500
-@@ -133,7 +133,7 @@
- def initialize(base_dir, folder_name)
- @base_dir = base_dir.to_s
- @name = folder_name.to_s
-- @filenames = Dir.open(File.join(base_dir, folder_name)).entries.select { |file| file =~ /^[^.]+\.png$/ }
-+ @filenames = Dir.open(File.join(base_dir, folder_name)).entries.select { |file| file =~ /^[^.]+\.png$/ }.sort
- @selected_filename = select_default
- end
-
-Index: ruby-gruff/test/test_scene.rb
-===================================================================
---- ruby-gruff.orig/test/test_scene.rb 2011-08-12 17:07:46.000000000 -0500
-+++ ruby-gruff/test/test_scene.rb 2011-08-12 17:08:03.000000000 -0500
-@@ -51,7 +51,7 @@
-
- def test_layer
- l = LayerStub.new(File.expand_path("../assets/city_scene", File.dirname(__FILE__)), "clouds")
-- assert_equal %w(cloudy.png partly_cloudy.png stormy.png), l.filenames
-+ assert_equal %w(cloudy.png partly_cloudy.png stormy.png), l.filenames.sort
-
- l = LayerStub.new(File.expand_path("../assets/city_scene", File.dirname(__FILE__)), "grass")
- assert_equal 'default.png', l.selected_filename
--
ruby-gruff.git
More information about the Pkg-ruby-extras-commits
mailing list