From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 27 Jul 2023 22:37:33 +0000 (+0000)
Subject: Manual merge of version 5.6.4-1+rpi1 and 5.6.5-3 to produce 5.6.5-3+rpi1
X-Git-Tag: archive/raspbian/5.6.5-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=adc46e1bb2b7db16b0ccc0123a1c65ded2740717;p=puma.git

Manual merge of version 5.6.4-1+rpi1 and 5.6.5-3 to produce 5.6.5-3+rpi1
---

adc46e1bb2b7db16b0ccc0123a1c65ded2740717
diff --cc debian/changelog
index 1c048ac,02fd49e..b0be608
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,25 +1,34 @@@
- puma (5.6.4-1+rpi1) bookworm-staging; urgency=medium
++puma (5.6.5-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 5.5.2-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 09 Dec 2021 21:50:38 +0000]
 +  * Be more agressive about forcing UTF-8 locale.
 +  * Fix clean target
 +  * Disable testsuite
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 22 Jul 2022 01:55:37 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 27 Jul 2023 22:36:41 +0000
++
+ puma (5.6.5-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * d/control (Vcs-Git): Fix URL.
+ 
+  -- Daniel Leidert <dleidert@debian.org>  Thu, 09 Feb 2023 16:24:05 +0100
+ 
+ puma (5.6.5-2) unstable; urgency=medium
+ 
+   * debian/ruby-tests.rake: skip test that fails often (Closes: #1006022)
+   * debian/ruby-tests.rake: exclude tests that fail often but not always
+ 
+  -- Antonio Terceiro <terceiro@debian.org>  Wed, 02 Nov 2022 09:26:37 -0300
+ 
+ puma (5.6.5-1) unstable; urgency=medium
+ 
+   * Update watch file for github.com pattern change
+   * New upstream version 5.6.5
+   * Refresh patches
+   * Bump Standards-Version to 4.6.1 (no changes needed)
+ 
+  -- Pirate Praveen <praveen@debian.org>  Sun, 16 Oct 2022 22:44:46 +0530
  
  puma (5.6.4-1) unstable; urgency=medium