Merge version 2.4.81-2+rpi1 and 2.4.82-1 to produce 2.4.82-1+rpi1

diff --cc debian/changelog
index 17f64582ae89ad3231c78c5af63d654fffcf8932,cc110bc68b8dcefe015899ad7a1d8fdfa942c4d8..182364390be552b75635377bed6e3511b0546f99
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,14 +1,25 @@@
++libdrm (2.4.82-1+rpi1) buster-staging; urgency=medium
++
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 07 Aug 2017 07:42:39 +0000
++
+ libdrm (2.4.82-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * debian/upstream/signing-key.asc: add key from Lucas Stach.
+   * Add libdrm-common package for new data files.
+   * debian/*.symbols: add new symbols.
+   * debian/rules: Bump shlibs for the libraries with new symbols.
+   * debian/control: Bump Standards-Version to 4.0.0; no changes needed.
+ 
+  -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 28 Jul 2017 22:40:20 +0200
+ 
 +libdrm (2.4.81-2+rpi1) buster-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, 29 Jun 2017 09:44:55 +0000
 +
  libdrm (2.4.81-2) unstable; urgency=medium
  
    * Upload to unstable.

diff --cc debian/control
index b0192330ef1c0fb6600d3c152117d9f7f8735000,3777fcc7604178bb1a0c01d8112659b8ba2dbff2..fa5dde0c90479ad451ca704c11e6083e800244de
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -12,10 -12,9 +12,10 @@@ Build-Depends
   xutils-dev (>= 1:7.6+2),
   libudev-dev [linux-any],
   libpciaccess-dev,
 - valgrind [amd64 armhf i386 mips mipsel powerpc s390x],
   libbsd-dev [kfreebsd-any],
- Standards-Version: 3.9.8
 +Build-conflicts:
 + Valgrind
+ Standards-Version: 4.0.0
  Section: libs
  Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/libdrm.git
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/libdrm.git