Merge version 1:0.1.92-1+rpi1 and 1:0.1.96-1 to produce 1:0.1.96-1+rpi1 archive/raspbian/1%0.1.96-1+rpi1 raspbian/1%0.1.96-1+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Fri, 23 Sep 2022 04:43:54 +0000 (05:43 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Fri, 23 Sep 2022 04:43:54 +0000 (05:43 +0100)
1  2 
babl/meson.build
debian/changelog
debian/patches/series
meson.build

Simple merge
index 957e0a27b5fbb5a4bb9e05282e48f6aa75e7975b,c144b2cd85f8b0d1d0fbb0dcb94f240a2dfaf421..cf60e3d9f6cf3a4bf51a9a643459937475eef416
@@@ -1,9 -1,11 +1,19 @@@
- babl (1:0.1.92-1+rpi1) bookworm-staging; urgency=medium
++babl (1:0.1.96-1+rpi1) bookworm-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 27 Aug 2022 09:54:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 23 Sep 2022 04:43:54 +0000
++
+ babl (1:0.1.96-1) unstable; urgency=medium
+   * Team upload
+   * New upstream release
+   * Drop patch applied upstream
+   * Don't install newly introduced bin/babl yet
+  -- Nathan Pratta Teodosio <nathan.teodosio@canonical.com>  Thu, 25 Aug 2022 10:46:56 -0300
  
  babl (1:0.1.92-1) unstable; urgency=medium
  
index dacafb73d278e2c87847005442842ad72e3fdfbf,b805e74c04313d6051e5307e4eec332e01485023..6e758690e378e966b9732fd5b3d68b0763277fb0
@@@ -1,3 -1,1 +1,2 @@@
  tests-increase-timeout.patch
- build-fix-description-case.patch
 +disable-neon.patch
diff --cc meson.build
Simple merge