From: Raspbian automatic forward porter Date: Fri, 5 Feb 2021 05:48:41 +0000 (+0000) Subject: Merge version 2.4.103-2+rpi1 and 2.4.104-1 to produce 2.4.104-1+rpi1 X-Git-Tag: archive/raspbian/2.4.104-1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=43707606f25ca1733db9f15736808d9ae74c97c7;p=libdrm.git Merge version 2.4.103-2+rpi1 and 2.4.104-1 to produce 2.4.104-1+rpi1 --- 836b239af6daa5d91143db95ccae5c080576ddd5 diff --cc debian/changelog index 449967d,75f138b..0cdc21c --- a/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 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 Thu, 10 Dec 2020 10:17:03 +0000 ++ -- Raspbian forward porter 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 Thu, 28 Jan 2021 12:18:32 +0200 libdrm (2.4.103-2) unstable; urgency=medium diff --cc debian/control index 242f688,b13cac9..7f83cd8 --- a/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, + python3-docutils, - valgrind [amd64 armhf i386 mips mipsel powerpc s390x], +Build-conflicts: + Valgrind Standards-Version: 4.5.0 Section: libs Vcs-Git: https://salsa.debian.org/xorg-team/lib/libdrm