[DRE-commits] [SCM] rails-2.3.git branch, debian-sid, updated. 0288d3496b551d2b35d0233f10713cb4d65bf2d6

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 8252803d6c864cf2cdb28496d64b01e32d4d339d
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Jun 7 16:22:17 2011 +0200

    Add rails and rails_generator symlinks to railties subdirectory

diff --git a/debian/ruby-rails-2.3.dirs b/debian/ruby-rails-2.3.dirs
index 0aa6395..1d1a444 100644
--- a/debian/ruby-rails-2.3.dirs
+++ b/debian/ruby-rails-2.3.dirs
@@ -1,2 +1,2 @@
-/usr/lib/rails/bin
+/usr/lib/ruby/vendor_ruby/railties/
 /usr/lib/ruby/vendor_ruby/railties/lib/
diff --git a/debian/ruby-rails-2.3.links b/debian/ruby-rails-2.3.links
index 4a0623c..0640a06 100644
--- a/debian/ruby-rails-2.3.links
+++ b/debian/ruby-rails-2.3.links
@@ -1 +1,3 @@
 /usr/share/javascript/prototype/prototype.js /usr/lib/ruby/vendor_ruby/railties/html/javascripts/prototype.js
+/usr/lib/ruby/vendor_ruby/rails /usr/lib/ruby/vendor_ruby/railties/lib/rails
+/usr/lib/ruby/vendor_ruby/rails_generator /usr/lib/ruby/vendor_ruby/railties/lib/rails_generator
diff --git a/debian/rules b/debian/rules
index 2936b8f..3182168 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,13 +37,6 @@ override_dh_install:
 	# Move all *.rb files from vendor_ruby to railties/lib/
 	mv $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/*.rb \
 	   $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/lib/
-	# But move some files back
-	for f in rails_generator.rb railties_path.rb; do
-		mv $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/lib/${f} \
-		   $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/
-	done
-	# Make rails binaries executable
-	find $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/bin/ -type f -exec chmod 755 {} \;
 
 override_dh_link:
 	rm $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/html/javascripts/prototype.js

-- 
rails-2.3.git