diff --git a/debian/patches/0108-make-mysql-optional.patch b/debian/patches/0108-make-mysql-optional.patch index c45e69b25e..e68c5e861a 100644 --- a/debian/patches/0108-make-mysql-optional.patch +++ b/debian/patches/0108-make-mysql-optional.patch @@ -17,7 +17,7 @@ Subject: [PATCH] allow specifying DB choice via ENV variable -gem 'pg', '~> 1.1', group: :postgres +ENV["DB"] ||= "postgresql" +gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql" -+gem 'pg', '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres" ++gem 'pg', '~> 1.1' if ENV["DB"] == "all" || ENV["DB"] == "postgres" gem 'rugged', '~> 0.27' gem 'grape-path-helpers', '~> 1.0' diff --git a/debian/patches/0280-relax-pg.patch b/debian/patches/0280-relax-pg.patch deleted file mode 100644 index 26c70e32e1..0000000000 --- a/debian/patches/0280-relax-pg.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Gemfile -+++ b/Gemfile -@@ -17,7 +17,7 @@ - # Supported DBs - ENV["DB"] ||= "postgresql" - gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql" --gem 'pg', '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres" -+gem 'pg', '~> 0.19' if ENV["DB"] == "all" || ENV["DB"] == "postgres" - - gem 'rugged', '~> 0.27' - gem 'grape-path-helpers', '~> 1.0' diff --git a/debian/patches/0680-rails-5_2.patch b/debian/patches/0680-rails-5_2.patch index c2df7937f4..e522f31b19 100644 --- a/debian/patches/0680-rails-5_2.patch +++ b/debian/patches/0680-rails-5_2.patch @@ -13,7 +13,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ - gem 'pg', '~> 0.19' if ENV["DB"] == "all" || ENV["DB"] == "postgres" + gem 'pg', '~> 1.1' if ENV["DB"] == "all" || ENV["DB"] == "postgres" gem 'rugged', '~> 0.27' -gem 'grape-path-helpers', '~> 1.0' diff --git a/debian/patches/series b/debian/patches/series index 631af9a057..9c14cf840e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,6 @@ 0108-make-mysql-optional.patch 0110-make-test-dependencies-conditional.patch 0220-relax-webmock.patch -0280-relax-pg.patch 0290-skip-peek-mysql2.patch 0340-relax-httparty.patch 0400-Relax-recaptcha-version.patch