diff -pruN 3.0~2022.09.30-1/debian/changelog 3.0~2022.09.30-1ubuntu1/debian/changelog
--- 3.0~2022.09.30-1/debian/changelog	2022-10-12 12:36:45.000000000 +0000
+++ 3.0~2022.09.30-1ubuntu1/debian/changelog	2022-11-08 06:22:24.000000000 +0000
@@ -1,3 +1,11 @@
+khronos-opencl-clhpp (3.0~2022.09.30-1ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't build-depend on ocl-icd-opencl-dev, we can't use 'nocheck' build
+      profile for this in Launchpad.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 07 Nov 2022 22:22:24 -0800
+
 khronos-opencl-clhpp (3.0~2022.09.30-1) unstable; urgency=medium
 
   * New upstream release.
@@ -5,6 +13,14 @@ khronos-opencl-clhpp (3.0~2022.09.30-1)
 
  -- Andreas Beckmann <anbe@debian.org>  Wed, 12 Oct 2022 14:36:45 +0200
 
+khronos-opencl-clhpp (3.0~2022.05.18-1ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't build-depend on ocl-icd-opencl-dev, we can't use 'nocheck' build
+      profile for this in Launchpad.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 24 Jun 2022 09:38:40 -0700
+
 khronos-opencl-clhpp (3.0~2022.05.18-1) unstable; urgency=medium
 
   * New upstream release.
@@ -14,6 +30,14 @@ khronos-opencl-clhpp (3.0~2022.05.18-1)
 
  -- Andreas Beckmann <anbe@debian.org>  Sun, 12 Jun 2022 01:31:28 +0200
 
+khronos-opencl-clhpp (3.0~2.0.16-1ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't build-depend on ocl-icd-opencl-dev, we can't use 'nocheck' build
+      profile for this in Launchpad.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 16 May 2022 08:38:44 -0700
+
 khronos-opencl-clhpp (3.0~2.0.16-1) unstable; urgency=medium
 
   * New upstream release.
@@ -27,6 +51,15 @@ khronos-opencl-clhpp (3.0~2.0.16-1) unst
 
  -- Andreas Beckmann <anbe@debian.org>  Mon, 24 Jan 2022 00:57:06 +0100
 
+khronos-opencl-clhpp (3.0~2.0.15-1ubuntu1) jammy; urgency=medium
+
+  * Don't build the examples; this is an arch: independent package so testing
+    them on only the build arch doesn't make sense, these should be moved to
+    autopkgtests.  For now, just drop the examples and the build-dependency
+    on ocl-icd-opencl-dev to break a build loop.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 21 Oct 2021 19:52:36 +0000
+
 khronos-opencl-clhpp (3.0~2.0.15-1) unstable; urgency=medium
 
   * New upstream release.
@@ -113,3 +146,4 @@ khronos-opencl-clhpp (2.0.10-1) unstable
   * Initial release (Closes: #837112)
 
  -- Vincent Danjean <vdanjean@debian.org>  Thu, 08 Sep 2016 21:38:17 +0200
+
diff -pruN 3.0~2022.09.30-1/debian/control 3.0~2022.09.30-1ubuntu1/debian/control
--- 3.0~2022.09.30-1/debian/control	2022-10-12 12:36:45.000000000 +0000
+++ 3.0~2022.09.30-1ubuntu1/debian/control	2022-11-08 06:22:24.000000000 +0000
@@ -1,7 +1,8 @@
 Source: khronos-opencl-clhpp
 Section: libdevel
 Priority: optional
-Maintainer: Debian OpenCL Maintainers <pkg-opencl-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OpenCL Maintainers <pkg-opencl-devel@lists.alioth.debian.org>
 Uploaders: Vincent Danjean <vdanjean@debian.org>,
  Andreas Beckmann <anbe@debian.org>,
 Build-Depends: debhelper-compat (= 13),
@@ -10,7 +11,6 @@ Build-Depends: debhelper-compat (= 13),
  doxygen <!nodoc>,
  graphviz <!nodoc>,
  hardlink <!nodoc>,
- ocl-icd-opencl-dev <!nocheck>,
  python-is-python3 <!nocheck>,
  ruby <!nocheck>,
 Rules-Requires-Root: no
diff -pruN 3.0~2022.09.30-1/debian/rules 3.0~2022.09.30-1ubuntu1/debian/rules
--- 3.0~2022.09.30-1/debian/rules	2022-10-12 12:36:45.000000000 +0000
+++ 3.0~2022.09.30-1ubuntu1/debian/rules	2022-10-12 17:20:42.000000000 +0000
@@ -8,6 +8,7 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
+		-DBUILD_EXAMPLES=OFF \
 		-DOPENCL_LIB_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		-DCMOCK_DIR=$(CURDIR)/cmock \
 		-DUNITY_DIR=$(CURDIR)/unity \