Merge version 2.4.84-2+rpi1 and 2.4.85-1 to produce 2.4.85-1+rpi1

diff --cc debian/changelog
index eb081b02593a550130abdc23b4e2ca4b86eb22c0,d866408bbf64b29d928c542b084f8505964ba3ca..ac3e8b3f762927046478662c378178aa20205ab7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- libdrm (2.4.84-2+rpi1) buster-staging; urgency=medium
++libdrm (2.4.85-1+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, 19 Oct 2017 20:34:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 05 Nov 2017 14:51:19 +0000
++
+ libdrm (2.4.85-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update libdrm-amdgpu1.symbols and shlibs.
+   * Bump standards version to 4.1.1.
+ 
+  -- Andreas Boll <andreas.boll.dev@gmail.com>  Mon, 30 Oct 2017 14:01:40 +0100
  
  libdrm (2.4.84-2) unstable; urgency=medium
  

diff --cc debian/control
index fa5dde0c90479ad451ca704c11e6083e800244de,2274f726675096fbb981a4335be842759aa725c7..3adc5b91c86c4730c51d9d87435bf2547fb9d0aa
--- 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: 4.0.0
 +Build-conflicts:
 + Valgrind
+ Standards-Version: 4.1.1
  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