From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 16 Feb 2024 20:42:17 +0000 (+0000)
Subject: Merge version 2.4.120-1+rpi1 and 2.4.120-2 to produce 2.4.120-2+rpi1
X-Git-Tag: archive/raspbian/2.4.120-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=69175ec3b8d7ab13e608fde5d46c36e7a343f915;p=libdrm.git

Merge version 2.4.120-1+rpi1 and 2.4.120-2 to produce 2.4.120-2+rpi1
---

69175ec3b8d7ab13e608fde5d46c36e7a343f915
diff --cc debian/changelog
index 7f2e4dd,c4d1ff6..2b5c899
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- libdrm (2.4.120-1+rpi1) trixie-staging; urgency=medium
++libdrm (2.4.120-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2.4.74-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 28 Jun 2017 21:14:42 +0000]
 +  * Move valgrind to build-conflicts, the old version in raspbian breaks the build.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 08 Feb 2024 00:02:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 16 Feb 2024 20:42:16 +0000
++
+ libdrm (2.4.120-2) unstable; urgency=medium
+ 
+   * control: Drop libatomic-ops-dev from build-depends again, as we can
+     continue using atomic ops provided by gcc.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 08 Feb 2024 10:34:49 +0200
  
  libdrm (2.4.120-1) unstable; urgency=medium