From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 24 May 2018 13:45:53 +0000 (+0100)
Subject: Merge version 2.4.91-2+rpi1 and 2.4.92-1 to produce 2.4.92-1+rpi1
X-Git-Tag: archive/raspbian/2.4.92-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3971dfa4f5cd1f884e37fc8b46e53db9303c5984;p=libdrm.git

Merge version 2.4.91-2+rpi1 and 2.4.92-1 to produce 2.4.92-1+rpi1
---

4d92d1aaa4fac68810851066c687d6a5d883ad03
diff --cc debian/changelog
index e924808,d66a556..101cfa7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,20 @@@
- libdrm (2.4.91-2+rpi1) buster-staging; urgency=medium
++libdrm (2.4.92-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, 22 Mar 2018 23:19:22 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 24 May 2018 13:45:52 +0000
++
+ libdrm (2.4.92-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update libdrm-freedreno1.symbols and shlibs.
+   * control: Update to my Debian address.
+   * Update Vcs-* URLs to point at salsa.debian.org.
+   * Bump debhelper compat to 11.
+   * Bump standards version to 4.1.4.
+ 
+  -- Andreas Boll <aboll@debian.org>  Fri, 18 May 2018 14:32:46 +0200
  
  libdrm (2.4.91-2) unstable; urgency=medium
  
diff --cc debian/control
index 815de62,24342cc..f01f1b5
--- a/debian/control
+++ b/debian/control
@@@ -12,13 -12,12 +12,13 @@@ 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],
 +Build-conflicts:
 + Valgrind
- Standards-Version: 4.1.3
+ Standards-Version: 4.1.4
  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
+ Vcs-Git: https://salsa.debian.org/xorg-team/lib/libdrm
+ Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libdrm
  Homepage: https://cgit.freedesktop.org/mesa/drm/
  
  Package: libdrm-dev