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

    Use prototype.js provided by Debian package

diff --git a/debian/control b/debian/control
index a1a1150..ea2d10c 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,8 @@ Depends: ${shlibs:Depends},
 	 ruby-actionmailer-2.3 (>= 2.3.11),
 	 ruby-actionmailer-2.3 (<< 2.3.11.1),
 	 ruby-activeresource-2.3 (>= 2.3.11),
-	 ruby-activeresource-2.3 (<< 2.3.11.1)
+	 ruby-activeresource-2.3 (<< 2.3.11.1),
+	 libjs-prototype
 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
new file mode 100644
index 0000000..4a0623c
--- /dev/null
+++ b/debian/ruby-rails-2.3.links
@@ -0,0 +1 @@
+/usr/share/javascript/prototype/prototype.js /usr/lib/ruby/vendor_ruby/railties/html/javascripts/prototype.js
diff --git a/debian/rules b/debian/rules
index 8b61868..2936b8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,8 +23,9 @@ debian/control: debian/control.in
 	sed -e "s/@RAILS_VERSION@/$(RAILS_VERSION)/" >$@ <$<
 
 override_dh_install:
+	# Use dh_install to install files not handled by gem2deb
+	dh_install --sourcedir=$(CURDIR)
 	# Move /usr/bin/* to railties/bin/
-	dh_install -O--buildsystem=ruby
 	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
@@ -43,3 +44,7 @@ override_dh_install:
 	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
+	dh_link

-- 
rails-2.3.git