diff -pruN 0.10.4-1/debian/changelog 0.10.4-1ubuntu1/debian/changelog
--- 0.10.4-1/debian/changelog	2023-01-04 12:22:55.000000000 +0000
+++ 0.10.4-1ubuntu1/debian/changelog	2023-01-05 14:49:25.000000000 +0000
@@ -1,3 +1,24 @@
+virglrenderer (0.10.4-1ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #1993453).
+  * Added changes:
+    - d/rules: Disable video acceleration on Ubuntu until libva gets repromoted.
+  * Dropped:
+    - d/p/lp-1950941*: fix out of bounds check
+      (LP #1950941)
+      [Fixed in upstream release 0.10.0]
+    - out-of-bounds write in read_transfer_data()
+      + d/p/CVE-2022-0135.patch: Add test to resource OOB write
+        and fix it in src/vrend_renderer.c, tests/test_fuzzer_formats.c.
+      [Fixed in upstream release 0.10.0]
+    - info leak in vrend_resource_alloc_buffer()
+      + d/p/CVE-2022-0175.patch: clear memory when allocating a
+        host-backed memory resource in src/vrend_renderer.c,
+        tests/test_virgl_transfer.c.
+      [Fixed in upstream release 0.10.0]
+
+ -- Bryce Harrington <bryce@canonical.com>  Thu, 05 Jan 2023 06:49:25 -0800
+
 virglrenderer (0.10.4-1) unstable; urgency=medium
 
   * New upstream version 0.10.4
@@ -54,6 +75,27 @@ virglrenderer (0.10.0-1) unstable; urgen
   * Enable video backend and add dependency accordingly
  -- Gert Wollny <gewo@debian.org>  Fri, 02 Sep 2022 17:36:05 +0200
 
+virglrenderer (0.9.1-1~exp1ubuntu2) jammy; urgency=medium
+
+  * SECURITY UPDATE: out-of-bounds write in read_transfer_data()
+    - debian/patches/CVE-2022-0135.patch: Add test to resource OOB write
+      and fix it in src/vrend_renderer.c, tests/test_fuzzer_formats.c.
+    - CVE-2022-0135
+  * SECURITY UPDATE: info leak in vrend_resource_alloc_buffer()
+    - debian/patches/CVE-2022-0175.patch: clear memory when allocating a
+      host-backed memory resource in src/vrend_renderer.c,
+      tests/test_virgl_transfer.c.
+    - CVE-2022-0175
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Mon, 28 Feb 2022 14:19:07 -0500
+
+virglrenderer (0.9.1-1~exp1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1959175). Remaining changes:
+    - d/p/lp-1950941*: fix out of bounds check (LP #1950941)
+
+ -- Utkarsh Gupta <utkarsh@ubuntu.com>  Fri, 25 Feb 2022 02:23:43 +0530
+
 virglrenderer (0.9.1-1~exp1) experimental; urgency=medium
 
   * New upstream version 0.9.1
@@ -67,6 +109,18 @@ virglrenderer (0.9.0-1~exp1) experimenta
 
  -- Gert Wollny <gewo@debian.org>  Tue, 06 Apr 2021 15:24:55 +0200
 
+virglrenderer (0.8.2-5ubuntu1) jammy; urgency=medium
+
+  * d/p/lp-1950941*: fix out of bounds check (LP: #1950941)
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Thu, 02 Dec 2021 08:34:48 +0100
+
+virglrenderer (0.8.2-5build1) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 07 Oct 2021 12:26:08 +0200
+
 virglrenderer (0.8.2-5) unstable; urgency=medium
 
   [ Christian Ehrhardt ]
diff -pruN 0.10.4-1/debian/control 0.10.4-1ubuntu1/debian/control
--- 0.10.4-1/debian/control	2023-01-04 12:22:55.000000000 +0000
+++ 0.10.4-1ubuntu1/debian/control	2023-01-05 14:49:25.000000000 +0000
@@ -1,7 +1,8 @@
 Source: virglrenderer
 Section: libs
 Priority: optional
-Maintainer: Gert Wollny <gewo@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Gert Wollny <gewo@debian.org>
 Build-Depends: check,
                debhelper-compat (= 13),
                libdrm-dev,
diff -pruN 0.10.4-1/debian/rules 0.10.4-1ubuntu1/debian/rules
--- 0.10.4-1/debian/rules	2023-01-04 12:22:55.000000000 +0000
+++ 0.10.4-1ubuntu1/debian/rules	2023-01-05 14:49:25.000000000 +0000
@@ -4,12 +4,19 @@ include /usr/share/dpkg/buildflags.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export CK_TIMEOUT_MULTIPLIER=100
 
+# libva is not currently in Ubuntu main
+ifeq ($(shell dpkg-vendor --query vendor),Ubuntu)
+VIDEO := -Dvideo=false
+else
+VIDEO := -Dvideo=true
+endif
+
 %:
 	dh $@ --buildsystem=meson
 
 configure-opts = \
 	-Dtests=true \
-	-Dvideo=true \
+	$(VIDEO) \
 
 ifneq (armel, ${DEB_HOST_ARCH})
 # vulkan requires 32bit atomic ints, armel lacks one (#1021861)