[DRE-commits] [SCM] rails-2.3.git branch, debian-sid, updated. debian/2.3.11-1-13-g64251bf

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 8d206b8d9b8b6dcc9ab94da3dadeee4f28b9e230
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Aug 22 18:41:42 2011 +0200

    Set absolute path to fresh_rakefile and README; the ../../../ doesn't work when symlinked

diff --git a/debian/patches/0005-set_absolute_path_in_app_generator.patch b/debian/patches/0005-set_absolute_path_in_app_generator.patch
new file mode 100644
index 0000000..77b32ba
--- /dev/null
+++ b/debian/patches/0005-set_absolute_path_in_app_generator.patch
@@ -0,0 +1,18 @@
+--- a/lib/rails_generator/generators/applications/app/app_generator.rb
++++ b/lib/rails_generator/generators/applications/app/app_generator.rb
+@@ -9,7 +9,7 @@ class AppGenerator < Rails::Generator::B
+   DATABASES        = %w( mysql oracle postgresql sqlite2 sqlite3 frontbase ibm_db )
+   DEFAULT_DATABASE = 'sqlite3'
+ 
+-  mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.."
++  mandatory_options :source => "/usr/lib/ruby/vendor_ruby/railties/"
+   default_options   :db => (ENV["RAILS_DEFAULT_DATABASE"] || DEFAULT_DATABASE),
+     :shebang => DEFAULT_SHEBANG, :with_dispatchers => false, :freeze => false
+ 
+@@ -263,4 +263,4 @@ class AppGenerator < Rails::Generator::B
+         "/opt/lampp/var/mysql/mysql.sock"         # xampp for linux
+       ].find { |f| File.exist?(f) } unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
+     end
+-end
+\ No newline at end of file
++end
diff --git a/debian/patches/series b/debian/patches/series
index a675b0c..9538610 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-remove_require_rubygems.patch
 0003-change_default_listen_address.patch
 0004-dont_recommend_very_bad_things.patch
+0005-set_absolute_path_in_app_generator.patch

-- 
rails-2.3.git