From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 10 Dec 2020 10:17:03 +0000 (+0000)
Subject: Merge version 2.4.103-1+rpi1 and 2.4.103-2 to produce 2.4.103-2+rpi1
X-Git-Tag: archive/raspbian/2.4.103-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4827a7bc8c9c91e932f583d1796ef0bbca7dc6cc;p=libdrm.git

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

4827a7bc8c9c91e932f583d1796ef0bbca7dc6cc
diff --cc debian/changelog
index cb4f59c,43ce2b4..449967d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- libdrm (2.4.103-1+rpi1) bullseye-staging; urgency=medium
++libdrm (2.4.103-2+rpi1) bullseye-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>  Tue, 17 Nov 2020 14:15:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Dec 2020 10:17:03 +0000
++
+ libdrm (2.4.103-2) unstable; urgency=medium
+ 
+   * hurd-port.diff: Dropped. (Closes: #975658)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 27 Nov 2020 09:32:38 +0200
  
  libdrm (2.4.103-1) unstable; urgency=medium