diff -Nru rails-4.2.10/debian/changelog rails-4.2.10/debian/changelog --- rails-4.2.10/debian/changelog 2018-03-18 11:50:16.000000000 +0000 +++ rails-4.2.10/debian/changelog 2018-04-21 12:10:11.000000000 +0000 @@ -1,3 +1,10 @@ +rails (2:4.2.10-1ubuntu1) bionic; urgency=medium + + * Re-apply be9dc78fccc80bb5045c67b435b5c7e36ea8a296.patch that was + dropped when syncing the Debian version over the previous Ubuntu. + + -- Adam Conrad Sat, 21 Apr 2018 06:10:11 -0600 + rails (2:4.2.10-1) unstable; urgency=medium * New upstream version 4.2.10 diff -Nru rails-4.2.10/debian/control rails-4.2.10/debian/control --- rails-4.2.10/debian/control 2018-03-18 11:50:16.000000000 +0000 +++ rails-4.2.10/debian/control 2018-04-21 12:10:11.000000000 +0000 @@ -1,7 +1,8 @@ Source: rails Section: ruby Priority: optional -Maintainer: Debian Ruby Extras Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Ruby Extras Maintainers Uploaders: Pirate Praveen Build-Depends: debhelper (>= 11~), gem2deb (>= 0.4.0~), diff -Nru rails-4.2.10/debian/patches/be9dc78fccc80bb5045c67b435b5c7e36ea8a296.patch rails-4.2.10/debian/patches/be9dc78fccc80bb5045c67b435b5c7e36ea8a296.patch --- rails-4.2.10/debian/patches/be9dc78fccc80bb5045c67b435b5c7e36ea8a296.patch 1970-01-01 00:00:00.000000000 +0000 +++ rails-4.2.10/debian/patches/be9dc78fccc80bb5045c67b435b5c7e36ea8a296.patch 2018-04-21 12:09:25.000000000 +0000 @@ -0,0 +1,35 @@ +From be9dc78fccc80bb5045c67b435b5c7e36ea8a296 Mon Sep 17 00:00:00 2001 +From: Yasuo Honda +Date: Thu, 11 Aug 2016 11:26:20 +0000 +Subject: [PATCH] Creating a new Topic class instead of class_eval for the + existing one since it affects another test + `ReflectionTest#test_read_attribute_names` + +Address #26099 +--- + activerecord/test/cases/validations_test.rb | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +Index: rails-4.2.10/activerecord/test/cases/validations_test.rb +=================================================================== +--- rails-4.2.10.orig/activerecord/test/cases/validations_test.rb ++++ rails-4.2.10/activerecord/test/cases/validations_test.rb +@@ -150,16 +150,14 @@ class ValidationsTest < ActiveRecord::Te + end + + def test_numericality_validation_with_mutation +- Topic.class_eval do ++ klass = Class.new(Topic) do + attribute :wibble, ActiveRecord::Type::String.new + validates_numericality_of :wibble, only_integer: true + end + +- topic = Topic.new(wibble: '123-4567') ++ topic = klass.new(wibble: "123-4567") + topic.wibble.gsub!('-', '') + + assert topic.valid? +- ensure +- Topic.reset_column_information + end + end diff -Nru rails-4.2.10/debian/patches/series rails-4.2.10/debian/patches/series --- rails-4.2.10/debian/patches/series 2018-03-18 11:50:16.000000000 +0000 +++ rails-4.2.10/debian/patches/series 2018-04-21 12:09:56.000000000 +0000 @@ -2,3 +2,4 @@ 0002-load_paths.rb-don-t-load-bundler.patch 0004-ActiveRecord-adjust-test-suite-for-Debian-build.patch 0005-rack-test-relax-spec.patch +be9dc78fccc80bb5045c67b435b5c7e36ea8a296.patch