Merge version 2.0.48-1+rpi1 and 2.0.52-1 to produce 2.0.52-1+rpi1

diff --cc debian/changelog
index 053e3c9e4d43e28083b9bafd562eff21b293e675,cdaf0e9f5047684dccb98f2d9172bc6db67374f1..83d016199dce78d1b274e55f5c58346d1385438a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,41 +1,49 @@@
- siridb-server (2.0.48-1+rpi1) bookworm-staging; urgency=medium
++siridb-server (2.0.52-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2.0.43-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 May 2021 12:17:27 +0000]
 +  * Move valgrind to build-conflicts, the version in raspbian
 +    has issues.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Sep 2022 18:29:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 03 Oct 2024 17:41:55 +0000
++
+ siridb-server (2.0.52-1) unstable; urgency=medium
+ 
+   * New upstream version 2.0.52
+ 
+  -- Paul Gevers <elbrus@debian.org>  Thu, 26 Sep 2024 18:59:22 +0200
+ 
+ siridb-server (2.0.51-4) unstable; urgency=medium
+ 
+   * Don't run valgrind tests on armhf until bug 1061496 is fixed
+   * tests: give server a bit time to start up (Closes: #1079984)
+ 
+  -- Paul Gevers <elbrus@debian.org>  Thu, 29 Aug 2024 16:54:49 +0200
+ 
+ siridb-server (2.0.51-3) unstable; urgency=medium
+ 
+   * tests: add --retry to first curl to avoid failing if siridb-server
+     isn't ready yet (Closes: #1067705)
+ 
+  -- Paul Gevers <elbrus@debian.org>  Thu, 23 May 2024 22:34:09 +0200
+ 
+ siridb-server (2.0.51-2) unstable; urgency=medium
+ 
+   [ Debian Janitor ]
+   * Update renamed lintian tag names in lintian overrides.
+   * Update standards version to 4.6.1, no changes needed.
+ 
+   [ Paul Gevers ]
+   * Add tzdata to Build-Depends (Closes: #1027381)
+ 
+  -- Paul Gevers <elbrus@debian.org>  Mon, 30 Oct 2023 20:29:46 +0100
+ 
+ siridb-server (2.0.51-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - Drop libuv1 patch, solved differently upstream
+   * watch: update to use github API
+ 
+  -- Paul Gevers <elbrus@debian.org>  Sat, 28 Oct 2023 23:12:25 +0200
  
  siridb-server (2.0.48-1) unstable; urgency=medium
  

diff --cc debian/control
index 547358cee4e3f86a187cb9f8aec8df361456789c,519a1d5e158ef24124c7422c88d5508db23bfde3..41853cf811a3ad9d21725c813179869e41b667df
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -13,9 -13,9 +13,10 @@@ Build-Depends
   libpcre2-dev,
   libuv1-dev,
   libyajl-dev,
 - uuid-dev,
 - valgrind [amd64 arm64 i386 powerpc ppc64 ppc64el s390x] <!nocheck>
+  tzdata <!nocheck>,
 + uuid-dev
 +Build-Conflicts:
 + valgrind
  Homepage: https://siridb.net/
  Vcs-Browser: https://salsa.debian.org/siridb-team/siridb-server
  Vcs-Git: https://salsa.debian.org/siridb-team/siridb-server.git