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

diff --cc debian/changelog
index e2a323ff954b4c4046614d35ad3807f0fc4d0d4c,05f0e31be4f9f84e57ad36baafbc90537a8474e7..17f64582ae89ad3231c78c5af63d654fffcf8932
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,67 +1,74 @@@
- libdrm (2.4.74-1+rpi1) buster-staging; urgency=medium
++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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 28 Jun 2017 21:14:42 +0000
++ -- 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.
+ 
+  -- Andreas Boll <andreas.boll.dev@gmail.com>  Fri, 23 Jun 2017 11:57:14 +0200
+ 
+ libdrm (2.4.81-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Bump libdrm2's and libdrm-amdgpu1's symbols and shlibs.
+ 
+  -- Andreas Boll <andreas.boll.dev@gmail.com>  Fri, 09 Jun 2017 10:41:36 +0200
+ 
+ libdrm (2.4.80-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Bump libdrm-amdgpu1's and libdrm-etnaviv1's symbols and shlibs.
+   * Remove libpthread-stubs0-dev build-dep per configure.ac.
+ 
+  -- Andreas Boll <andreas.boll.dev@gmail.com>  Wed, 19 Apr 2017 15:35:21 +0200
+ 
+ libdrm (2.4.77-1) experimental; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Bump libdrm-amdgpu1 symbols.
+   * Update debian/upstream/signing-key.asc
+ 
+  -- Jordan Justen <jordan.l.justen@intel.com>  Wed, 05 Apr 2017 02:30:35 -0700
+ 
+ libdrm (2.4.76-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Update extend-diff-ignore.
+ 
+  -- Andreas Boll <andreas.boll.dev@gmail.com>  Thu, 30 Mar 2017 10:41:10 +0200
+ 
+ libdrm (2.4.75-2) experimental; urgency=medium
+ 
+   * Cherry-pick 19c4cfc (intel: Add handle to hashtable before freeing
+     along an error path) from upstream (LP: #1671377).
+ 
+  -- Andreas Boll <andreas.boll.dev@gmail.com>  Tue, 21 Mar 2017 18:29:17 +0100
+ 
+ libdrm (2.4.75-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Bump libdrm2's and libdrm-intel1's symbols and shlibs.
+   * Update extend-diff-ignore.
+   * Add debian/source/format file.
+ 
+  -- Andreas Boll <andreas.boll.dev@gmail.com>  Wed, 01 Feb 2017 17:08:17 +0100
+ 
+ libdrm (2.4.74-2) experimental; urgency=medium
+ 
+   [ Andreas Boll ]
+   * Switch to dbgsym packages.
+   * Enable building etnaviv on armhf (Closes: #852685).
+ 
+   [ Emilio Pozuelo Monfort ]
+   * Stop passing --disable-silent-rules to configure, debhelper does it now.
+   * Don't override dh_auto_install, it defaults to debian/tmp.
+ 
+  -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 27 Jan 2017 17:54:01 +0100
  
  libdrm (2.4.74-1) unstable; urgency=medium
  

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