From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 31 Jul 2025 18:32:56 +0000 (+0100)
Subject: Merge version 6.6.0-2+rpi1 and 6.6.0-4 to produce 6.6.0-4+rpi1
X-Git-Tag: archive/raspbian/6.6.0-4+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9d65c6042efdaa3ab29f3b4feccefdf368fae58e;p=puma.git

Merge version 6.6.0-2+rpi1 and 6.6.0-4 to produce 6.6.0-4+rpi1
---

9d65c6042efdaa3ab29f3b4feccefdf368fae58e
diff --cc debian/changelog
index cced2de,3342f03..2b2473e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,22 +1,29 @@@
- puma (6.6.0-2+rpi1) trixie-staging; urgency=medium
++puma (6.6.0-4+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 6.6.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 13 Feb 2025 15:24:52 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 13 Feb 2025 15:24:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 31 Jul 2025 18:32:56 +0000
++
+ puma (6.6.0-4) unstable; urgency=medium
+ 
+   * Team upload.
+   * Do not generate example certificates in build time to avoid build
+     depending on Java
+   * d/p/0019-adapt-test-certs-generation.patch: adjust example certificates
+     generation script
+   * d/p/0020-update-ex-certs.patch: update example certificates to avoid a
+     regression for #1078640
+   * debian/README.source: document test certificates generation
+ 
+  -- Athos Ribeiro <athos@debian.org>  Thu, 17 Jul 2025 07:20:19 -0300
+ 
+ puma (6.6.0-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Freshly generate example certificates for test suite (Closes: #1078640)
+ 
+  -- Timo Röhling <roehling@debian.org>  Wed, 16 Jul 2025 21:51:16 +0200
  
  puma (6.6.0-2) unstable; urgency=medium