[DRE-commits] [ruby-jquery-rails] 01/05: unapply patches

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-jquery-rails.

commit 587d4492f061fa280d372e4ff1caa8b6e6136732
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun May 4 13:36:50 2014 +0530

    unapply patches
---
 lib/generators/jquery/install/install_generator.rb | 2 +-
 lib/jquery/rails/engine.rb                         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/generators/jquery/install/install_generator.rb b/lib/generators/jquery/install/install_generator.rb
index d99ca49..f861c2a 100644
--- a/lib/generators/jquery/install/install_generator.rb
+++ b/lib/generators/jquery/install/install_generator.rb
@@ -8,7 +8,7 @@ if ::Rails.version < "3.1" || !::Rails.application.config.assets.enabled
 
         desc "This generator installs jQuery #{Jquery::Rails::JQUERY_VERSION}, jQuery-ujs, and (optionally) jQuery UI #{Jquery::Rails::JQUERY_UI_VERSION}"
         class_option :ui, :type => :boolean, :default => false, :desc => "Include jQueryUI"
-        source_root File.expand_path('/usr/share/ruby-jquery-rails/assets/javascripts', __FILE__)
+        source_root File.expand_path('../../../../../vendor/assets/javascripts', __FILE__)
 
         def remove_prototype
           Rails::PROTOTYPE_JS.each do |name|
diff --git a/lib/jquery/rails/engine.rb b/lib/jquery/rails/engine.rb
index 24c2674..ebd72be 100644
--- a/lib/jquery/rails/engine.rb
+++ b/lib/jquery/rails/engine.rb
@@ -3,7 +3,6 @@ require "jquery/assert_select" if ::Rails.env.test?
 module Jquery
   module Rails
     class Engine < ::Rails::Engine
-      config.root = '/usr/share/ruby-jquery-rails'
     end
   end
 end

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