From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 8 Feb 2024 00:02:02 +0000 (+0000)
Subject: Merge version 2.4.117-1+rpi1 and 2.4.120-1 to produce 2.4.120-1+rpi1
X-Git-Tag: archive/raspbian/2.4.120-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=be8a7c9ac3a5a7c028f9b14029f2eeebcf492e57;p=libdrm.git

Merge version 2.4.117-1+rpi1 and 2.4.120-1 to produce 2.4.120-1+rpi1
---

e2a65608edce4c93dc3bb9fb236fb377eedeac33
diff --cc debian/changelog
index 9fcb2ee,96a2c5c..7f2e4dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,36 +1,43 @@@
- libdrm (2.4.117-1+rpi1) trixie-staging; urgency=medium
++libdrm (2.4.120-1+rpi1) trixie-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>  Fri, 10 Nov 2023 23:30:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 08 Feb 2024 00:02:01 +0000
++
+ libdrm (2.4.120-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 16 Jan 2024 14:08:50 +0200
+ 
+ libdrm (2.4.119-2) unstable; urgency=medium
+ 
+   [ Diederik de Haas ]
+   * Add new signing-key from Marek Olšák
+   * symbols: Add new symbol for amdgpu
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 16 Jan 2024 14:05:50 +0200
+ 
+ libdrm (2.4.119-1) unstable; urgency=medium
+ 
+   [ Diederik de Haas ]
+   * control: Remove unused Build-Depends
+   * control: Update Standards-Version to 4.6.2 (no changes needed)
+   * control: Specify Rules-Requires-Root: no
+   * control, rules: Drop quilt B-D and param
+   * control: Update Homepage to point to gitlab.f.o
+   * patches: Add DEP-3 header to 01_default_perms.diff
+   * symbols: Add missing Build-Depends-Package fields
+   * symbols, lintian: Drop reference to private symbols
+ 
+   [ Timo Aaltonen ]
+   * New upstream release. (Closes: #1059854)
+   * control: Enable atomic-ops.
+   * debian/gitlab-ci.yml: Added.
+   * symbols: Updated.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 11 Jan 2024 08:56:52 +0200
  
  libdrm (2.4.117-1) unstable; urgency=medium
  
diff --cc debian/control
index c1cd981,2d2b7c4..8472ef0
--- a/debian/control
+++ b/debian/control
@@@ -5,19 -5,16 +5,18 @@@ Uploaders: Andreas Boll <aboll@debian.o
  Build-Depends:
   debhelper-compat (= 13),
   meson,
-  quilt,
-  xsltproc,
+  libatomic-ops-dev,
+  libpciaccess-dev,
+  libudev-dev [linux-any],
   libx11-dev,
   pkg-config,
-  python3-setuptools,
-  xutils-dev (>= 1:7.6+2),
-  libudev-dev [linux-any],
-  libpciaccess-dev,
   python3-docutils,
+  python3-setuptools,
  # valgrind [amd64 armhf i386 mips mipsel powerpc s390x],
 +Build-conflicts:
 + Valgrind
- Standards-Version: 4.6.0
+ Standards-Version: 4.6.2
+ Rules-Requires-Root: no
  Section: libs
  Vcs-Git: https://salsa.debian.org/xorg-team/lib/libdrm
  Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libdrm