From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 1 Jun 2023 22:24:24 +0000 (+0000)
Subject: Manual merge of version 3.3.0-4+rpi1 and 3.4.1-1 to produce 3.4.1-1+rpi1
X-Git-Tag: archive/raspbian/3.4.1-1+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f83e8d276054c4645bf0a4d44302ffa8e47a815c;p=nats.c.git

Manual merge of version 3.3.0-4+rpi1 and 3.4.1-1 to produce 3.4.1-1+rpi1
---

f83e8d276054c4645bf0a4d44302ffa8e47a815c
diff --cc debian/changelog
index ce82fe2,3a03ee9..f779722
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,17 +1,24 @@@
- nats.c (3.3.0-4+rpi1) bookworm-staging; urgency=medium
++nats.c (3.4.1-1+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 3.3.0-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 28 Jul 2022 07:54:37 +0000]
 +  * Bump minimum arm version for yeild instruction to armv7.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 28 Jul 2022 07:54:37 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 01 Jun 2023 22:23:05 +0000
++
+ nats.c (3.4.1-1) unstable; urgency=medium
+ 
+   * New upstream version 3.4.1
+   * update symbols
+ 
+  -- Victor Seva <vseva@debian.org>  Wed, 26 Oct 2022 00:37:32 +0200
+ 
+ nats.c (3.4.0-1) unstable; urgency=medium
+ 
+   * New upstream version 3.4.0
+   * remove already applied patches
+   * libnats3.4
+ 
+  -- Victor Seva <vseva@debian.org>  Mon, 03 Oct 2022 10:13:28 +0200
  
  nats.c (3.3.0-4) unstable; urgency=medium