diff --git a/.github/release-nest-i386 b/.github/release-nest-i386
index e440e5c..bf0d87a 100644
--- a/.github/release-nest-i386
+++ b/.github/release-nest-i386
@@ -1 +1 @@
-3
\ No newline at end of file
+4
\ No newline at end of file
diff --git a/.github/release-nest-v3 b/.github/release-nest-v3
index 9d60796..bf0d87a 100644
--- a/.github/release-nest-v3
+++ b/.github/release-nest-v3
@@ -1 +1 @@
-11
\ No newline at end of file
+4
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 98e38a0..d275055 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (24.2.2-101pika1) pika; urgency=medium
+mesa (24.2.2-101pika2) pika; urgency=medium
 
   * PikaOS 4 port
 
diff --git a/debian/control b/debian/control
index 19bbf20..e34b49f 100644
--- a/debian/control
+++ b/debian/control
@@ -76,24 +76,101 @@ Homepage: https://mesa3d.org/
 Package: libxatracker2
 Section: libs
 Architecture: amd64 i386 x32
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
+Conflicts: libxatracker2-git
+Replaces: libxatracker2-git
 Description: X acceleration library -- runtime
  This package contains the XA (X acceleration) library.  It is used exclusively
  by the X server to do render, copy and video acceleration.
  .
  XA is intended to be used by the vmware driver for virtualized X acceleration.
 
+
+Package: mesa-stable
+Section: libs
+Architecture: any
+Depends: libmesa-stable,
+ ${shlibs:Depends},
+ ${misc:Depends},
+ mesa-stable:i386 (= ${binary:Version}) [amd64],
+ mesa-stable:amd64 (= ${binary:Version}) [i386],
+ libd3dadapter9-mesa (= ${binary:Version}),
+ libegl-mesa0 (= ${binary:Version}),
+ libegl1-mesa-dev (= ${binary:Version}),
+ libegl1-mesa (= ${binary:Version}),
+ libgbm-dev (= ${binary:Version}),
+ libgbm1 (= ${binary:Version}),
+ libgl1-mesa-dri (= ${binary:Version}),
+ libgl1-mesa-glx (= ${binary:Version}),
+ libglapi-mesa (= ${binary:Version}),
+ libgles2-mesa (= ${binary:Version}),
+ libglx-mesa0 (= ${binary:Version}),
+ libosmesa6 (= ${binary:Version}),
+ libxatracker2 (= ${binary:Version}),
+ mesa-common-dev (= ${binary:Version}),
+ mesa-va-drivers (= ${binary:Version}),
+ mesa-vdpau-drivers (= ${binary:Version}),
+ mesa-vulkan-drivers (= ${binary:Version}),
+Pre-Depends: ${misc:Pre-Depends}
+Conflicts: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
+Replaces: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
+Multi-Arch: same
+Description: a meta package to install the latest stable version of mesa.
+
+Package: mesa-stable-no-march
+Section: libs
+Architecture: any
+Depends: libmesa-stable,
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libd3dadapter9-mesa (= ${binary:Version}),
+ libegl-mesa0 (= ${binary:Version}),
+ libegl1-mesa-dev (= ${binary:Version}),
+ libegl1-mesa (= ${binary:Version}),
+ libgbm-dev (= ${binary:Version}),
+ libgbm1 (= ${binary:Version}),
+ libgl1-mesa-dri (= ${binary:Version}),
+ libgl1-mesa-glx (= ${binary:Version}),
+ libglapi-mesa (= ${binary:Version}),
+ libgles2-mesa (= ${binary:Version}),
+ libglx-mesa0 (= ${binary:Version}),
+ libosmesa6 (= ${binary:Version}),
+ libxatracker2 (= ${binary:Version}),
+ mesa-common-dev (= ${binary:Version}),
+ mesa-va-drivers (= ${binary:Version}),
+ mesa-vdpau-drivers (= ${binary:Version}),
+ mesa-vulkan-drivers (= ${binary:Version}),
+Pre-Depends: ${misc:Pre-Depends}
+Conflicts: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable, mesa-git-no-march, mesa-custom-no-march
+Replaces: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable, mesa-git-no-march, mesa-custom-no-march
+Provides: mesa-stable
+Description: a meta package to install the latest stable version of mesa (no Multi-Arch Support).
+
+Package: libmesa-stable
+Section: libs
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libmesa-hybrid, libmesa-git, libmesa-custom
+Replaces: libmesa-hybrid, libmesa-git, libmesa-custom
+Multi-Arch: same
+Description: mesa stable core.
+
 Package: libxatracker-dev
 Section: libdevel
 Architecture: amd64 i386 x32
-Depends:
+Depends: libmesa-stable,
  libxatracker2 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
+Conflicts: libxatracker-git-dev
+Replaces: libxatracker-git-dev
 Description: X acceleration library -- development files
  This package contains the XA (X acceleration) library.  It is used exclusively
  by the X server to do render, copy and video acceleration.
@@ -105,8 +182,10 @@ Description: X acceleration library -- development files
 
 Package: libd3dadapter9-mesa
 Section: libs
-Architecture: amd64 arm64 armel armhf i386
-Depends:
+Architecture: amd64 arm64 armel armhf i386 powerpc
+Conflicts: libd3dadapter9-mesa-git
+Replaces: libd3dadapter9-mesa-git
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
  libudev1 [linux-any],
@@ -119,13 +198,15 @@ Description: state-tracker for Direct3D9
 
 Package: libd3dadapter9-mesa-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386
-Depends:
+Architecture: amd64 arm64 armel armhf i386 powerpc
+Depends: libmesa-stable,
  libd3dadapter9-mesa (= ${binary:Version}),
  libudev1 [linux-any],
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
+Conflicts: libd3dadapter9-mesa-git-dev
+Replaces: libd3dadapter9-mesa-git-dev
 Description: state-tracker for Direct3D9 -- development files
  This package contains a Gallium3D state tracker that implements the Direct3D9
  API.  Combined with the gallium-nine branch of Wine, programs using D3D9 can
@@ -135,13 +216,14 @@ Description: state-tracker for Direct3D9 -- development files
 
 Package: libgbm1
 Section: libs
-Architecture: linux-any
-Depends:
+Architecture: linux-any kfreebsd-any
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
- mesa-libgallium (= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
+Conflicts: libgbm1-git
+Replaces: libgbm1-git
 Description: generic buffer management API -- runtime
  This package contains the GBM buffer management library.  It provides a
  mechanism for allocating buffers for graphics rendering tied to Mesa.
@@ -150,11 +232,13 @@ Description: generic buffer management API -- runtime
 
 Package: libgbm-dev
 Section: libdevel
-Architecture: linux-any
-Depends:
+Architecture: linux-any kfreebsd-any
+Depends: libmesa-stable,
  libgbm1 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
+Conflicts: libgbm-dev-git
+Replaces: libgbm-dev-git
 Description: generic buffer management API -- development files
  This package contains the GBM buffer management library.  It provides a
  mechanism for allocating buffers for graphics rendering tied to Mesa.
@@ -167,12 +251,13 @@ Description: generic buffer management API -- development files
 Package: libegl-mesa0
 Section: libs
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
  libgbm1 (= ${binary:Version}) [!hurd-any],
- mesa-libgallium (= ${binary:Version}),
 Provides: libegl-vendor
+Conflicts: libegl-mesa0-git
+Replaces: libegl-mesa0-git
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: free implementation of the EGL API -- Mesa vendor library
@@ -182,14 +267,28 @@ Description: free implementation of the EGL API -- Mesa vendor library
  .
  This package contains the Mesa vendor library for EGL.
 
+Package: libegl1-mesa
+Section: oldlibs
+Architecture: any
+Depends: libmesa-stable,
+ libegl1,
+ ${misc:Depends},
+Conflicts: libegl1-mesa-git
+Replaces: libegl1-mesa-git
+Multi-Arch: same
+Description: transitional dummy package
+ This is a transitional dummy package, it can be safely removed.
+
 Package: libegl1-mesa-dev
 Section: libdevel
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  libegl-dev,
  libglvnd-dev,
  ${misc:Depends},
 Multi-Arch: same
+Conflicts: libegl1-mesa-git-dev
+Replaces: libegl1-mesa-git-dev
 Description: free implementation of the EGL API -- development files
  This package contains the development environment required for compiling
  programs against EGL native platform graphics interface library.
@@ -199,25 +298,55 @@ Description: free implementation of the EGL API -- development files
  This package provides the development environment for compiling programs
  against the EGL library.
 
+Package: libwayland-egl1-mesa
+Section: oldlibs
+Architecture: linux-any
+Depends: libmesa-stable,
+ ${misc:Depends},
+ libegl1,
+ libwayland-egl1,
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Conflicts: libwayland-egl1-mesa-git
+Replaces: libwayland-egl1-mesa-git
+Description: transitional dummy package
+ This is a transitional dummy package, it can be safely removed.
+
+Package: libgles2-mesa
+Section: oldlibs
+Architecture: any
+Depends: libmesa-stable,
+ libgles2,
+ ${misc:Depends},
+Multi-Arch: same
+Conflicts: libgles2-mesa-git
+Replaces: libgles2-mesa-git
+Description: transitional dummy package
+ This is a transitional dummy package, it can be safely removed.
+
 Package: libgles2-mesa-dev
 Section: oldlibs
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  libgles-dev,
  libglvnd-dev,
  ${misc:Depends},
 Multi-Arch: same
+Conflicts: libgles2-mesa-git-dev
+Replaces: libgles2-mesa-git-dev
 Description: transitional dummy package
  This is a transitional dummy package, it can be safely removed.
 
 Package: libglapi-mesa
 Section: libs
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
+Conflicts: libglapi-mesa-git
+Replaces: libglapi-mesa-git
 Description: free implementation of the GL API -- shared library
  The Mesa GL API module is responsible for dispatching all the gl*
  functions. It is intended to be mainly used by both the libgles1-mesa
@@ -226,16 +355,17 @@ Description: free implementation of the GL API -- shared library
 Package: libglx-mesa0
 Section: libs
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
  libgl1-mesa-dri,
- mesa-libgallium (= ${binary:Version}),
 Provides: libglx-vendor
 Breaks:
  libopengl-perl (<< 0.6704+dfsg-2),
  glx-diversions (<< 0.8.4~),
 Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libglx-mesa0-git
+Replaces: libglx-mesa0-git
 Multi-Arch: same
 Description: free implementation of the OpenGL API -- GLX vendor library
  Mesa is a 3-D graphics library with an API which is very similar to
@@ -252,14 +382,33 @@ Description: free implementation of the OpenGL API -- GLX vendor library
  This package does not include the modules themselves: these can be found
  in the libgl1-mesa-dri package.
 
+Package: libgl1-mesa-glx
+Section: oldlibs
+Architecture: any
+Depends: libmesa-stable,
+ libgl1,
+ libglx-mesa0,
+ ${misc:Depends},
+Multi-Arch: same
+Conflicts: libgl1-mesa-glx-git
+Replaces: libgl1-mesa-glx-git
+Description: transitional dummy package
+ This is a transitional dummy package, it can be safely removed.
+
 Package: libgl1-mesa-dri
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends:
- libvulkan1 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends}
+Recommends:
+ libgl1-amber-dri
+Breaks:
+ libgl1-amber-dri (<< 21.3.9)
+Replaces:
+ libgl1-amber-dri (<< 21.3.9), libgl1-mesa-dri-git
+Conflicts: libgl1-mesa-dri-git
 Multi-Arch: same
 Description: free implementation of the OpenGL API -- DRI modules
  This version of Mesa provides GLX and DRI capabilities: it is capable of
@@ -275,51 +424,43 @@ Description: free implementation of the OpenGL API -- DRI modules
 Package: libgl1-mesa-dev
 Section: oldlibs
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  libgl-dev,
  libglvnd-dev,
  ${misc:Depends},
 Multi-Arch: same
+Conflicts: libgl1-mesa-git-dev
+Replaces: libgl1-mesa-git-dev
 Description: transitional dummy package
  This is a transitional dummy package, it can be safely removed.
 
 Package: mesa-common-dev
 Section: libdevel
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  libgl-dev,
  libglx-dev,
  libx11-dev,
  libdrm-dev (>= 2.4.95) [!hurd-any],
  ${misc:Depends},
 Breaks: libegl1-mesa-dev (<< 18.2.5-2)
-Replaces: libegl1-mesa-dev (<< 18.2.5-2)
+Replaces: libegl1-mesa-dev (<< 18.2.5-2), mesa-common-git-dev
+Conflicts: mesa-common-git-dev
 Multi-Arch: same
 Description: Developer documentation for Mesa
  This package includes the specifications for the Mesa-specific OpenGL
  extensions, the complete set of release notes and the development header
  files common to all Mesa packages.
 
-Package: mesa-libgallium
-Section: libs
-Architecture: linux-any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: shared infrastructure for Mesa drivers
- This package contains libgallium, a private library shared between
- multiple Mesa drivers. This library is an implementation detail of Mesa
- and should not be used directly by user code.
-
 Package: libosmesa6
 Section: libs
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libosmesa6-git
+Replaces: libosmesa6-git
 Multi-Arch: same
 Description: Mesa Off-screen rendering extension
  OSmesa is a Mesa extension that allows programs to render to an
@@ -332,12 +473,12 @@ Description: Mesa Off-screen rendering extension
 Package: libosmesa6-dev
 Section: libdevel
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  libosmesa6 (= ${binary:Version}),
  mesa-common-dev (= ${binary:Version}) | libgl-dev,
  ${misc:Depends},
-Conflicts: libosmesa-dev
-Replaces: libosmesa-dev
+Conflicts: libosmesa-dev, libosmesa6-git-dev, libosmesa-git-dev
+Replaces: libosmesa-dev, libosmesa6-git-dev,  libosmesa-git-dev
 Provides: libosmesa-dev
 Multi-Arch: same
 Description: Mesa Off-screen rendering extension -- development files
@@ -346,24 +487,11 @@ Description: Mesa Off-screen rendering extension -- development files
  .
  For more information on OSmesa see the libosmesa6 package.
 
-Package: mesa-teflon-delegate
-Section: libs
-Architecture: arm64
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: Mesa TensorFlow Lite external delegate
- TensorFlow Lite delegate which can make use of NPUs to accelerate ML
- inference. It is implemented in the form of a external delegate, a shared
- library which the TensorFlow Lite runtime can load at startup.
-
 Package: mesa-va-drivers
 Section: libs
-Architecture: linux-any
+Architecture: linux-any kfreebsd-any
 Build-Profiles: <!pkg.mesa.nolibva>
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
 Enhances:
@@ -371,7 +499,8 @@ Enhances:
 Provides:
  va-driver,
 Breaks: vdpau-va-driver (<< 0.7.4-5)
-Replaces: vdpau-va-driver (<< 0.7.4-5)
+Replaces: vdpau-va-driver (<< 0.7.4-5), mesa-va-drivers-git
+Conflicts: mesa-va-drivers-git
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Description: Mesa VA-API video acceleration drivers
@@ -383,8 +512,8 @@ Description: Mesa VA-API video acceleration drivers
 
 Package: mesa-vdpau-drivers
 Section: libs
-Architecture: linux-any
-Depends:
+Architecture: linux-any kfreebsd-any
+Depends: libmesa-stable,
  libvdpau1,
  ${shlibs:Depends},
  ${misc:Depends},
@@ -392,6 +521,8 @@ Enhances:
  libvdpau1,
 Provides:
  vdpau-driver,
+Replaces: mesa-vdpau-drivers-git
+Conflicts: mesa-vdpau-drivers-git
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Description: Mesa VDPAU video acceleration drivers
@@ -403,14 +534,16 @@ Description: Mesa VDPAU video acceleration drivers
 
 Package: mesa-vulkan-drivers
 Section: libs
-Architecture: amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
+Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
 Pre-Depends: ${misc:Pre-Depends}
-Depends:
+Depends: libmesa-stable,
  libvulkan1,
- python3:any,
+ python3:any | python3-minimal:any,
  ${shlibs:Depends},
  ${misc:Depends}
 Provides: vulkan-icd
+Conflicts: mesa-vulkan-drivers-git
+Replaces: mesa-vulkan-drivers-git
 Multi-Arch: same
 Description: Mesa Vulkan graphics drivers
  Vulkan is a low-overhead 3D graphics and compute API. This package
@@ -418,14 +551,16 @@ Description: Mesa Vulkan graphics drivers
 
 Package: mesa-opencl-icd
 Section: libs
-Architecture: amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
+Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
 Pre-Depends: ${misc:Pre-Depends}
-Depends:
+Depends: libmesa-stable,
  libclc-17,
  ocl-icd-libopencl1 | libopencl1,
  ${shlibs:Depends},
  ${misc:Depends},
 Provides: opencl-icd
+Conflicts: mesa-opencl-icd-git
+Replaces: mesa-opencl-icd-git
 Multi-Arch: same
 Description: free implementation of the OpenCL API -- ICD runtime
  This package contains the mesa implementation of the OpenCL (Open Compute
@@ -435,14 +570,16 @@ Description: free implementation of the OpenCL API -- ICD runtime
 
 Package: mesa-drm-shim
 Section: libs
-Architecture: amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el s390x sparc64
+Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
 Pre-Depends: ${misc:Pre-Depends}
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
+Conflicts: mesa-drm-shim-git
+Replaces: mesa-drm-shim-git
 Multi-Arch: same
 Description: DRM shim libraries
- This package provides drm-shim libraries which can be used for testing DRM
- drivers when none exists on the host.
+ This package provides drm-shim libraries which can be used for testing DRM drivers when
+ none exists on the host
 
-# vim: tw=0
+# vim: tw=0
\ No newline at end of file
diff --git a/debian/control.in b/debian/control.in
index 7ea22a3..218fec5 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -73,14 +73,88 @@ Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
 Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
 Homepage: https://mesa3d.org/
 
-Package: libxatracker2
+Package: mesa-stable
 Section: libs
-Architecture: amd64 i386 x32
+Architecture: any
+Depends: libmesa-stable,
+ ${shlibs:Depends},
+ ${misc:Depends},
+ mesa-stable:i386 (= ${binary:Version}) [amd64],
+ mesa-stable:amd64 (= ${binary:Version}) [i386],
+ libd3dadapter9-mesa (= ${binary:Version}),
+ libegl-mesa0 (= ${binary:Version}),
+ libegl1-mesa-dev (= ${binary:Version}),
+ libegl1-mesa (= ${binary:Version}),
+ libgbm-dev (= ${binary:Version}),
+ libgbm1 (= ${binary:Version}),
+ libgl1-mesa-dri (= ${binary:Version}),
+ libgl1-mesa-glx (= ${binary:Version}),
+ libglapi-mesa (= ${binary:Version}),
+ libgles2-mesa (= ${binary:Version}),
+ libglx-mesa0 (= ${binary:Version}),
+ libosmesa6 (= ${binary:Version}),
+ libxatracker2 (= ${binary:Version}),
+ mesa-common-dev (= ${binary:Version}),
+ mesa-va-drivers (= ${binary:Version}),
+ mesa-vdpau-drivers (= ${binary:Version}),
+ mesa-vulkan-drivers (= ${binary:Version}),
+Pre-Depends: ${misc:Pre-Depends}
+Conflicts: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
+Replaces: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
+Multi-Arch: same
+Description: a meta package to install the latest stable version of mesa.
+
+Package: mesa-stable-no-march
+Section: libs
+Architecture: any
+Depends: libmesa-stable,
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libd3dadapter9-mesa (= ${binary:Version}),
+ libegl-mesa0 (= ${binary:Version}),
+ libegl1-mesa-dev (= ${binary:Version}),
+ libegl1-mesa (= ${binary:Version}),
+ libgbm-dev (= ${binary:Version}),
+ libgbm1 (= ${binary:Version}),
+ libgl1-mesa-dri (= ${binary:Version}),
+ libgl1-mesa-glx (= ${binary:Version}),
+ libglapi-mesa (= ${binary:Version}),
+ libgles2-mesa (= ${binary:Version}),
+ libglx-mesa0 (= ${binary:Version}),
+ libosmesa6 (= ${binary:Version}),
+ libxatracker2 (= ${binary:Version}),
+ mesa-common-dev (= ${binary:Version}),
+ mesa-va-drivers (= ${binary:Version}),
+ mesa-vdpau-drivers (= ${binary:Version}),
+ mesa-vulkan-drivers (= ${binary:Version}),
+Pre-Depends: ${misc:Pre-Depends}
+Conflicts: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable, mesa-git-no-march, mesa-custom-no-march
+Replaces: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable, mesa-git-no-march, mesa-custom-no-march
+Provides: mesa-stable
+Description: a meta package to install the latest stable version of mesa (no Multi-Arch Support).
+
+Package: libmesa-stable
+Section: libs
+Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libmesa-hybrid, libmesa-git, libmesa-custom
+Replaces: libmesa-hybrid, libmesa-git, libmesa-custom
 Multi-Arch: same
+Description: mesa stable core.
+
+Package: libxatracker2
+Section: libs
+Architecture: amd64 i386 x32
+Depends: libmesa-stable,
+ ${shlibs:Depends},
+ ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Conflicts: libxatracker2-git
+Replaces: libxatracker2-git
 Description: X acceleration library -- runtime
  This package contains the XA (X acceleration) library.  It is used exclusively
  by the X server to do render, copy and video acceleration.
@@ -90,10 +164,12 @@ Description: X acceleration library -- runtime
 Package: libxatracker-dev
 Section: libdevel
 Architecture: amd64 i386 x32
-Depends:
+Depends: libmesa-stable,
  libxatracker2 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
+Conflicts: libxatracker-git-dev
+Replaces: libxatracker-git-dev
 Description: X acceleration library -- development files
  This package contains the XA (X acceleration) library.  It is used exclusively
  by the X server to do render, copy and video acceleration.
@@ -106,11 +182,13 @@ Description: X acceleration library -- development files
 Package: libd3dadapter9-mesa
 Section: libs
 Architecture: @WINE_ARCHS@
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
  libudev1 [linux-any],
 Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libd3dadapter9-mesa-git
+Replaces: libd3dadapter9-mesa-git
 Multi-Arch: same
 Description: state-tracker for Direct3D9
  This package contains a Gallium3D state tracker that implements the Direct3D9
@@ -120,12 +198,14 @@ Description: state-tracker for Direct3D9
 Package: libd3dadapter9-mesa-dev
 Section: libdevel
 Architecture: @WINE_ARCHS@
-Depends:
+Depends: libmesa-stable,
  libd3dadapter9-mesa (= ${binary:Version}),
  libudev1 [linux-any],
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
+Conflicts: libd3dadapter9-mesa-git-dev
+Replaces: libd3dadapter9-mesa-git-dev
 Description: state-tracker for Direct3D9 -- development files
  This package contains a Gallium3D state tracker that implements the Direct3D9
  API.  Combined with the gallium-nine branch of Wine, programs using D3D9 can
@@ -135,13 +215,14 @@ Description: state-tracker for Direct3D9 -- development files
 
 Package: libgbm1
 Section: libs
-Architecture: linux-any
-Depends:
+Architecture: linux-any kfreebsd-any
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
- mesa-libgallium (= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
+Conflicts: libgbm1-git
+Replaces: libgbm1-git
 Description: generic buffer management API -- runtime
  This package contains the GBM buffer management library.  It provides a
  mechanism for allocating buffers for graphics rendering tied to Mesa.
@@ -150,11 +231,13 @@ Description: generic buffer management API -- runtime
 
 Package: libgbm-dev
 Section: libdevel
-Architecture: linux-any
-Depends:
+Architecture: linux-any kfreebsd-any
+Depends: libmesa-stable,
  libgbm1 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
+Conflicts: libgbm-dev-git
+Replaces: libgbm-dev-git
 Description: generic buffer management API -- development files
  This package contains the GBM buffer management library.  It provides a
  mechanism for allocating buffers for graphics rendering tied to Mesa.
@@ -167,12 +250,13 @@ Description: generic buffer management API -- development files
 Package: libegl-mesa0
 Section: libs
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
  libgbm1 (= ${binary:Version}) [!hurd-any],
- mesa-libgallium (= ${binary:Version}),
 Provides: libegl-vendor
+Conflicts: libegl-mesa0-git
+Replaces: libegl-mesa0-git
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: free implementation of the EGL API -- Mesa vendor library
@@ -182,14 +266,28 @@ Description: free implementation of the EGL API -- Mesa vendor library
  .
  This package contains the Mesa vendor library for EGL.
 
+Package: libegl1-mesa
+Section: oldlibs
+Architecture: any
+Depends: libmesa-stable,
+ libegl1,
+ ${misc:Depends},
+Conflicts: libegl1-mesa-git
+Replaces: libegl1-mesa-git
+Multi-Arch: same
+Description: transitional dummy package
+ This is a transitional dummy package, it can be safely removed.
+
 Package: libegl1-mesa-dev
 Section: libdevel
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  libegl-dev,
  libglvnd-dev,
  ${misc:Depends},
 Multi-Arch: same
+Conflicts: libegl1-mesa-git-dev
+Replaces: libegl1-mesa-git-dev
 Description: free implementation of the EGL API -- development files
  This package contains the development environment required for compiling
  programs against EGL native platform graphics interface library.
@@ -199,25 +297,55 @@ Description: free implementation of the EGL API -- development files
  This package provides the development environment for compiling programs
  against the EGL library.
 
+Package: libwayland-egl1-mesa
+Section: oldlibs
+Architecture: linux-any
+Depends: libmesa-stable,
+ ${misc:Depends},
+ libegl1,
+ libwayland-egl1,
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Conflicts: libwayland-egl1-mesa-git
+Replaces: libwayland-egl1-mesa-git
+Description: transitional dummy package
+ This is a transitional dummy package, it can be safely removed.
+
+Package: libgles2-mesa
+Section: oldlibs
+Architecture: any
+Depends: libmesa-stable,
+ libgles2,
+ ${misc:Depends},
+Multi-Arch: same
+Conflicts: libgles2-mesa-git
+Replaces: libgles2-mesa-git
+Description: transitional dummy package
+ This is a transitional dummy package, it can be safely removed.
+
 Package: libgles2-mesa-dev
 Section: oldlibs
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  libgles-dev,
  libglvnd-dev,
  ${misc:Depends},
 Multi-Arch: same
+Conflicts: libgles2-mesa-git-dev
+Replaces: libgles2-mesa-git-dev
 Description: transitional dummy package
  This is a transitional dummy package, it can be safely removed.
 
 Package: libglapi-mesa
 Section: libs
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
+Conflicts: libglapi-mesa-git
+Replaces: libglapi-mesa-git
 Description: free implementation of the GL API -- shared library
  The Mesa GL API module is responsible for dispatching all the gl*
  functions. It is intended to be mainly used by both the libgles1-mesa
@@ -226,16 +354,17 @@ Description: free implementation of the GL API -- shared library
 Package: libglx-mesa0
 Section: libs
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
  libgl1-mesa-dri,
- mesa-libgallium (= ${binary:Version}),
 Provides: libglx-vendor
 Breaks:
  libopengl-perl (<< 0.6704+dfsg-2),
  glx-diversions (<< 0.8.4~),
 Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libglx-mesa0-git
+Replaces: libglx-mesa0-git
 Multi-Arch: same
 Description: free implementation of the OpenGL API -- GLX vendor library
  Mesa is a 3-D graphics library with an API which is very similar to
@@ -252,14 +381,33 @@ Description: free implementation of the OpenGL API -- GLX vendor library
  This package does not include the modules themselves: these can be found
  in the libgl1-mesa-dri package.
 
+Package: libgl1-mesa-glx
+Section: oldlibs
+Architecture: any
+Depends: libmesa-stable,
+ libgl1,
+ libglx-mesa0,
+ ${misc:Depends},
+Multi-Arch: same
+Conflicts: libgl1-mesa-glx-git
+Replaces: libgl1-mesa-glx-git
+Description: transitional dummy package
+ This is a transitional dummy package, it can be safely removed.
+
 Package: libgl1-mesa-dri
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends:
- libvulkan1 [@LLVM_ARCHS@],
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends}
+Recommends:
+ libgl1-amber-dri
+Breaks:
+ libgl1-amber-dri (<< 21.3.9)
+Replaces:
+ libgl1-amber-dri (<< 21.3.9), libgl1-mesa-dri-git
+Conflicts: libgl1-mesa-dri-git
 Multi-Arch: same
 Description: free implementation of the OpenGL API -- DRI modules
  This version of Mesa provides GLX and DRI capabilities: it is capable of
@@ -275,51 +423,43 @@ Description: free implementation of the OpenGL API -- DRI modules
 Package: libgl1-mesa-dev
 Section: oldlibs
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  libgl-dev,
  libglvnd-dev,
  ${misc:Depends},
 Multi-Arch: same
+Conflicts: libgl1-mesa-git-dev
+Replaces: libgl1-mesa-git-dev
 Description: transitional dummy package
  This is a transitional dummy package, it can be safely removed.
 
 Package: mesa-common-dev
 Section: libdevel
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  libgl-dev,
  libglx-dev,
  libx11-dev,
  libdrm-dev (>= 2.4.95) [!hurd-any],
  ${misc:Depends},
 Breaks: libegl1-mesa-dev (<< 18.2.5-2)
-Replaces: libegl1-mesa-dev (<< 18.2.5-2)
+Replaces: libegl1-mesa-dev (<< 18.2.5-2), mesa-common-git-dev
+Conflicts: mesa-common-git-dev
 Multi-Arch: same
 Description: Developer documentation for Mesa
  This package includes the specifications for the Mesa-specific OpenGL
  extensions, the complete set of release notes and the development header
  files common to all Mesa packages.
 
-Package: mesa-libgallium
-Section: libs
-Architecture: linux-any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: shared infrastructure for Mesa drivers
- This package contains libgallium, a private library shared between
- multiple Mesa drivers. This library is an implementation detail of Mesa
- and should not be used directly by user code.
-
 Package: libosmesa6
 Section: libs
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libosmesa6-git
+Replaces: libosmesa6-git
 Multi-Arch: same
 Description: Mesa Off-screen rendering extension
  OSmesa is a Mesa extension that allows programs to render to an
@@ -332,12 +472,12 @@ Description: Mesa Off-screen rendering extension
 Package: libosmesa6-dev
 Section: libdevel
 Architecture: any
-Depends:
+Depends: libmesa-stable,
  libosmesa6 (= ${binary:Version}),
  mesa-common-dev (= ${binary:Version}) | libgl-dev,
  ${misc:Depends},
-Conflicts: libosmesa-dev
-Replaces: libosmesa-dev
+Conflicts: libosmesa-dev, libosmesa6-git-dev, libosmesa-git-dev
+Replaces: libosmesa-dev, libosmesa6-git-dev,  libosmesa-git-dev
 Provides: libosmesa-dev
 Multi-Arch: same
 Description: Mesa Off-screen rendering extension -- development files
@@ -346,24 +486,11 @@ Description: Mesa Off-screen rendering extension -- development files
  .
  For more information on OSmesa see the libosmesa6 package.
 
-Package: mesa-teflon-delegate
-Section: libs
-Architecture: arm64
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: Mesa TensorFlow Lite external delegate
- TensorFlow Lite delegate which can make use of NPUs to accelerate ML
- inference. It is implemented in the form of a external delegate, a shared
- library which the TensorFlow Lite runtime can load at startup.
-
 Package: mesa-va-drivers
 Section: libs
-Architecture: linux-any
+Architecture: linux-any kfreebsd-any
 Build-Profiles: <!pkg.mesa.nolibva>
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
 Enhances:
@@ -371,7 +498,8 @@ Enhances:
 Provides:
  va-driver,
 Breaks: vdpau-va-driver (<< 0.7.4-5)
-Replaces: vdpau-va-driver (<< 0.7.4-5)
+Replaces: vdpau-va-driver (<< 0.7.4-5), mesa-va-drivers-git
+Conflicts: mesa-va-drivers-git
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Description: Mesa VA-API video acceleration drivers
@@ -383,8 +511,8 @@ Description: Mesa VA-API video acceleration drivers
 
 Package: mesa-vdpau-drivers
 Section: libs
-Architecture: linux-any
-Depends:
+Architecture: linux-any kfreebsd-any
+Depends: libmesa-stable,
  libvdpau1,
  ${shlibs:Depends},
  ${misc:Depends},
@@ -392,6 +520,8 @@ Enhances:
  libvdpau1,
 Provides:
  vdpau-driver,
+Replaces: mesa-vdpau-drivers-git
+Conflicts: mesa-vdpau-drivers-git
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Description: Mesa VDPAU video acceleration drivers
@@ -405,12 +535,14 @@ Package: mesa-vulkan-drivers
 Section: libs
 Architecture: @LLVM_ARCHS@
 Pre-Depends: ${misc:Pre-Depends}
-Depends:
+Depends: libmesa-stable,
  libvulkan1,
- python3:any,
+ python3:any | python3-minimal:any,
  ${shlibs:Depends},
  ${misc:Depends}
 Provides: vulkan-icd
+Conflicts: mesa-vulkan-drivers-git
+Replaces: mesa-vulkan-drivers-git
 Multi-Arch: same
 Description: Mesa Vulkan graphics drivers
  Vulkan is a low-overhead 3D graphics and compute API. This package
@@ -420,12 +552,14 @@ Package: mesa-opencl-icd
 Section: libs
 Architecture: @LLVM_ARCHS@
 Pre-Depends: ${misc:Pre-Depends}
-Depends:
+Depends: libmesa-stable,
  libclc-@LLVM_VERSION@,
  ocl-icd-libopencl1 | libopencl1,
  ${shlibs:Depends},
  ${misc:Depends},
 Provides: opencl-icd
+Conflicts: mesa-opencl-icd-git
+Replaces: mesa-opencl-icd-git
 Multi-Arch: same
 Description: free implementation of the OpenCL API -- ICD runtime
  This package contains the mesa implementation of the OpenCL (Open Compute
@@ -435,14 +569,16 @@ Description: free implementation of the OpenCL API -- ICD runtime
 
 Package: mesa-drm-shim
 Section: libs
-Architecture: amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el s390x sparc64
+Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
 Pre-Depends: ${misc:Pre-Depends}
-Depends:
+Depends: libmesa-stable,
  ${shlibs:Depends},
  ${misc:Depends},
+Conflicts: mesa-drm-shim-git
+Replaces: mesa-drm-shim-git
 Multi-Arch: same
 Description: DRM shim libraries
- This package provides drm-shim libraries which can be used for testing DRM
- drivers when none exists on the host.
+ This package provides drm-shim libraries which can be used for testing DRM drivers when
+ none exists on the host
 
-# vim: tw=0
+# vim: tw=0
\ No newline at end of file