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

diff --cc debian/changelog
index 449967dad3d9ca3d039a2fa594f30384f9c535ff,75f138b4b2c9208bcc5ac6692b533abeb0f8be4f..0cdc21c316a21a699ca132308e74b58680f5e3b3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- libdrm (2.4.103-2+rpi1) bullseye-staging; urgency=medium
++libdrm (2.4.104-1+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>  Thu, 10 Dec 2020 10:17:03 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Feb 2021 05:48:40 +0000
++
+ libdrm (2.4.104-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Add signing-key from Simon Ser.
+   * control: Manpages now need python3-docutils instead of docbook-xsl
+     to build, make it so.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 28 Jan 2021 12:18:32 +0200
  
  libdrm (2.4.103-2) unstable; urgency=medium
  

diff --cc debian/control
index 242f6881985503d82c20590f1c7dda94ba552130,b13cac9aff2e22765a3b7e473c7374681938fb58..7f83cd88af3e4e7667de3d223975091530ff1575
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -13,8 -12,8 +12,9 @@@ Build-Depends
   xutils-dev (>= 1:7.6+2),
   libudev-dev [linux-any],
   libpciaccess-dev,
 - valgrind [amd64 armhf i386 mips mipsel powerpc s390x],
+  python3-docutils,
 +Build-conflicts:
 + Valgrind
  Standards-Version: 4.5.0
  Section: libs
  Vcs-Git: https://salsa.debian.org/xorg-team/lib/libdrm