[DRE-commits] [ruby-turbolinks] 02/07: Install assets to the correct location

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-turbolinks.

commit 4823effd7b4eed5b1c68b576198c8aba8c11fabd
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jul 27 17:10:57 2014 -0300

    Install assets to the correct location
---
 debian/patches/engine-root.patch | 14 ++++++++++++++
 debian/patches/series            |  1 +
 debian/rules                     |  7 ++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/debian/patches/engine-root.patch b/debian/patches/engine-root.patch
new file mode 100644
index 0000000..ac5fd21
--- /dev/null
+++ b/debian/patches/engine-root.patch
@@ -0,0 +1,14 @@
+Description: look for assets in /usr/share/ruby-turbolinks
+ We don't want assets in the $LOAD_PATH.
+Author: Antonio Terceiro <terceiro at debian.org>
+
+--- ruby-turbolinks-2.2.2.orig/lib/turbolinks.rb
++++ ruby-turbolinks-2.2.2/lib/turbolinks.rb
+@@ -7,6 +7,7 @@ require 'turbolinks/redirection'
+ 
+ module Turbolinks
+   class Engine < ::Rails::Engine
++    config.root = '/usr/share/ruby-turbolinks'
+     initializer :turbolinks do |config|
+       ActiveSupport.on_load(:action_controller) do
+         ActionController::Base.class_eval do
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d77d941
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+engine-root.patch
diff --git a/debian/rules b/debian/rules
index 82ddc0c..343736a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,15 @@
 #
 # Uncomment to ignore some test failures (but the tests will run anyway).
 # Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.9.1 ruby2.0 require-rubygems
+#export DH_RUBY_IGNORE_TESTS=ruby2.1 require-rubygems
 #
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_install:
+	dh_auto_install
+	mkdir -p $(CURDIR)/debian/ruby-turbolinks/usr/share/ruby-turbolinks/lib
+	mv $(CURDIR)/debian/ruby-turbolinks/usr/lib/ruby/vendor_ruby/assets $(CURDIR)/debian/ruby-turbolinks/usr/share/ruby-turbolinks/lib/assets

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-turbolinks.git