[DRE-commits] [rails] 02/03: refresh patches
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sun Jul 30 16:49:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository rails.
commit 0c78f6286a722fb1aff135714a78a1b8df97469f
Author: Pirate Praveen <praveen at debian.org>
Date: Fri Jul 28 17:21:52 2017 +0530
refresh patches
---
.../0001-Be-careful-with-that-bundler.patch | 6 ++--
...Record-adjust-test-suite-for-Debian-build.patch | 38 ++++++++--------------
debian/patches/0005-relax-json.patch | 13 --------
debian/patches/series | 1 -
4 files changed, 16 insertions(+), 42 deletions(-)
diff --git a/debian/patches/0001-Be-careful-with-that-bundler.patch b/debian/patches/0001-Be-careful-with-that-bundler.patch
index 87551ec..8a62cc6 100644
--- a/debian/patches/0001-Be-careful-with-that-bundler.patch
+++ b/debian/patches/0001-Be-careful-with-that-bundler.patch
@@ -6,11 +6,9 @@ Subject: Be careful with that bundler
railties/lib/rails/generators/app_base.rb | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
-diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
-index 4ff30a5..c150dc3 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
-@@ -325,11 +325,9 @@ module Rails
+@@ -332,11 +332,9 @@
# We unset temporary bundler variables to load proper bundler and Gemfile.
#
# Thanks to James Tucker for the Gem tricks involved in this call.
@@ -23,7 +21,7 @@ index 4ff30a5..c150dc3 100644
print output unless options[:quiet]
end
end
-@@ -343,7 +341,7 @@ module Rails
+@@ -350,7 +348,7 @@
end
def run_bundle
diff --git a/debian/patches/0004-ActiveRecord-adjust-test-suite-for-Debian-build.patch b/debian/patches/0004-ActiveRecord-adjust-test-suite-for-Debian-build.patch
index 55b345a..854e9eb 100644
--- a/debian/patches/0004-ActiveRecord-adjust-test-suite-for-Debian-build.patch
+++ b/debian/patches/0004-ActiveRecord-adjust-test-suite-for-Debian-build.patch
@@ -13,11 +13,9 @@ why the hell those tests are failing.
activerecord/test/cases/relation_test.rb | 2 ++
5 files changed, 6 insertions(+), 1 deletion(-)
-diff --git a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
-index 51d8e05..2ab8db0 100644
--- a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
+++ b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
-@@ -121,6 +121,7 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
+@@ -121,6 +121,7 @@
end
def test_eager_association_loading_with_has_many_sti_and_subclasses
@@ -25,11 +23,9 @@ index 51d8e05..2ab8db0 100644
silly = SillyReply.new(:title => "gaga", :content => "boo-boo", :parent_id => 1)
silly.parent_id = 1
assert silly.save
-diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
-index 3311bf2..a268829 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
-@@ -202,6 +202,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
+@@ -202,6 +202,7 @@
end
def test_do_not_call_callbacks_for_delete_all
@@ -37,11 +33,9 @@ index 3311bf2..a268829 100644
car = Car.create(:name => 'honda')
car.funky_bulbs.create!
assert_nothing_raised { car.reload.funky_bulbs.delete_all }
-diff --git a/activerecord/test/cases/core_test.rb b/activerecord/test/cases/core_test.rb
-index 3cb9883..2a68bc1 100644
--- a/activerecord/test/cases/core_test.rb
+++ b/activerecord/test/cases/core_test.rb
-@@ -34,6 +34,7 @@ class CoreTest < ActiveRecord::TestCase
+@@ -34,6 +34,7 @@
end
def test_pretty_print_new
@@ -49,24 +43,20 @@ index 3cb9883..2a68bc1 100644
topic = Topic.new
actual = ''
PP.pp(topic, StringIO.new(actual))
-diff --git a/activerecord/test/cases/invalid_connection_test.rb b/activerecord/test/cases/invalid_connection_test.rb
-index 8416c81..da518b7 100644
--- a/activerecord/test/cases/invalid_connection_test.rb
+++ b/activerecord/test/cases/invalid_connection_test.rb
-@@ -9,7 +9,7 @@ class TestAdapterWithInvalidConnection < ActiveRecord::TestCase
- def setup
- # Can't just use current adapter; sqlite3 will create a database
- # file on the fly.
-- Bird.establish_connection adapter: 'mysql', database: 'i_do_not_exist'
-+ Bird.establish_connection adapter: 'mysql2', database: 'i_do_not_exist'
- end
-
- teardown do
-diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
-index 44e07a2..827c83b 100644
+@@ -10,7 +10,7 @@
+ def setup
+ # Can't just use current adapter; sqlite3 will create a database
+ # file on the fly.
+- Bird.establish_connection adapter: 'mysql', database: 'i_do_not_exist'
++ Bird.establish_connection adapter: 'mysql2', database: 'i_do_not_exist'
+ end
+
+ teardown do
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
-@@ -198,6 +198,7 @@ module ActiveRecord
+@@ -198,6 +198,7 @@
end
def test_merging_readonly_false
@@ -74,7 +64,7 @@ index 44e07a2..827c83b 100644
relation = Relation.new FakeKlass, :b
readonly_false_relation = relation.readonly(false)
# test merging in both directions
-@@ -261,6 +262,7 @@ module ActiveRecord
+@@ -261,6 +262,7 @@
end
def test_merge_raises_with_invalid_argument
diff --git a/debian/patches/0005-relax-json.patch b/debian/patches/0005-relax-json.patch
deleted file mode 100644
index bcf573a..0000000
--- a/debian/patches/0005-relax-json.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-allow ruby-json 2.0.1 in the archive
-
---- a/activesupport/activesupport.gemspec
-+++ b/activesupport/activesupport.gemspec
-@@ -21,7 +21,7 @@
- s.rdoc_options.concat ['--encoding', 'UTF-8']
-
- s.add_dependency 'i18n', '~> 0.7'
-- s.add_dependency 'json', '~> 1.7', '>= 1.7.7'
-+ s.add_dependency 'json', '>= 1.7.7'
- s.add_dependency 'tzinfo', '~> 1.1'
- s.add_dependency 'minitest', '~> 5.1'
- s.add_dependency 'thread_safe','~> 0.3', '>= 0.3.4'
diff --git a/debian/patches/series b/debian/patches/series
index f05e82d..e3a54f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0001-Be-careful-with-that-bundler.patch
0002-load_paths.rb-don-t-load-bundler.patch
0004-ActiveRecord-adjust-test-suite-for-Debian-build.patch
-0005-relax-json.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rails.git
More information about the Pkg-ruby-extras-commits
mailing list