From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 31 Dec 2024 10:42:10 +0000 (+0000)
Subject: Manual merge of version 1:0.1.106-3+rpi1 and 1:0.1.110-1 to produce 1:0.1.110-1+rpi1
X-Git-Tag: archive/raspbian/1%0.1.110-1+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3bfd339d8192b46aba77f4d5f6de88a01d04b2ab;p=babl.git

Manual merge of version 1:0.1.106-3+rpi1 and 1:0.1.110-1 to produce 1:0.1.110-1+rpi1
---

3bfd339d8192b46aba77f4d5f6de88a01d04b2ab
diff --cc babl/base/meson.build
index dc04b3c,1084d8e..b6e25e3
--- a/babl/base/meson.build
+++ b/babl/base/meson.build
@@@ -43,14 -43,14 +43,13 @@@ if host_cpu_family == 'x86_64
  
  endif
  
 -
 -if host_cpu_family == 'arm'
 -
 -  babl_base_arm_neon = static_library('babl_base-arm-neon',
 -    babl_base_sources,
 -    include_directories: [rootInclude, bablInclude],
 -    dependencies: [math, lcms, log],
 -    c_args: common_c_flags + arm_neon_flags
 -  )
--
 -endif
 +#if host_cpu_family == 'arm'
 +#
 +#  babl_base_arm_neon = static_library('babl_base-arm-neon',
 +#    babl_base_sources,
 +#    include_directories: [rootInclude, bablInclude],
- #    dependencies: [math, lcms],
++#    dependencies: [math, lcms, log],
 +#    c_args: common_c_flags + arm_neon_flags
 +#  )
 +#
 +#endif
diff --cc debian/changelog
index addc305,ed875e9..4f0e416
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,18 +1,26 @@@
- babl (1:0.1.106-3+rpi1) trixie-staging; urgency=medium
++babl (1:0.1.110-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1:0.1.92-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 27 Aug 2022 09:54:36 +0000]
 +  * Disable neon support, it seems to assume armv8 neon which not
 +    all systems have.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Nov 2023 04:38:50 +0000
++ -- Peter Michael Green <plugwash@debian.org>  Tue, 31 Dec 2024 10:41:05 +0000
++
+ babl (1:0.1.110-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update Standards-Version to 4.7.0, with no changes needed.
+ 
+  -- Jordi Mallach <jordi@debian.org>  Tue, 05 Nov 2024 00:09:31 +0100
+ 
+ babl (1:0.1.108-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * debian/libbabl-0.1-0.symbols: Add new symbol
+   * Add Build-Depends: gi-docgen
+   * Stop using dh-sequence-gnome
+ 
+  -- Jeremy Bícha <jbicha@ubuntu.com>  Tue, 13 Feb 2024 16:45:02 -0500
  
  babl (1:0.1.106-3) unstable; urgency=medium