diff -Nru nvidia-graphics-drivers-535-535.104.05/debian/changelog nvidia-graphics-drivers-535-535.104.05/debian/changelog
--- nvidia-graphics-drivers-535-535.104.05/debian/changelog	2023-08-23 10:40:47.000000000 +0000
+++ nvidia-graphics-drivers-535-535.104.05/debian/changelog	2023-08-29 11:50:12.000000000 +0000
@@ -1,3 +1,9 @@
+nvidia-graphics-drivers-535 (535.104.05-0ubuntu0.20.04.3) focal; urgency=medium
+
+  * Revert switch to new metas for now.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Tue, 29 Aug 2023 11:50:12 +0000
+
 nvidia-graphics-drivers-535 (535.104.05-0ubuntu0.20.04.2) focal; urgency=medium
 
   [ Dimitri John Ledkov ]
diff -Nru nvidia-graphics-drivers-535-535.104.05/debian/control nvidia-graphics-drivers-535-535.104.05/debian/control
--- nvidia-graphics-drivers-535-535.104.05/debian/control	2023-08-23 10:40:47.000000000 +0000
+++ nvidia-graphics-drivers-535-535.104.05/debian/control	2023-08-29 11:50:12.000000000 +0000
@@ -27,10 +27,12 @@
 Homepage: http://www.nvidia.com
 XS-Autobuild: yes
 
-Package: nvidia-driver-core-535
+Package: nvidia-driver-535
 Architecture: amd64 arm64
 Depends:
  libnvidia-gl-535 (= ${binary:Version}),
+ nvidia-dkms-535 (<= 535.104.05-1),
+ nvidia-dkms-535 (>= 535.104.05),
  nvidia-kernel-common-535 (<= 535.104.05-1),
  nvidia-kernel-common-535 (>= 535.104.05),
  nvidia-kernel-source-535 (= ${binary:Version}),
@@ -51,23 +53,6 @@
  libnvidia-encode-535:i386 (= ${binary:Version}) [amd64],
  libnvidia-fbc1-535:i386 (= ${binary:Version}) [amd64],
  libnvidia-gl-535:i386 (= ${binary:Version}) [amd64]
-Description: NVIDIA Driver Core metapackage
- This metapackage depends on the NVIDIA binary driver and on all of its libraries,
- to provide hardware acceleration for OpenGL/GLX/EGL/GLES/Vulkan
- applications on either X11 or on Wayland. Do not install this directly.
- .
- See /usr/share/doc/nvidia-driver-535/README.txt.gz
- for a complete list of supported GPUs and PCI IDs.
-
-Package: nvidia-driver-535
-Architecture: amd64 arm64
-Depends:
- nvidia-driver-core-535 (= ${binary:Version}),
- nvidia-dkms-535 (<= 535.104.05-1),
- nvidia-dkms-535 (>= 535.104.05),
- ${misc:Depends}
-Conflicts:
- nvidia-driver-lrm-535
 XB-Modaliases: ${modaliases}
 XB-PmAliases: ${nvidia:pm-modaliases}
 XB-Support: PB
@@ -79,22 +64,6 @@
  See /usr/share/doc/nvidia-driver-535/README.txt.gz
  for a complete list of supported GPUs and PCI IDs.
 
-Package: nvidia-driver-lrm-535
-Architecture: amd64 arm64
-Depends:
- nvidia-driver-core-535 (= ${binary:Version}),
- ${misc:Depends}
-Conflicts:
- nvidia-driver-535, nvidia-dkms-535
-Description: NVIDIA Driver LRM metapackage
- This metapackage depends on the NVIDIA binary driver and on all of its libraries,
- to provide hardware acceleration for OpenGL/GLX/EGL/GLES/Vulkan
- applications on either X11 or on Wayland. This is meant to be used with
- the linux-restricted-modules.
- .
- See /usr/share/doc/nvidia-driver-535/README.txt.gz
- for a complete list of supported GPUs and PCI IDs.
-
 Package: nvidia-kernel-source-535
 Architecture: amd64 arm64
 Multi-Arch: foreign
@@ -408,10 +377,12 @@
  .
  This package contains the nvidia-encode runtime library.
 
-Package: nvidia-driver-core-535-open
+Package: nvidia-driver-535-open
 Architecture: amd64 arm64
 Depends:
  libnvidia-gl-535 (= ${binary:Version}),
+ nvidia-dkms-535-open (<= 535.104.05-1),
+ nvidia-dkms-535-open (>= 535.104.05),
  nvidia-kernel-common-535 (<= 535.104.05-1),
  nvidia-kernel-common-535 (>= 535.104.05),
  nvidia-kernel-source-535-open (= ${binary:Version}),
@@ -432,23 +403,6 @@
  libnvidia-encode-535:i386 (= ${binary:Version}) [amd64],
  libnvidia-fbc1-535:i386 (= ${binary:Version}) [amd64],
  libnvidia-gl-535:i386 (= ${binary:Version}) [amd64]
-Description: NVIDIA driver (open kernel) Core metapackage
- This metapackage depends on the NVIDIA binary driver and on all of its libraries,
- to provide hardware acceleration for OpenGL/GLX/EGL/GLES/Vulkan
- applications on either X11 or on Wayland. Do not install this directly.
- .
- See /usr/share/doc/nvidia-driver-535/README.txt.gz
- for a complete list of supported GPUs and PCI IDs.
-
-Package: nvidia-driver-535-open
-Architecture: amd64 arm64
-Depends:
- nvidia-driver-core-535-open (= ${binary:Version}),
- nvidia-dkms-535-open (<= 535.104.05-1),
- nvidia-dkms-535-open (>= 535.104.05),
- ${misc:Depends}
-Conflicts:
- nvidia-driver-lrm-535-open
 XB-Modaliases: ${modaliases}
 XB-PmAliases: ${nvidia:pm-modaliases}
 XB-Support: PB
@@ -459,22 +413,6 @@
  .
  See /usr/share/doc/nvidia-driver-535/README.txt.gz
  for a complete list of supported GPUs and PCI IDs.
-
-Package: nvidia-driver-lrm-535-open
-Architecture: amd64 arm64
-Depends:
- nvidia-driver-core-535-open (= ${binary:Version}),
- ${misc:Depends}
-Conflicts:
- nvidia-driver-535-open, nvidia-dkms-535-open
-Description: NVIDIA driver (open kernel) LRM metapackage
- This metapackage depends on the NVIDIA binary driver and on all of its libraries,
- to provide hardware acceleration for OpenGL/GLX/EGL/GLES/Vulkan
- applications on either X11 or on Wayland. This is meant to be used with
- the linux-restricted-modules.
- .
- See /usr/share/doc/nvidia-driver-535/README.txt.gz
- for a complete list of supported GPUs and PCI IDs.
 
 Package: nvidia-kernel-source-535-open
 Architecture: amd64 arm64
diff -Nru nvidia-graphics-drivers-535-535.104.05/debian/nvidia-driver-535.docs nvidia-graphics-drivers-535-535.104.05/debian/nvidia-driver-535.docs
--- nvidia-graphics-drivers-535-535.104.05/debian/nvidia-driver-535.docs	1970-01-01 00:00:00.000000000 +0000
+++ nvidia-graphics-drivers-535-535.104.05/debian/nvidia-driver-535.docs	2023-08-29 11:50:12.000000000 +0000
@@ -0,0 +1,8 @@
+#NVIDIA-Linux/nvidia-dbus.conf
+NVIDIA-Linux/LICENSE
+NVIDIA-Linux/NVIDIA_Changelog
+NVIDIA-Linux/README.txt
+NVIDIA-Linux/html
+NVIDIA-Linux/nvidia-persistenced-init.tar.bz2
+NVIDIA-Linux/supported-gpus/LICENSE
+NVIDIA-Linux/supported-gpus/supported-gpus.json
diff -Nru nvidia-graphics-drivers-535-535.104.05/debian/nvidia-driver-core-535.docs nvidia-graphics-drivers-535-535.104.05/debian/nvidia-driver-core-535.docs
--- nvidia-graphics-drivers-535-535.104.05/debian/nvidia-driver-core-535.docs	2023-08-23 10:40:47.000000000 +0000
+++ nvidia-graphics-drivers-535-535.104.05/debian/nvidia-driver-core-535.docs	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#NVIDIA-Linux/nvidia-dbus.conf
-NVIDIA-Linux/LICENSE
-NVIDIA-Linux/NVIDIA_Changelog
-NVIDIA-Linux/README.txt
-NVIDIA-Linux/html
-NVIDIA-Linux/nvidia-persistenced-init.tar.bz2
-NVIDIA-Linux/supported-gpus/LICENSE
-NVIDIA-Linux/supported-gpus/supported-gpus.json
diff -Nru nvidia-graphics-drivers-535-535.104.05/debian/templates/control.in nvidia-graphics-drivers-535-535.104.05/debian/templates/control.in
--- nvidia-graphics-drivers-535-535.104.05/debian/templates/control.in	2023-08-23 10:32:58.000000000 +0000
+++ nvidia-graphics-drivers-535-535.104.05/debian/templates/control.in	2023-08-29 11:27:53.000000000 +0000
@@ -27,10 +27,12 @@
 Homepage: http://www.nvidia.com
 XS-Autobuild: yes
 
-Package: nvidia-driver-core-#FLAVOUR#
+Package: nvidia-driver-#FLAVOUR#
 Architecture: amd64 arm64
 Depends:
  libnvidia-gl-#FLAVOUR# (= ${binary:Version}),
+ nvidia-dkms-#FLAVOUR# (<= #DEBIAN_VERSION#-1),
+ nvidia-dkms-#FLAVOUR# (>= #DEBIAN_VERSION#),
  nvidia-kernel-common-#FLAVOUR# (<= #DEBIAN_VERSION#-1),
  nvidia-kernel-common-#FLAVOUR# (>= #DEBIAN_VERSION#),
  nvidia-kernel-source-#FLAVOUR# (= ${binary:Version}),
@@ -51,23 +53,6 @@
  libnvidia-encode-#FLAVOUR#:i386 (= ${binary:Version}) [amd64],
  libnvidia-fbc1-#FLAVOUR#:i386 (= ${binary:Version}) [amd64],
  libnvidia-gl-#FLAVOUR#:i386 (= ${binary:Version}) [amd64]
-Description: NVIDIA Driver Core metapackage
- This metapackage depends on the NVIDIA binary driver and on all of its libraries,
- to provide hardware acceleration for OpenGL/GLX/EGL/GLES/Vulkan
- applications on either X11 or on Wayland. Do not install this directly.
- .
- See /usr/share/doc/nvidia-driver-#FLAVOUR#/README.txt.gz
- for a complete list of supported GPUs and PCI IDs.
-
-Package: nvidia-driver-#FLAVOUR#
-Architecture: amd64 arm64
-Depends:
- nvidia-driver-core-#FLAVOUR# (= ${binary:Version}),
- nvidia-dkms-#FLAVOUR# (<= #DEBIAN_VERSION#-1),
- nvidia-dkms-#FLAVOUR# (>= #DEBIAN_VERSION#),
- ${misc:Depends}
-Conflicts:
- nvidia-driver-lrm-#FLAVOUR#
 XB-Modaliases: ${modaliases}
 XB-PmAliases: ${nvidia:pm-modaliases}
 XB-Support: PB
@@ -79,22 +64,6 @@
  See /usr/share/doc/nvidia-driver-#FLAVOUR#/README.txt.gz
  for a complete list of supported GPUs and PCI IDs.
 
-Package: nvidia-driver-lrm-#FLAVOUR#
-Architecture: amd64 arm64
-Depends:
- nvidia-driver-core-#FLAVOUR# (= ${binary:Version}),
- ${misc:Depends}
-Conflicts:
- nvidia-driver-#FLAVOUR#, nvidia-dkms-#FLAVOUR#
-Description: NVIDIA Driver LRM metapackage
- This metapackage depends on the NVIDIA binary driver and on all of its libraries,
- to provide hardware acceleration for OpenGL/GLX/EGL/GLES/Vulkan
- applications on either X11 or on Wayland. This is meant to be used with
- the linux-restricted-modules.
- .
- See /usr/share/doc/nvidia-driver-#FLAVOUR#/README.txt.gz
- for a complete list of supported GPUs and PCI IDs.
-
 Package: nvidia-kernel-source-#FLAVOUR#
 Architecture: amd64 arm64
 Multi-Arch: foreign
@@ -408,10 +377,12 @@
  .
  This package contains the nvidia-encode runtime library.
 
-Package: nvidia-driver-core-#FLAVOUR#-open
+Package: nvidia-driver-#FLAVOUR#-open
 Architecture: amd64 arm64
 Depends:
  libnvidia-gl-#FLAVOUR# (= ${binary:Version}),
+ nvidia-dkms-#FLAVOUR#-open (<= #DEBIAN_VERSION#-1),
+ nvidia-dkms-#FLAVOUR#-open (>= #DEBIAN_VERSION#),
  nvidia-kernel-common-#FLAVOUR# (<= #DEBIAN_VERSION#-1),
  nvidia-kernel-common-#FLAVOUR# (>= #DEBIAN_VERSION#),
  nvidia-kernel-source-#FLAVOUR#-open (= ${binary:Version}),
@@ -432,23 +403,6 @@
  libnvidia-encode-#FLAVOUR#:i386 (= ${binary:Version}) [amd64],
  libnvidia-fbc1-#FLAVOUR#:i386 (= ${binary:Version}) [amd64],
  libnvidia-gl-#FLAVOUR#:i386 (= ${binary:Version}) [amd64]
-Description: NVIDIA driver (open kernel) Core metapackage
- This metapackage depends on the NVIDIA binary driver and on all of its libraries,
- to provide hardware acceleration for OpenGL/GLX/EGL/GLES/Vulkan
- applications on either X11 or on Wayland. Do not install this directly.
- .
- See /usr/share/doc/nvidia-driver-#FLAVOUR#/README.txt.gz
- for a complete list of supported GPUs and PCI IDs.
-
-Package: nvidia-driver-#FLAVOUR#-open
-Architecture: amd64 arm64
-Depends:
- nvidia-driver-core-#FLAVOUR#-open (= ${binary:Version}),
- nvidia-dkms-#FLAVOUR#-open (<= #DEBIAN_VERSION#-1),
- nvidia-dkms-#FLAVOUR#-open (>= #DEBIAN_VERSION#),
- ${misc:Depends}
-Conflicts:
- nvidia-driver-lrm-#FLAVOUR#-open
 XB-Modaliases: ${modaliases}
 XB-PmAliases: ${nvidia:pm-modaliases}
 XB-Support: PB
@@ -459,22 +413,6 @@
  .
  See /usr/share/doc/nvidia-driver-#FLAVOUR#/README.txt.gz
  for a complete list of supported GPUs and PCI IDs.
-
-Package: nvidia-driver-lrm-#FLAVOUR#-open
-Architecture: amd64 arm64
-Depends:
- nvidia-driver-core-#FLAVOUR#-open (= ${binary:Version}),
- ${misc:Depends}
-Conflicts:
- nvidia-driver-#FLAVOUR#-open, nvidia-dkms-#FLAVOUR#-open
-Description: NVIDIA driver (open kernel) LRM metapackage
- This metapackage depends on the NVIDIA binary driver and on all of its libraries,
- to provide hardware acceleration for OpenGL/GLX/EGL/GLES/Vulkan
- applications on either X11 or on Wayland. This is meant to be used with
- the linux-restricted-modules.
- .
- See /usr/share/doc/nvidia-driver-#FLAVOUR#/README.txt.gz
- for a complete list of supported GPUs and PCI IDs.
 
 Package: nvidia-kernel-source-#FLAVOUR#-open
 Architecture: amd64 arm64
diff -Nru nvidia-graphics-drivers-535-535.104.05/debian/templates/nvidia-driver-core-flavour.docs.in nvidia-graphics-drivers-535-535.104.05/debian/templates/nvidia-driver-core-flavour.docs.in
--- nvidia-graphics-drivers-535-535.104.05/debian/templates/nvidia-driver-core-flavour.docs.in	2023-08-23 10:32:16.000000000 +0000
+++ nvidia-graphics-drivers-535-535.104.05/debian/templates/nvidia-driver-core-flavour.docs.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#AMD64_ONLY#NVIDIA-Linux/nvidia-dbus.conf
-#I386_EXCLUDED#NVIDIA-Linux/LICENSE
-#I386_EXCLUDED#NVIDIA-Linux/NVIDIA_Changelog
-#I386_EXCLUDED#NVIDIA-Linux/README.txt
-#I386_EXCLUDED#NVIDIA-Linux/html
-#I386_EXCLUDED#NVIDIA-Linux/nvidia-persistenced-init.tar.bz2
-#I386_EXCLUDED#NVIDIA-Linux/supported-gpus/LICENSE
-#I386_EXCLUDED#NVIDIA-Linux/supported-gpus/supported-gpus.json
diff -Nru nvidia-graphics-drivers-535-535.104.05/debian/templates/nvidia-driver-flavour.docs.in nvidia-graphics-drivers-535-535.104.05/debian/templates/nvidia-driver-flavour.docs.in
--- nvidia-graphics-drivers-535-535.104.05/debian/templates/nvidia-driver-flavour.docs.in	1970-01-01 00:00:00.000000000 +0000
+++ nvidia-graphics-drivers-535-535.104.05/debian/templates/nvidia-driver-flavour.docs.in	2023-08-29 11:27:53.000000000 +0000
@@ -0,0 +1,8 @@
+#AMD64_ONLY#NVIDIA-Linux/nvidia-dbus.conf
+#I386_EXCLUDED#NVIDIA-Linux/LICENSE
+#I386_EXCLUDED#NVIDIA-Linux/NVIDIA_Changelog
+#I386_EXCLUDED#NVIDIA-Linux/README.txt
+#I386_EXCLUDED#NVIDIA-Linux/html
+#I386_EXCLUDED#NVIDIA-Linux/nvidia-persistenced-init.tar.bz2
+#I386_EXCLUDED#NVIDIA-Linux/supported-gpus/LICENSE
+#I386_EXCLUDED#NVIDIA-Linux/supported-gpus/supported-gpus.json