[DRE-commits] [SCM] redmine.git branch, master-stable, updated. debian/1.4.4+dfsg1-1-7-gb57617f

[Ondřej Surý]

The following commit has been merged in the master-stable branch:
commit c6c30d68d3ece16cd0ce69401ee917f8450b4e5e
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Feb 26 09:09:48 2013 +0100

    Fix missing ParseDate when run with ruby1.9.x (Closes: #700754)

diff --git a/debian/patches/2018_Parsedate.parsedate.patch b/debian/patches/2018_Parsedate.parsedate.patch
new file mode 100644
index 0000000..fb50b29
--- /dev/null
+++ b/debian/patches/2018_Parsedate.parsedate.patch
@@ -0,0 +1,24 @@
+--- a/lib/SVG/Graph/Schedule.rb
++++ b/lib/SVG/Graph/Schedule.rb
+@@ -159,8 +159,7 @@ module SVG
+           if im3 == 0
+             y << data[:data][i]
+           else
+-            arr = ParseDate.parsedate( data[:data][i] )
+-            t = Time.local( *arr[0,6].compact )
++            t = DateTime.parse( data[:data][i] ).to_time
+             (im3 == 1 ? x_start : x_end) << t.to_i
+           end
+         }
+--- a/lib/SVG/Graph/TimeSeries.rb
++++ b/lib/SVG/Graph/TimeSeries.rb
+@@ -157,8 +157,7 @@ module SVG
+         y = []
+         data[:data].each_index {|i|
+           if i%2 == 0
+-            arr = ParseDate.parsedate( data[:data][i] )
+-            t = Time.local( *arr[0,6].compact )
++            t = DateTime.parse( data[:data][i] ).to_time
+             x << t.to_i
+           else
+             y << data[:data][i]
diff --git a/debian/patches/series b/debian/patches/series
index e713198..d7c4d9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 2008_force_table_encoding_mysql.patch
 2009_FHS_thin_config.patch
 2017_Gemfile_debian.patch
+2018_Parsedate.parsedate.patch

-- 
redmine.git