From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 11 Sep 2025 19:00:31 +0000 (+0000)
Subject: Manual merge of version 10.44-4+rpi1 and 10.45-1 to produce 10.45-1+rpi1
X-Git-Tag: archive/raspbian/10.45-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5ca025d06005b840e98add17e6deee12adbf0e9c;p=pcre2.git

Manual merge of version 10.44-4+rpi1 and 10.45-1 to produce 10.45-1+rpi1
---

5ca025d06005b840e98add17e6deee12adbf0e9c
diff --cc debian/changelog
index 7927041,dd6679d..afe84c5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,20 +1,27 @@@
- pcre2 (10.44-4+rpi1) trixie-staging; urgency=medium
++pcre2 (10.45-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 10.44-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 28 Nov 2024 18:34:35 +0000]
 +  * Disable JIT on armhf, it's tests fail on raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 28 Nov 2024 18:34:35 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 11 Sep 2025 18:59:44 +0000
++
+ pcre2 (10.45-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Matthew Vernon <matthew@debian.org>  Wed, 05 Feb 2025 09:25:16 +0000
+ 
+ pcre2 (10.45~rc1-1) experimental; urgency=medium
+ 
+   * Upstream RC1 for 10.45 version
+ 
+  -- Matthew Vernon <matthew@debian.org>  Thu, 23 Jan 2025 09:49:13 +0000
+ 
+ pcre2 (10.44-5) unstable; urgency=medium
+ 
+   * Enable JIT on loong64 (Closes: #1089230)
+ 
+  -- Matthew Vernon <matthew@debian.org>  Sun, 08 Dec 2024 13:05:09 +0000
  
  pcre2 (10.44-4) unstable; urgency=medium
  
diff --cc debian/rules
index 0a5b347,1bf190f..76a7d39
--- a/debian/rules
+++ b/debian/rules
@@@ -13,7 -13,7 +13,7 @@@ export DEB_CFLAGS_MAINT_APPEND = -Dregc
  
  deb_maint_conf_args = --enable-pcre2-16 --enable-pcre2-32 --disable-pcre2grep-callout
  #enable JIT only on architectures that support it (see pcre2jit.3)
- ifneq ($(filter amd64 arm64 i386 mips mipsel mips64el powerpc ppc64 ppc64el riscv64 s390x, $(DEB_HOST_ARCH)),)
 -ifneq ($(filter amd64 armhf arm64 i386 loong64 mips mipsel mips64el powerpc ppc64 ppc64el riscv64 s390x, $(DEB_HOST_ARCH)),)
++ifneq ($(filter amd64 arm64 i386 loong64 mips mipsel mips64el powerpc ppc64 ppc64el riscv64 s390x, $(DEB_HOST_ARCH)),)
  deb_maint_conf_args +=--enable-jit
  else
  deb_maint_conf_args +=--disable-jit