[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 21297a16422d1b5541c9a303bf8b97d1f931a10b
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Jun 7 16:41:29 2011 +0200

    Use javascripts from libjs-scriptaculous

diff --git a/debian/control b/debian/control
index ea2d10c..578b21b 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,8 @@ Depends: ${shlibs:Depends},
 	 ruby-actionmailer-2.3 (<< 2.3.11.1),
 	 ruby-activeresource-2.3 (>= 2.3.11),
 	 ruby-activeresource-2.3 (<< 2.3.11.1),
-	 libjs-prototype
+	 libjs-prototype,
+	 libjs-scriptaculous
 Conflicts: rails-ruby1.8 (<< 2.3.11-1~)
 Replaces: rails-ruby1.8 (<< 2.3.11-1~)
 Provides: rails-ruby1.8
diff --git a/debian/ruby-rails-2.3.links b/debian/ruby-rails-2.3.links
index 0640a06..8f98096 100644
--- a/debian/ruby-rails-2.3.links
+++ b/debian/ruby-rails-2.3.links
@@ -1,3 +1,6 @@
 /usr/share/javascript/prototype/prototype.js /usr/lib/ruby/vendor_ruby/railties/html/javascripts/prototype.js
+/usr/share/javascript/scriptaculous/controls.js /usr/lib/ruby/vendor_ruby/railties/html/javascripts/controls.js
+/usr/share/javascript/scriptaculous/dragdrop.js /usr/lib/ruby/vendor_ruby/railties/html/javascripts/dragdrop.js
+/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
diff --git a/debian/rules b/debian/rules
index 3182168..0509dae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,12 @@ 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/
+	# Remove executable bit from fresh_rakefile
+	chmod -x $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/fresh_rakefile
 
 override_dh_link:
 	rm $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/html/javascripts/prototype.js
+	for f in controls.js dragdrop.js effects.js; do \
+	  rm $(CURDIR)/debian/ruby-rails-2.3/usr/lib/ruby/vendor_ruby/railties/html/javascripts/$$f; \
+	done
 	dh_link

-- 
rails-2.3.git