From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 27 Jul 2023 23:04:24 +0000 (+0000)
Subject: Manual merge of version 0.6.13-1+rpi1 and 0.6.16-0.2 to produce 0.6.16-0.2+rpi1
X-Git-Tag: archive/raspbian/0.6.16-0.2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=17f0920c88e42405506575ca396e4a7b98bacd3f;p=restinio.git

Manual merge of version 0.6.13-1+rpi1 and 0.6.16-0.2 to produce 0.6.16-0.2+rpi1
---

17f0920c88e42405506575ca396e4a7b98bacd3f
diff --cc debian/changelog
index e5ffe10,4273a1e..91f4746
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,28 +1,35 @@@
- restinio (0.6.13-1+rpi1) bullseye-staging; urgency=medium
++restinio (0.6.16-0.2+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 0.6.13-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 09 Jan 2021 13:39:15 +0000]
 +  * Link with libatomic on armhf too for Raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 09 Jan 2021 13:39:15 +0000
++ -- Peter Michael Green <plugwash@debian.org>  Thu, 27 Jul 2023 23:03:52 +0000
++
+ restinio (0.6.16-0.2) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Drop Build-Depends: libpcre++-dev. (Closes: #1020932)
+   * Replace default CI config with central one.
+ 
+   [ Bo YU ]
+   * Fix FTBFS on riscv64. (Closes: #1019723)
+ 
+   [ Debian Janitor ]
+   * Bump debhelper from old 12 to 13.
+   * Set upstream metadata fields: Bug-Database, Bug-Submit.
+   * Update standards version to 4.5.1, no changes needed.
+ 
+  -- Bastian Germann <bage@debian.org>  Thu, 29 Sep 2022 15:20:35 +0200
+ 
+ restinio (0.6.16-0.1) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * New upstream release.
+     - Fixes FTBFS with fmtlib 9. (Closes: #1014546)
+     - catch2 updated to compile with glibc 2.34. (Closes: #1017149)
+     - Drop 0001-INTERFACE-fmt-fmt.patch applied upstream.
+ 
+  -- Adrian Bunk <bunk@debian.org>  Mon, 29 Aug 2022 01:53:03 +0300
  
  restinio (0.6.13-1) unstable; urgency=medium
  
diff --cc debian/rules
index fb834e4,7607200..0857575
--- a/debian/rules
+++ b/debian/rules
@@@ -14,7 -14,7 +14,7 @@@ export DEB_BUILD_MAINT_OPTIONS = harden
  
  DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
  
- ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf m68k mipsel powerpc sh4))
 -ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mipsel powerpc riscv64 sh4))
++ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf m68k mipsel powerpc riscv64 sh4))
  	export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
  endif