[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 93a2e476fea3807a0f3ff6e23105eb2a76a9fd21
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Jun 7 16:07:55 2011 +0200

    Also install rest of railties not handled by gem2deb

diff --git a/debian/ruby-rails-2.3.dirs b/debian/ruby-rails-2.3.dirs
index d94a2a2..0aa6395 100644
--- a/debian/ruby-rails-2.3.dirs
+++ b/debian/ruby-rails-2.3.dirs
@@ -1 +1,2 @@
 /usr/lib/rails/bin
+/usr/lib/ruby/vendor_ruby/railties/lib/
diff --git a/debian/ruby-rails-2.3.install b/debian/ruby-rails-2.3.install
index a7e935e..42eb350 100644
--- a/debian/ruby-rails-2.3.install
+++ b/debian/ruby-rails-2.3.install
@@ -1 +1,7 @@
-debian/ruby-rails-2.3/usr/bin/* /usr/lib/rails/bin/
+builtin usr/lib/ruby/vendor_ruby/railties/
+configs usr/lib/ruby/vendor_ruby/railties/
+dispatches usr/lib/ruby/vendor_ruby/railties/
+doc usr/lib/ruby/vendor_ruby/railties/
+fresh_rakefile usr/lib/ruby/vendor_ruby/railties/
+helpers usr/lib/ruby/vendor_ruby/railties/
+html usr/lib/ruby/vendor_ruby/railties/
diff --git a/debian/rules b/debian/rules
index 681c064..8b61868 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,8 +23,23 @@ debian/control: debian/control.in
 	sed -e "s/@RAILS_VERSION@/$(RAILS_VERSION)/" >$@ <$<
 
 override_dh_install:
-	# Move /usr/bin/* to /usr/lib/rails/bin/
+	# Move /usr/bin/* to railties/bin/
 	dh_install -O--buildsystem=ruby
-	rm -rf $(CURDIR)/debian/ruby-rails-2.3/usr/bin
+	mv $(CURDIR)/debian/ruby-rails-2.3/usr/bin \
+	   $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/
+	# Move commands directory to railties/lib
+	mv $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/commands \
+	   $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/lib/
+	# Move tasks directory to railties/lib
+	mv $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/tasks \
+	   $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/lib/
+	# 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/rails/bin/ -type f -exec chmod 755 {} \;
+	find $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/bin/ -type f -exec chmod 755 {} \;

-- 
rails-2.3.git