[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 11f50dc05aa08272a73626d8832a61582edc9b09
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Aug 22 18:42:24 2011 +0200

    Don't compress README file and install missing environment directory

diff --git a/debian/ruby-rails-2.3.links b/debian/ruby-rails-2.3.links
index 8f98096..f66010c 100644
--- a/debian/ruby-rails-2.3.links
+++ b/debian/ruby-rails-2.3.links
@@ -4,3 +4,4 @@
 /usr/share/javascript/scriptaculous/effects.js /usr/lib/ruby/vendor_ruby/railties/html/javascripts/effects.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
+/usr/share/doc/ruby-rails-2.3/README /usr/lib/ruby/vendor_ruby/railties/README
diff --git a/debian/rules b/debian/rules
index ad4df8b..00aa9bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,9 @@ 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/
+	# Install environments
+	cp -r $(CURDIR)/environments \
+	      $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/
 	# Remove executable bit from fresh_rakefile
 	chmod -x $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/fresh_rakefile
 
@@ -46,3 +49,6 @@ override_dh_link:
 	  rm $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/html/javascripts/$$f; \
 	done
 	dh_link
+
+override_dh_compress:
+	dh_compress -XREADME

-- 
rails-2.3.git