From: Raspbian forward pporter <root@raspbian.org>
Date: Wed, 14 Mar 2018 03:41:41 +0000 (+0000)
Subject: Merge version 2.5.0-4+rpi1 and 2.5.0-6 to produce 2.5.0-6+rpi1
X-Git-Tag: raspbian/2.5.0-6+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=912df11366e30645d48490d3ac36d4138dcf78ee;p=ruby2.5.git

Merge version 2.5.0-4+rpi1 and 2.5.0-6 to produce 2.5.0-6+rpi1
---

6ee3229c7f659d3945c868a0223f873dec11984a
diff --cc debian/changelog
index 9f23c18,05159e6..429c0de
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,19 +1,26 @@@
- ruby2.5 (2.5.0-4+rpi1) buster-staging; urgency=medium
++ruby2.5 (2.5.0-6+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 2.5.0-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 20 Feb 2018 21:18:57 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 20 Feb 2018 21:18:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 14 Mar 2018 03:41:41 +0000
++
+ ruby2.5 (2.5.0-6) unstable; urgency=medium
+ 
+   * debian/rules: explicitly pass --runstatedir, --localstatedir, and
+     --sysconfdir to ./configure
+ 
+  -- Antonio Terceiro <terceiro@debian.org>  Sun, 04 Mar 2018 13:30:49 -0300
+ 
+ ruby2.5 (2.5.0-5) unstable; urgency=medium
+ 
+   * Change Maintainer: to Debian Ruby Team
+   * debian/patches/0005-Fix-tests-to-cope-with-updates-in-tzdata.patch: fix
+     test failures after updates in the Japan timezone data (Closes: #889046)
+   * debian/patches/0006-Rubygems-apply-upstream-patch-to-fix-multiple-vulner.patch:
+     upgrade to Rubygems 2.7.6 to fix multiple vulnerabilities
+ 
+  -- Antonio Terceiro <terceiro@debian.org>  Sat, 24 Feb 2018 12:20:04 -0300
  
  ruby2.5 (2.5.0-4) unstable; urgency=medium