[DRE-commits] [ruby-backbone-on-rails] 07/10: patches to set engine root, remove activeresource

[Praveen Arimbrathodiyil]

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

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

commit 31c31fd300bf6961d0b2eec8ffaa10efb0cedcd4
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Nov 15 13:41:59 2014 +0530

    patches to set engine root, remove activeresource
---
 debian/patches/engine-root.patch                   | 16 ++++++++
 debian/patches/remove-activeresource.patch         | 26 +++++++++++++
 debian/patches/remove-rubygems-bundler.patch       | 44 ++++++++++++++++++++++
 debian/patches/series                              |  4 ++
 .../patches/whitelist-attributes-error-fix.patch   | 18 +++++++++
 5 files changed, 108 insertions(+)

diff --git a/debian/patches/engine-root.patch b/debian/patches/engine-root.patch
new file mode 100644
index 0000000..e8e448c
--- /dev/null
+++ b/debian/patches/engine-root.patch
@@ -0,0 +1,16 @@
+Description: Set rails engine root
+ Debian specific
+Author: Pirate Praveen <praveen at debian.org>
+
+Index: ruby-backbone-on-rails-1.1.1.0/lib/backbone-on-rails/engine.rb
+===================================================================
+--- ruby-backbone-on-rails-1.1.1.0.orig/lib/backbone-on-rails/engine.rb
++++ ruby-backbone-on-rails-1.1.1.0/lib/backbone-on-rails/engine.rb
+@@ -1,4 +1,5 @@
+ module BackboneOnRails
+   class Engine < Rails::Engine
++	config.root = '/usr/share/ruby-backbone-on-rails'
+   end
+-end
+\ No newline at end of file
++end
diff --git a/debian/patches/remove-activeresource.patch b/debian/patches/remove-activeresource.patch
new file mode 100644
index 0000000..723b995
--- /dev/null
+++ b/debian/patches/remove-activeresource.patch
@@ -0,0 +1,26 @@
+From fc46e3cc7a385ee361013217eff3d587924829da Mon Sep 17 00:00:00 2001
+From: William Meleyal <w.meleyal at wollzelle.com>
+Date: Mon, 29 Sep 2014 14:25:07 +0200
+Subject: [PATCH] only depend on railties
+
+---
+ backbone-on-rails.gemspec | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/backbone-on-rails.gemspec b/backbone-on-rails.gemspec
+index e8b6b9d..303082b 100644
+--- a/backbone-on-rails.gemspec
++++ b/backbone-on-rails.gemspec
+@@ -16,12 +16,7 @@ Gem::Specification.new do |s|
+   s.files         = `git ls-files`.split("\n")
+   s.test_files    = `git ls-files -- {test}/*`.split("\n")
+ 
+-  # Enable usage with non-active_record projects by only depending on the parts of rails we need.
+   s.add_dependency 'railties'
+-  s.add_dependency 'actionpack'
+-  s.add_dependency 'actionmailer'
+-  s.add_dependency 'activemodel'
+-  s.add_dependency 'activeresource'
+   s.add_dependency 'jquery-rails'
+   s.add_dependency 'ejs'
+   s.add_dependency 'eco'
diff --git a/debian/patches/remove-rubygems-bundler.patch b/debian/patches/remove-rubygems-bundler.patch
new file mode 100644
index 0000000..d966909
--- /dev/null
+++ b/debian/patches/remove-rubygems-bundler.patch
@@ -0,0 +1,44 @@
+Description: remove usage of rubygems and bundler
+ We track dependencies in debian/control
+ .
+ Debian speicific.
+Author: Pirate Praveen <praveen at debian.org>
+Last-Updated: 2014-11-15
+
+Index: ruby-backbone-on-rails-1.1.1.0/test/dummy/config/boot.rb
+===================================================================
+--- ruby-backbone-on-rails-1.1.1.0.orig/test/dummy/config/boot.rb
++++ ruby-backbone-on-rails-1.1.1.0/test/dummy/config/boot.rb
+@@ -1,10 +1,10 @@
+-require 'rubygems'
+-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
++#require 'rubygems'
++#gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+ 
+-if File.exist?(gemfile)
+-  ENV['BUNDLE_GEMFILE'] = gemfile
+-  require 'bundler'
+-  Bundler.setup
+-end
++#if File.exist?(gemfile)
++#  ENV['BUNDLE_GEMFILE'] = gemfile
++#  require 'bundler'
++#  Bundler.setup
++#end
+ 
+-$:.unshift File.expand_path('../../../../lib', __FILE__)
+\ No newline at end of file
++$:.unshift File.expand_path('../../../../lib', __FILE__)
+Index: ruby-backbone-on-rails-1.1.1.0/test/dummy/config/application.rb
+===================================================================
+--- ruby-backbone-on-rails-1.1.1.0.orig/test/dummy/config/application.rb
++++ ruby-backbone-on-rails-1.1.1.0/test/dummy/config/application.rb
+@@ -2,7 +2,7 @@ require File.expand_path('../boot', __FI
+ 
+ require 'rails/all'
+ 
+-Bundler.require
++#Bundler.require
+ require "backbone-on-rails"
+ 
+ module Dummy
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0760325
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+engine-root.patch
+remove-activeresource.patch
+remove-rubygems-bundler.patch
+whitelist-attributes-error-fix.patch
diff --git a/debian/patches/whitelist-attributes-error-fix.patch b/debian/patches/whitelist-attributes-error-fix.patch
new file mode 100644
index 0000000..a3b11f1
--- /dev/null
+++ b/debian/patches/whitelist-attributes-error-fix.patch
@@ -0,0 +1,18 @@
+Description: Rails 4.0 compatibility update
+ This attribute is removed from rails 4
+Author: Pirate Praveen <praveen at debian.org>
+Last-Updated: 2014-11-15
+
+Index: ruby-backbone-on-rails-1.1.1.0/test/dummy/config/application.rb
+===================================================================
+--- ruby-backbone-on-rails-1.1.1.0.orig/test/dummy/config/application.rb
++++ ruby-backbone-on-rails-1.1.1.0/test/dummy/config/application.rb
+@@ -47,7 +47,7 @@ module Dummy
+     # This will create an empty whitelist of attributes available for mass-assignment for all models
+     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+     # parameters by using an attr_accessible or attr_protected declaration.
+-    config.active_record.whitelist_attributes = true
++    # config.active_record.whitelist_attributes = true
+ 
+     # Enable the asset pipeline
+     config.assets.enabled = true

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