[DRE-commits] [redmine] 01/02: Ensure 1001 patch doesn't fail on optional require parsedate.

[Jérémy Lal]

This is an automated email from the git hooks/post-receive script.

kapouer pushed a commit to branch master-stable
in repository redmine.

commit bc3cdc14bd43617c03e10532179b9a6920e80829
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue Oct 1 00:19:36 2013 +0200

    Ensure 1001 patch doesn't fail on optional require parsedate.
---
 debian/patches/1001_Parsedate.parsedate.patch |   26 ++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/patches/1001_Parsedate.parsedate.patch b/debian/patches/1001_Parsedate.parsedate.patch
index fb70763..3ecfbf2 100644
--- a/debian/patches/1001_Parsedate.parsedate.patch
+++ b/debian/patches/1001_Parsedate.parsedate.patch
@@ -1,10 +1,20 @@
 Description: Use DateTime.parse for ruby1.9, ParseDate.parsedate for ruby1.8 (Closes: #700754)
 Origin: upstream, http://www.redmine.org/projects/redmine/repository/revisions/10439
 Origin: upstream, http://www.redmine.org/projects/redmine/repository/revisions/11091
-Last-Update: 2013-06-10
+Last-Update: 2013-10-01
 --- a/lib/SVG/Graph/Schedule.rb
 +++ b/lib/SVG/Graph/Schedule.rb
-@@ -159,8 +159,13 @@
+@@ -1,5 +1,8 @@
+ require 'SVG/Graph/Plot'
+-require 'parsedate'
++begin
++  require 'parsedate'
++rescue LoadError
++end
+ 
+ module SVG
+   module Graph
+@@ -159,8 +162,13 @@
            if im3 == 0
              y << data[:data][i]
            else
@@ -22,7 +32,17 @@ Last-Update: 2013-06-10
          }
 --- a/lib/SVG/Graph/TimeSeries.rb
 +++ b/lib/SVG/Graph/TimeSeries.rb
-@@ -157,8 +157,13 @@
+@@ -1,5 +1,8 @@
+ require 'SVG/Graph/Plot'
+-require 'parsedate'
++begin
++  require 'parsedate'
++rescue LoadError
++end
+ 
+ module SVG
+   module Graph
+@@ -157,8 +160,13 @@
          y = []
          data[:data].each_index {|i|
            if i%2 == 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git