[DRE-commits] r2950 - packages-wip/redmine/trunk/debian/patches

[rnhurt-guest at alioth.debian.org]

Author: rnhurt-guest
Date: 2008-08-18 17:05:47 +0000 (Mon, 18 Aug 2008)
New Revision: 2950

Modified:
   packages-wip/redmine/trunk/debian/patches/dispatch.patch
Log:
Corrected the quilt patches so they work with the new build structure.


Modified: packages-wip/redmine/trunk/debian/patches/dispatch.patch
===================================================================
--- packages-wip/redmine/trunk/debian/patches/dispatch.patch	2008-08-18 15:32:52 UTC (rev 2949)
+++ packages-wip/redmine/trunk/debian/patches/dispatch.patch	2008-08-18 17:05:47 UTC (rev 2950)
@@ -1,31 +1,9 @@
-Index: redmine-0.7.4~1/public/dispatch.fcgi.example
-===================================================================
---- redmine-0.7.4~1.orig/public/dispatch.fcgi.example	2008-08-15 14:29:29.000000000 -0400
-+++ redmine-0.7.4~1/public/dispatch.fcgi.example	2008-08-15 14:33:27.000000000 -0400
+--- a/public/dispatch.cgi.example
++++ b/public/dispatch.cgi.example
 @@ -1,4 +1,4 @@
 -#!/usr/bin/ruby
 +#!/usr/bin/env ruby
- #
- # You may specify the path to the FastCGI crash log (a log of unhandled
- # exceptions which forced the FastCGI instance to exit, great for debugging)
-@@ -18,7 +18,8 @@
- #   # Custom log path, normal GC behavior.
- #   RailsFCGIHandler.process! '/var/log/myapp_fcgi_crash.log'
- #
--require File.dirname(__FILE__) + "/../config/environment"
-+RAILS_ROOT = "/usr/share/redmine"
-+require "/usr/share/redmine/config/environment"
- require 'fcgi_handler'
  
- RailsFCGIHandler.process!
-Index: redmine-0.7.4~1/public/dispatch.cgi.example
-===================================================================
---- redmine-0.7.4~1.orig/public/dispatch.cgi.example	2008-08-15 14:31:46.000000000 -0400
-+++ redmine-0.7.4~1/public/dispatch.cgi.example	2008-08-15 14:31:51.000000000 -0400
-@@ -1,4 +1,4 @@
--#!/usr/bin/ruby
-+#!/usr/bin/env ruby
- 
  require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
  
 @@ -7,4 +7,4 @@
@@ -35,10 +13,8 @@
 -Dispatcher.dispatch
 \ No newline at end of file
 +Dispatcher.dispatch
-Index: redmine-0.7.4~1/public/dispatch.rb.example
-===================================================================
---- redmine-0.7.4~1.orig/public/dispatch.rb.example	2008-08-15 14:31:54.000000000 -0400
-+++ redmine-0.7.4~1/public/dispatch.rb.example	2008-08-15 14:32:00.000000000 -0400
+--- a/public/dispatch.rb.example
++++ b/public/dispatch.rb.example
 @@ -1,4 +1,4 @@
 -#!/usr/bin/ruby
 +#!/usr/bin/env ruby
@@ -52,3 +28,21 @@
 -Dispatcher.dispatch
 \ No newline at end of file
 +Dispatcher.dispatch
+--- a/public/dispatch.fcgi.example
++++ b/public/dispatch.fcgi.example
+@@ -1,4 +1,4 @@
+-#!/usr/bin/ruby
++#!/usr/bin/env ruby
+ #
+ # You may specify the path to the FastCGI crash log (a log of unhandled
+ # exceptions which forced the FastCGI instance to exit, great for debugging)
+@@ -18,7 +18,7 @@
+ #   # Custom log path, normal GC behavior.
+ #   RailsFCGIHandler.process! '/var/log/myapp_fcgi_crash.log'
+ #
+-require File.dirname(__FILE__) + "/../config/environment"
+-require 'fcgi_handler'
++RAILS_ROOT = "/usr/share/redmine"
++require "/usr/share/redmine/config/environment"
+ 
+ RailsFCGIHandler.process!