diff -pruN 25.2.3-1/debian/changelog 25.2.3-1ubuntu1/debian/changelog
--- 25.2.3-1/debian/changelog	2025-09-18 08:08:11.000000000 +0000
+++ 25.2.3-1ubuntu1/debian/changelog	2025-09-18 08:14:43.000000000 +0000
@@ -1,3 +1,9 @@
+mesa (25.2.3-1ubuntu1) questing; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 18 Sep 2025 11:14:43 +0300
+
 mesa (25.2.3-1) unstable; urgency=medium
 
   * New upstream release. (LP: #2122654)
@@ -5,6 +11,13 @@ mesa (25.2.3-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 18 Sep 2025 11:08:11 +0300
 
+mesa (25.2.2-1ubuntu1) questing; urgency=medium
+
+  * Merge from Debian.
+  * patches: ANGLE fix dropped, upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 04 Sep 2025 08:58:10 +0300
+
 mesa (25.2.2-1) unstable; urgency=medium
 
   [ Simon McVittie ]
@@ -17,6 +30,17 @@ mesa (25.2.2-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 04 Sep 2025 08:44:46 +0300
 
+mesa (25.2.1-2ubuntu1) questing; urgency=medium
+
+  * Merge from Debian (LP: #2121790), remaining changes:
+    - stay on llvm-20
+    - drop i386 from rusticl, nvk archs
+    - drop libglapi-mesa Provides, handled by mesa-amber
+  * patches: Fix FTBFS with glibc 2.42.
+  * patches: Work around ANGLE brokenness. (LP: #2121774)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 01 Sep 2025 12:07:50 +0300
+
 mesa (25.2.1-2) unstable; urgency=medium
 
   * control, rules: Revert back to llvm-19 as -20 is not in unstable
@@ -56,12 +80,25 @@ mesa (25.2.0-1) experimental; urgency=me
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 07 Aug 2025 14:08:04 +0300
 
+mesa (25.1.7-1ubuntu1) questing; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 04 Aug 2025 09:53:01 +0300
+
 mesa (25.1.7-1) experimental; urgency=medium
 
   * New upstream release.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 04 Aug 2025 08:56:31 +0300
 
+mesa (25.1.5-1ubuntu1) questing; urgency=medium
+
+  * Merge from Debian.
+  * patches: Drop upstreamed revert.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 04 Jul 2025 13:10:08 +0300
+
 mesa (25.1.5-1) experimental; urgency=medium
 
   [ Jianfeng Liu ]
@@ -96,6 +133,31 @@ mesa (25.0.7-2) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 17 Jun 2025 12:07:43 +0300
 
+mesa (25.0.7-0ubuntu4) UNRELEASED; urgency=medium
+
+  * patches: Drop a fix for lp2101817, since 25.0.6 carries a separate
+    fix for that.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 10 Jun 2025 21:00:56 +0300
+
+mesa (25.0.7-0ubuntu3) questing; urgency=medium
+
+  * Revert a bad commit which broke Intel Haswell. (LP: #2113508)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 10 Jun 2025 13:01:12 +0300
+
+mesa (25.0.7-0ubuntu2) questing; urgency=medium
+
+  * Migrate to llvm-20. (LP: #2111265)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 04 Jun 2025 15:04:20 +0300
+
+mesa (25.0.7-0ubuntu1) questing; urgency=medium
+
+  * Merge from Debian git.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 02 Jun 2025 11:05:19 +0300
+
 mesa (25.0.7-1) unstable; urgency=medium
 
   * control: Bump rustc dependency to match upstream.
@@ -136,6 +198,20 @@ mesa (25.0.4-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 22 Apr 2025 13:10:18 +0300
 
+mesa (25.0.3-1ubuntu2) plucky; urgency=medium
+
+  [ Daniel van Vugt ]
+  * Add drisw-Avoid-crashing-when-swrast_loader-NULL.patch (LP: #2101817)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 09 Apr 2025 09:48:08 +0300
+
+mesa (25.0.3-1ubuntu1) plucky; urgency=medium
+
+  * Merge from Debian. (LP: #2106126)
+  * patches: Drop upstreamed pci-id's.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 04 Apr 2025 11:29:37 +0300
+
 mesa (25.0.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -143,6 +219,26 @@ mesa (25.0.3-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 03 Apr 2025 13:47:45 +0300
 
+mesa (25.0.2-1ubuntu2) plucky; urgency=medium
+
+  * Drop libglapi symlink, the functionality will be provided by
+    libglapi-amber instead. (LP: #2104900)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 31 Mar 2025 10:30:01 +0300
+
+mesa (25.0.2-1ubuntu1) plucky; urgency=medium
+
+  [ Timo Aaltonen ]
+  * Merge from Debian.
+  * patches: Add some BMG pci-id's. (LP: #2104011)
+  * patches: Further fixes for spam caused by gfxstream.
+
+  [ Tim Andersson ]
+  * rules, patches: Add a libglapi compatibility symlink for mesa-
+    amber. (LP: #2104006)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 27 Mar 2025 19:19:55 +0200
+
 mesa (25.0.2-1) unstable; urgency=medium
 
   * New upstream release.
@@ -151,6 +247,20 @@ mesa (25.0.2-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 20 Mar 2025 16:52:21 +0200
 
+mesa (25.0.1-2ubuntu2) plucky; urgency=medium
+
+  * control: Drop recommends on libgl1-amber-dri, clean up old
+    constraints. (LP: #2103588)
+  * patches: Fix spam from gfxstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 20 Mar 2025 17:03:18 +0200
+
+mesa (25.0.1-2ubuntu1) plucky; urgency=medium
+
+  * Merge from Debian. (LP: #2102092)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 12 Mar 2025 19:48:27 +0200
+
 mesa (25.0.1-2) unstable; urgency=medium
 
   * rules: Build gfxstream only on 64bit. (Closes: #1099704)
@@ -203,6 +313,12 @@ mesa (25.0.0~rc1-1) experimental; urgenc
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 31 Jan 2025 09:54:17 +0200
 
+mesa (24.3.4-3ubuntu1) plucky; urgency=medium
+
+  * Merge from Debian. (LP: #2096873)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 03 Feb 2025 17:55:09 +0200
+
 mesa (24.3.4-3) unstable; urgency=medium
 
   [ Dmitry Shachnev ]
@@ -214,6 +330,12 @@ mesa (24.3.4-3) unstable; urgency=medium
 
  -- Emilio Pozuelo Monfort <pochu@debian.org>  Mon, 03 Feb 2025 08:40:16 +0100
 
+mesa (24.3.4-2ubuntu1) plucky; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 28 Jan 2025 10:42:31 +0200
+
 mesa (24.3.4-2) unstable; urgency=medium
 
   * Build with gcc-12 and -O1 on ppc64el to workaround segfaults
@@ -259,6 +381,14 @@ mesa (24.3.0~rc1-1) experimental; urgenc
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 12 Nov 2024 15:17:38 +0200
 
+mesa (24.2.8-1ubuntu1) plucky; urgency=medium
+
+  * Merge from Debian, remaining changes:
+    - drop i386 from RUSTICL/NVK_ARCHS
+    - add R/B/R for libgl1-amber-dri
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 28 Nov 2024 14:14:37 +0200
+
 mesa (24.2.8-1) unstable; urgency=medium
 
   * New upstream release.
@@ -289,6 +419,12 @@ mesa (24.2.4-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 03 Oct 2024 22:18:55 +0300
 
+mesa (24.2.3-1ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 23 Sep 2024 12:52:50 +0300
+
 mesa (24.2.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -304,6 +440,13 @@ mesa (24.2.2-1+exp1) experimental; urgen
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 17 Sep 2024 14:43:27 +0300
 
+mesa (24.2.2-1ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian.
+  * patches: Dropped, upstream or obsolete.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 06 Sep 2024 07:21:50 +0300
+
 mesa (24.2.2-1) unstable; urgency=medium
 
   * New upstream release.
@@ -311,6 +454,12 @@ mesa (24.2.2-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 06 Sep 2024 07:13:53 +0300
 
+mesa (24.2.1-4ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 05 Sep 2024 17:42:51 +0300
+
 mesa (24.2.1-4) unstable; urgency=medium
 
   * patches: Add patches to fix autopkgtest regressions in dril.
@@ -325,6 +474,19 @@ mesa (24.2.1-3) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 29 Aug 2024 10:54:30 +0300
 
+mesa (24.2.1-2ubuntu2) oracular; urgency=medium
+
+  * patches: Fix regressions in swrast.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 05 Sep 2024 11:17:29 +0300
+
+mesa (24.2.1-2ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian.
+  * rules: Revert enabling softpipe everywhere.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 29 Aug 2024 10:20:53 +0300
+
 mesa (24.2.1-2) unstable; urgency=medium
 
   [ WANG Xuerui ]
@@ -340,6 +502,26 @@ mesa (24.2.1-2) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 29 Aug 2024 09:42:42 +0300
 
+mesa (24.2.0-2ubuntu3) oracular; urgency=medium
+
+  * patches: Revert a commit to attempt to fix zink regressions.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 20 Aug 2024 13:19:36 +0300
+
+mesa (24.2.0-2ubuntu2) oracular; urgency=medium
+
+  * rules: Enable softpipe again to see if it fixes some autopkgtests.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Sun, 18 Aug 2024 11:45:10 +0300
+
+mesa (24.2.0-2ubuntu1) oracular; urgency=medium
+
+  * Merge from experimental. (LP: #2075549)
+  * patches: Enable LNL pci-id's.
+  * patches: Enable BMG pci-id's.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 15 Aug 2024 13:16:03 +0300
+
 mesa (24.2.0-2) experimental; urgency=medium
 
   * control, rules: Drop armel, mips64el, loong64 from NVK_ARCHS (FTBFS).
@@ -399,6 +581,13 @@ mesa (24.1.6-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 14 Aug 2024 22:04:49 +0300
 
+mesa (24.1.5-3ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian.
+  * rules: Drop i386 from NVK_ARCHS.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 06 Aug 2024 09:58:45 +0300
+
 mesa (24.1.5-3) unstable; urgency=medium
 
   * control: Mark NVK build-deps accordingly.
@@ -407,6 +596,15 @@ mesa (24.1.5-3) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 02 Aug 2024 17:45:45 +0300
 
+mesa (24.1.5-2ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian, remaining changes
+    - control: Add C/R/P for amber
+    - rules: Drop i386 from rusticl archs
+  * add-arl-platform.diff: Dropped, upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 02 Aug 2024 12:58:43 +0300
+
 mesa (24.1.5-2) unstable; urgency=medium
 
   [ Adrian Bunk ]
@@ -506,12 +704,31 @@ mesa (24.1.0~rc1-1) experimental; urgenc
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 25 Apr 2024 09:02:09 +0300
 
+mesa (24.0.9-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release. (LP: #2068918)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 10 Jun 2024 18:50:20 +0300
+
+mesa (24.0.8-1ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 23 May 2024 14:47:32 +0300
+
 mesa (24.0.8-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 23 May 2024 12:57:58 +0300
 
+mesa (24.0.7-1ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian.
+  * patches: Add ARL support. (LP: #2061955)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 10 May 2024 10:38:59 +0300
+
 mesa (24.0.7-1) unstable; urgency=medium
 
   * New upstream release.
@@ -526,6 +743,12 @@ mesa (24.0.6-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 25 Apr 2024 08:39:42 +0300
 
+mesa (24.0.5-1ubuntu1) noble; urgency=medium
+
+  * Merge from Debian. (LP: #2060009, #2060679)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 12 Apr 2024 10:12:19 +0300
+
 mesa (24.0.5-1) unstable; urgency=medium
 
   * New upstream release.
@@ -545,6 +768,32 @@ mesa (24.0.4-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 29 Mar 2024 17:59:50 +0200
 
+mesa (24.0.3-1ubuntu4) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 31 Mar 2024 08:05:45 +0000
+
+mesa (24.0.3-1ubuntu3) noble; urgency=medium
+
+  * Unwind remaining bootstrap changes.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 22 Mar 2024 18:31:49 +0000
+
+mesa (24.0.3-1ubuntu2) noble; urgency=medium
+
+  * Drop the time64 patch, applied with a different name.
+  * Package can be synced.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 22 Mar 2024 03:15:47 +0100
+
+mesa (24.0.3-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Fix time64 build.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 22 Mar 2024 03:02:09 +0100
+
 mesa (24.0.3-1) unstable; urgency=medium
 
   [ Timo Aaltonen ]
@@ -559,6 +808,44 @@ mesa (24.0.3-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 15 Mar 2024 13:03:15 +0200
 
+mesa (24.0.2-1ubuntu8) noble; urgency=medium
+
+  * Build again with libva-dev.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 08 Mar 2024 14:21:44 +0100
+
+mesa (24.0.2-1ubuntu7) noble; urgency=medium
+
+  * Build without WINE on armhf.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 08 Mar 2024 10:17:29 +0100
+
+mesa (24.0.2-1ubuntu6) noble; urgency=medium
+
+  * Fix time64 build.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 08 Mar 2024 08:46:25 +0100
+
+mesa (24.0.2-1ubuntu4) noble; urgency=medium
+
+  * Build without LLVM and rust on armhf.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 08 Mar 2024 08:24:30 +0100
+
+mesa (24.0.2-1ubuntu2) noble; urgency=medium
+
+  * Bootstrap build without libva-dev
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 02 Mar 2024 20:42:07 +0000
+
+mesa (24.0.2-1ubuntu1) noble; urgency=medium
+
+  * Merge from Debian.
+  * radeon-fix-gnome-shell-crash.diff: Fix a regression crashing
+    gnome-shell. (LP: #2054851)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 29 Feb 2024 09:40:21 +0200
+
 mesa (24.0.2-1) unstable; urgency=medium
 
   * New upstream release.
@@ -568,6 +855,12 @@ mesa (24.0.2-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 29 Feb 2024 09:22:00 +0200
 
+mesa (24.0.1-1ubuntu1) noble; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 16 Feb 2024 09:02:05 +0200
+
 mesa (24.0.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -642,6 +935,19 @@ mesa (23.3.3-2) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 16 Jan 2024 14:00:26 +0200
 
+mesa (23.3.3-1ubuntu2) noble; urgency=medium
+
+  * control, rules: Drop i386 from RUSTICL_ARCHS, again.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 12 Jan 2024 14:53:32 +0200
+
+mesa (23.3.3-1ubuntu1) noble; urgency=medium
+
+  * Merge from Debian, remaining changes:
+    - control: R/B/R: libgl1-amber-dri
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 11 Jan 2024 20:57:33 +0200
+
 mesa (23.3.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -695,6 +1001,24 @@ mesa (23.3.1-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 14 Dec 2023 13:17:25 +0200
 
+mesa (23.3.0-2ubuntu3) noble; urgency=medium
+
+  * patches: Revert another commit adding zink autoload on glx.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 12 Dec 2023 23:36:25 +0200
+
+mesa (23.3.0-2ubuntu2) noble; urgency=medium
+
+  * patches: Revert a commit adding zink autoloading.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 11 Dec 2023 12:46:38 +0200
+
+mesa (23.3.0-2ubuntu1) noble; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 08 Dec 2023 18:17:27 +0200
+
 mesa (23.3.0-2) experimental; urgency=medium
 
   * control: Add libvulkan1 to libgl1-mesa-dri Depends where zink is
@@ -705,6 +1029,13 @@ mesa (23.3.0-2) experimental; urgency=me
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 08 Dec 2023 09:23:13 +0200
 
+mesa (23.3.0-1ubuntu1) noble; urgency=medium
+
+  * Merge from Debian.
+  * patches: Drop upstreamed patches.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 01 Dec 2023 12:11:39 +0200
+
 mesa (23.3.0-1) experimental; urgency=medium
 
   * New upstream release.
@@ -768,6 +1099,33 @@ mesa (23.3.0~rc1-1) experimental; urgenc
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 26 Oct 2023 14:28:22 +0300
 
+mesa (23.2.1-1ubuntu4) noble; urgency=medium
+
+  * patches: Avoid crashing virglrenderer when the host doesn't support
+    PIPE_CAP_CLEAR_TEXTURE (LP#2038834)
+
+ -- Mate Kukri <mate.kukri@canonical.com>  Tue, 07 Nov 2023 15:41:32 +0200
+
+mesa (23.2.1-1ubuntu3) mantic; urgency=medium
+
+  * patches: Fix a function name collision causing crashes. (LP:
+    #2037497)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 06 Oct 2023 11:58:09 +0300
+
+mesa (23.2.1-1ubuntu2) mantic; urgency=medium
+
+  * d/p/v3d-v3dv-support-for-HW-7.1.x.patch
+    - [FFe] Raspberry Pi 5 (LP: #2037642)
+
+ -- Juerg Haefliger <juerg.haefliger@canonical.com>  Fri, 29 Sep 2023 08:27:32 +0200
+
+mesa (23.2.1-1ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 29 Sep 2023 08:46:32 +0300
+
 mesa (23.2.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -775,6 +1133,13 @@ mesa (23.2.1-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 29 Sep 2023 08:38:02 +0300
 
+mesa (23.2.0~rc4-1ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian. (LP: #2036611)
+  * control, rules: Stay on llvm 15 until bindgen update has landed.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 25 Sep 2023 18:50:55 +0300
+
 mesa (23.2.0~rc4-1) unstable; urgency=medium
 
   * New upstream release candidate.
@@ -814,6 +1179,13 @@ mesa (23.2.0~rc3-1) experimental; urgenc
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 07 Sep 2023 15:28:51 +0300
 
+mesa (23.1.7-1ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian.
+  * revert-13422.diff: Drop reverts, fix upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 08 Sep 2023 13:41:34 +0300
+
 mesa (23.1.7-1) unstable; urgency=medium
 
   * New upstream release.
@@ -843,12 +1215,27 @@ mesa (23.1.4-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 28 Jul 2023 17:39:12 +0300
 
+mesa (23.1.3-1ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian.
+  * revert-13422.diff: Revert a bunch of commits to fix gtk4
+    autopkgtests. (LP: #2025982)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 05 Jul 2023 18:13:17 +0300
+
 mesa (23.1.3-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 05 Jul 2023 17:23:23 +0300
 
+mesa (23.1.2-1ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian.
+  * patches: Drop upstreamed patches.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 14 Jun 2023 16:45:43 +0300
+
 mesa (23.1.2-1) unstable; urgency=medium
 
   * New upstream release.
@@ -882,12 +1269,48 @@ mesa (23.1.0~rc2-1) experimental; urgenc
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 20 Apr 2023 13:29:54 +0300
 
+mesa (23.0.4-0ubuntu1) mantic; urgency=medium
+
+  * New upstream release. (LP: #2021948)
+    - add a revert for amdgpu which missed 23.0.x branch
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 09 Jun 2023 12:53:37 +0300
+
+mesa (23.0.3-0ubuntu2) mantic; urgency=medium
+
+  * rules: Set VERSION so that it also includes the packaging
+    revision. (LP: #2020604)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 30 May 2023 09:53:55 +0300
+
+mesa (23.0.3-0ubuntu1) mantic; urgency=medium
+
+  * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 03 May 2023 13:10:05 +0300
+
+mesa (23.0.2-1ubuntu1) lunar; urgency=medium
+
+  [ Timo Aaltonen ]
+  * Merge from Debian.
+
+  [ Juerg Haefliger ]
+  * freedreno: a690 support. (LP: #2015182)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 12 Apr 2023 10:24:25 +0300
+
 mesa (23.0.2-1) experimental; urgency=medium
 
   * New upstream release.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 11 Apr 2023 11:51:28 +0300
 
+mesa (23.0.1-1ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian. (LP: #2009481)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 27 Mar 2023 20:00:13 +0300
+
 mesa (23.0.1-1) experimental; urgency=medium
 
   * New upstream release.
@@ -926,6 +1349,19 @@ mesa (22.3.7-1) UNRELEASED; urgency=medi
 
  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 13 Mar 2023 09:37:36 +0200
 
+mesa (22.3.6-1ubuntu2) lunar; urgency=medium
+
+  * control: Add replaces/breaks to -dri for amber. (LP: #2006744)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 07 Mar 2023 10:24:33 +0200
+
+mesa (22.3.6-1ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian.
+  * rules: Drop i386 from RUSTICL_ARCHS.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 28 Feb 2023 21:57:55 +0200
+
 mesa (22.3.6-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #1029731)
@@ -938,6 +1374,12 @@ mesa (22.3.5-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 09 Feb 2023 20:43:32 +0200
 
+mesa (22.3.4-1ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Sat, 28 Jan 2023 12:43:07 +0200
+
 mesa (22.3.4-1) unstable; urgency=medium
 
   * New upstream release.
@@ -1042,6 +1484,18 @@ mesa (22.3.0~rc1-1) experimental; urgenc
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 08 Nov 2022 13:32:45 +0200
 
+mesa (22.2.5-0ubuntu1) lunar; urgency=medium
+
+  * New upstream release. (LP: #1999336)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Sun, 11 Dec 2022 19:50:00 +0200
+
+mesa (22.2.4-1ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 29 Nov 2022 10:59:31 +0200
+
 mesa (22.2.3-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #1022730)
@@ -1055,6 +1509,12 @@ mesa (22.2.2-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 21 Oct 2022 10:17:18 +0300
 
+mesa (22.2.1-1ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian. (LP: #1992656)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 12 Oct 2022 17:10:22 +0300
+
 mesa (22.2.1-1) unstable; urgency=medium
 
   [ Zhang Boyang ]
@@ -1068,6 +1528,14 @@ mesa (22.2.1-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 12 Oct 2022 11:48:24 +0300
 
+mesa (22.2.0-1ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian. (LP: #1990387)
+  * patches: Drop DG2 patches that won't be getting applied upstream.
+  * control, rules: Migrate to llvm-15.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 26 Sep 2022 12:12:03 +0300
+
 mesa (22.2.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -1106,6 +1574,13 @@ mesa (22.2.0~rc1-1) unstable; urgency=me
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 04 Aug 2022 10:33:09 +0300
 
+mesa (22.1.7-0ubuntu1) kinetic; urgency=medium
+
+  * New upstream release.
+  * Refresh patch 0004.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 18 Aug 2022 15:55:38 +0300
+
 mesa (22.1.5-1) unstable; urgency=medium
 
   * New upstream release.
@@ -1113,6 +1588,13 @@ mesa (22.1.5-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 04 Aug 2022 09:49:41 +0300
 
+mesa (22.1.3-1ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian.
+  * patches: Drop most of DG2 patches, upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 06 Jul 2022 09:30:27 +0300
+
 mesa (22.1.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -1141,6 +1623,12 @@ mesa (22.1.0~rc3-1) experimental; urgenc
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 03 May 2022 13:08:46 +0300
 
+mesa (22.0.5-1ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 08 Jun 2022 10:27:40 +0300
+
 mesa (22.0.5-1) unstable; urgency=medium
 
   * New upstream release.
@@ -1171,6 +1659,29 @@ mesa (22.0.1-2) experimental; urgency=me
 
  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 04 Apr 2022 12:40:09 +0300
 
+mesa (22.0.1-1ubuntu3) kinetic; urgency=medium
+
+  * Add patches to support Intel DG2. (LP: #1971712)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 09 May 2022 13:44:31 +0300
+
+mesa (22.0.1-1ubuntu2) jammy; urgency=medium
+
+  * revert-af1ee8e01044.diff: Revert a commit which broke webkitgtk.
+    (LP: #1966418)
+  * enable-dg2.diff: Dropped, it's too soon to enable DG2.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 14 Apr 2022 13:28:58 +0300
+
+mesa (22.0.1-1ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian.
+  * Drop patch for GFX1036, upstream.
+  * control: Actually recommend libgl1-amber-dri.
+  * enable-dg2.diff: Fixed to detect DG2 platform.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 30 Mar 2022 11:59:33 +0300
+
 mesa (22.0.1-1) experimental; urgency=medium
 
   * New upstream release.
@@ -1180,6 +1691,28 @@ mesa (22.0.1-1) experimental; urgency=me
 
  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 30 Mar 2022 11:47:25 +0300
 
+mesa (22.0.0-0ubuntu3) jammy; urgency=medium
+
+  * revert-enabling-tlsdesc-support.diff: Revert a commit that's causing
+    apps to crash. (LP: #1966221)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 29 Mar 2022 18:01:26 +0300
+
+mesa (22.0.0-0ubuntu2) jammy; urgency=medium
+
+  * Backport support for GFX1036.  This follows the same codepaths as
+    Yellow Carp.
+
+ -- Mario Limonciello <superm1@gmail.com>  Wed, 23 Mar 2022 14:17:23 -0500
+
+mesa (22.0.0-0ubuntu1) jammy; urgency=medium
+
+  * Upload to jammy.
+  * enable-dg2.diff: Enable Intel DG2 pci-id's.
+  * control: Add libgl1-amber-dri to libgl1-mesa-dri Recommends.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 22 Mar 2022 16:27:59 +0200
+
 mesa (22.0.0-1) experimental; urgency=medium
 
   * New upstream release.
diff -pruN 25.2.3-1/debian/control 25.2.3-1ubuntu1/debian/control
--- 25.2.3-1/debian/control	2025-09-18 08:08:11.000000000 +0000
+++ 25.2.3-1ubuntu1/debian/control	2025-09-18 08:14:43.000000000 +0000
@@ -1,7 +1,8 @@
 Source: mesa
 Section: graphics
 Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Andreas Boll <aboll@debian.org>
 Standards-Version: 4.1.4
 Build-Depends:
@@ -46,24 +47,24 @@ Build-Depends:
  libelf-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
  libwayland-dev (>= 1.15.0) [linux-any],
  libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
- llvm-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
- libclang-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
- libclang-cpp19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
- libclc-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
- libclc-19 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
+ llvm-20-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
+ libclang-20-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
+ libclang-cpp20-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
+ libclc-20-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
+ libclc-20 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
  wayland-protocols (>= 1.38),
  zlib1g-dev,
  libglvnd-core-dev (>= 1.3.2),
  valgrind [amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x],
- rustc (>= 1.78) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
- rustfmt [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
- bindgen (>= 0.71~) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
- cbindgen [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
- llvm-spirv-19 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
- libllvmspirvlib-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
- librust-rustc-hash-2-dev [amd64 arm64 armhf i386 ppc64 riscv64 x32],
- librust-paste-dev [amd64 arm64 armhf i386 ppc64 riscv64 x32],
- librust-syn-dev (>= 2.0.48) [amd64 arm64 armhf i386 ppc64 riscv64 x32],
+ rustc (>= 1.78) [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
+ rustfmt [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
+ bindgen (>= 0.71~) [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
+ cbindgen [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
+ llvm-spirv-20 [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
+ libllvmspirvlib-20-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
+ librust-rustc-hash-2-dev [amd64 arm64 armhf ppc64 riscv64 x32],
+ librust-paste-dev [amd64 arm64 armhf ppc64 riscv64 x32],
+ librust-syn-dev (>= 2.0.48) [amd64 arm64 armhf ppc64 riscv64 x32],
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
 Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
@@ -231,7 +232,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
-Provides: libglapi-mesa
 Multi-Arch: same
 Description: shared infrastructure for Mesa drivers
  This package contains libgallium, a private library shared between
@@ -310,10 +310,10 @@ Description: Mesa Vulkan graphics driver
 
 Package: mesa-opencl-icd
 Section: libs
-Architecture: amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32
+Architecture: amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
- libclc-19,
+ libclc-20,
  ocl-icd-libopencl1 | libopencl1,
  ${shlibs:Depends},
  ${misc:Depends},
diff -pruN 25.2.3-1/debian/control.in 25.2.3-1ubuntu1/debian/control.in
--- 25.2.3-1/debian/control.in	2025-09-17 14:51:31.000000000 +0000
+++ 25.2.3-1ubuntu1/debian/control.in	2025-09-18 08:13:14.000000000 +0000
@@ -1,7 +1,8 @@
 Source: mesa
 Section: graphics
 Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Andreas Boll <aboll@debian.org>
 Standards-Version: 4.1.4
 Build-Depends:
@@ -231,7 +232,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
-Provides: libglapi-mesa
 Multi-Arch: same
 Description: shared infrastructure for Mesa drivers
  This package contains libgallium, a private library shared between
diff -pruN 25.2.3-1/debian/rules 25.2.3-1ubuntu1/debian/rules
--- 25.2.3-1/debian/rules	2025-09-17 14:51:31.000000000 +0000
+++ 25.2.3-1ubuntu1/debian/rules	2025-09-18 08:13:14.000000000 +0000
@@ -13,7 +13,7 @@ DEB_HOST_ARCH_OS   ?= $(shell dpkg-archi
 DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 # for finding the correct llvm-config when meson doesn't know about it yet
-LLVM_VERSION = 19
+LLVM_VERSION = 20
 export PATH:=/usr/lib/llvm-$(LLVM_VERSION)/bin/:$(PATH)
 
 export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
@@ -50,8 +50,8 @@ VULKAN_LAYERS =
 confflags_TEFLON = -Dteflon=false
 
 LLVM_ARCHS     = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
-RUSTICL_ARCHS  = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32
-NVK_ARCHS      = amd64 arm64 armhf i386 ppc64 riscv64 x32
+RUSTICL_ARCHS  = amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32
+NVK_ARCHS      = amd64 arm64 armhf ppc64 riscv64 x32
 VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x
 
 # hurd doesn't do direct rendering
