Bug#711551: pu: package redmine/1.4.4+dfsg1-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
1.4.4+dfsg1-2+deb7u1 backports upstream fixes.
See attached debdiff (containing only two quilt patches).
Thank you.
Jérémy.
diff -Nru redmine-1.4.4+dfsg1/debian/changelog redmine-1.4.4+dfsg1/debian/changelog
--- redmine-1.4.4+dfsg1/debian/changelog 2013-01-19 15:54:09.000000000 +0100
+++ redmine-1.4.4+dfsg1/debian/changelog 2013-06-07 21:09:16.000000000 +0200
@@ -1,3 +1,12 @@
+redmine (1.4.4+dfsg1-2+deb7u1) proposed-updates; urgency=low
+
+ [ Ondřej Surý ]
+ * Pull upstream fixes for Ruby 1.9 as default interpreter:
+ + Replace missing ParseDate with DateTime (Closes: #700754)
+ + Fix broken REST API (Closes: #700009)
+
+ -- Jérémy Lal <kapouer@melix.org> Fri, 07 Jun 2013 21:09:13 +0200
+
redmine (1.4.4+dfsg1-2) unstable; urgency=low
* Manage and set dbuser default value like dbname. (Closes: #695774)
diff -Nru redmine-1.4.4+dfsg1/debian/patches/1001_Parsedate.parsedate.patch redmine-1.4.4+dfsg1/debian/patches/1001_Parsedate.parsedate.patch
--- redmine-1.4.4+dfsg1/debian/patches/1001_Parsedate.parsedate.patch 1970-01-01 01:00:00.000000000 +0100
+++ redmine-1.4.4+dfsg1/debian/patches/1001_Parsedate.parsedate.patch 2013-05-11 16:27:48.000000000 +0200
@@ -0,0 +1,28 @@
+Description: Replace missing ParseDate with DateTime (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-02-26
+--- 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 -Nru redmine-1.4.4+dfsg1/debian/patches/1002_REST_API_ruby1.9.3.patch redmine-1.4.4+dfsg1/debian/patches/1002_REST_API_ruby1.9.3.patch
--- redmine-1.4.4+dfsg1/debian/patches/1002_REST_API_ruby1.9.3.patch 1970-01-01 01:00:00.000000000 +0100
+++ redmine-1.4.4+dfsg1/debian/patches/1002_REST_API_ruby1.9.3.patch 2013-05-11 16:27:48.000000000 +0200
@@ -0,0 +1,14 @@
+Description: Fix broken REST API (Closes: #700009)
+Origin: upstream, http://www.redmine.org/projects/redmine/repository/revisions/10299
+Last-Update: 2013-02-26
+--- a/lib/redmine/views/builders/xml.rb
++++ b/lib/redmine/views/builders/xml.rb
+@@ -29,7 +29,7 @@ module Redmine
+ end
+
+ def method_missing(sym, *args, &block)
+- if args.size == 1 && args.first.is_a?(Time)
++ if args.size == 1 && args.first.is_a?(::Time)
+ __send__ sym, args.first.xmlschema, &block
+ else
+ super
diff -Nru redmine-1.4.4+dfsg1/debian/patches/series redmine-1.4.4+dfsg1/debian/patches/series
--- redmine-1.4.4+dfsg1/debian/patches/series 2013-01-19 11:33:48.000000000 +0100
+++ redmine-1.4.4+dfsg1/debian/patches/series 2013-05-11 16:27:48.000000000 +0200
@@ -5,3 +5,5 @@
2008_force_table_encoding_mysql.patch
2009_FHS_thin_config.patch
2017_Gemfile_debian.patch
+1001_Parsedate.parsedate.patch
+1002_REST_API_ruby1.9.3.patch
Reply to: