diff -Nru pycuda-2021.1~dfsg/debian/changelog pycuda-2021.1~dfsg/debian/changelog
--- pycuda-2021.1~dfsg/debian/changelog	2022-03-16 22:54:33.000000000 +0000
+++ pycuda-2021.1~dfsg/debian/changelog	2022-06-03 04:11:21.000000000 +0000
@@ -1,14 +1,12 @@
-pycuda (2021.1~dfsg-2build2) jammy; urgency=medium
+pycuda (2021.1~dfsg-3) unstable; urgency=medium
 
-  * No-change rebuild with Python 3.10 only
+  * Add salsa-ci.yml.
+  * Add superficial autopkgtest checking the usability of the STL headers in
+    host code compiled with nvcc (cf. #1006962).
+  * Update Standards-Version to 4.6.1; no changes necessary.
+  * Update Lintian overrides.
 
- -- Graham Inggs <ginggs@ubuntu.com>  Wed, 16 Mar 2022 22:54:33 +0000
-
-pycuda (2021.1~dfsg-2build1) jammy; urgency=medium
-
-  * No-change rebuild against libnvidia-compute-495
-
- -- Graham Inggs <ginggs@ubuntu.com>  Sun, 12 Dec 2021 09:15:55 +0000
+ -- Andreas Beckmann <anbe@debian.org>  Fri, 03 Jun 2022 06:11:21 +0200
 
 pycuda (2021.1~dfsg-2) unstable; urgency=medium
 
diff -Nru pycuda-2021.1~dfsg/debian/control pycuda-2021.1~dfsg/debian/control
--- pycuda-2021.1~dfsg/debian/control	2021-11-22 10:37:39.000000000 +0000
+++ pycuda-2021.1~dfsg/debian/control	2022-06-03 04:11:21.000000000 +0000
@@ -26,7 +26,7 @@
  python3-doc <!nodoc>,
  python3-sphinx (>= 1.0.7+dfsg) <!nodoc>,
  python3-sphinx-copybutton <!nodoc>,
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 Rules-Requires-Root: no
 Homepage: http://mathema.tician.de/software/pycuda
 Vcs-Browser: https://salsa.debian.org/nvidia-team/python-pycuda
diff -Nru pycuda-2021.1~dfsg/debian/copyright pycuda-2021.1~dfsg/debian/copyright
--- pycuda-2021.1~dfsg/debian/copyright	2021-11-22 10:37:39.000000000 +0000
+++ pycuda-2021.1~dfsg/debian/copyright	2022-06-03 04:11:21.000000000 +0000
@@ -108,7 +108,7 @@
 
 Files: debian/*
 Copyright: © 2011-2020 Tomasz Rybak <serpent@debian.org>
-           © 2020-2021 Andreas Beckmann <anbe@debian.org>
+           © 2020-2022 Andreas Beckmann <anbe@debian.org>
 License: Expat
 
 License: Expat
diff -Nru pycuda-2021.1~dfsg/debian/python-pycuda-doc.lintian-overrides pycuda-2021.1~dfsg/debian/python-pycuda-doc.lintian-overrides
--- pycuda-2021.1~dfsg/debian/python-pycuda-doc.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ pycuda-2021.1~dfsg/debian/python-pycuda-doc.lintian-overrides	2022-06-03 04:11:21.000000000 +0000
@@ -0,0 +1,2 @@
+example-interpreter-not-absolute python [usr/share/doc/python-pycuda-doc/examples/from-wiki/*.py]
+example-unusual-interpreter python [usr/share/doc/python-pycuda-doc/examples/from-wiki/*.py]
diff -Nru pycuda-2021.1~dfsg/debian/salsa-ci.yml pycuda-2021.1~dfsg/debian/salsa-ci.yml
--- pycuda-2021.1~dfsg/debian/salsa-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ pycuda-2021.1~dfsg/debian/salsa-ci.yml	2022-06-03 04:11:21.000000000 +0000
@@ -0,0 +1,7 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+  SALSA_CI_DISABLE_BUILD_PACKAGE_I386: 1
diff -Nru pycuda-2021.1~dfsg/debian/tests/compile-stl-headers pycuda-2021.1~dfsg/debian/tests/compile-stl-headers
--- pycuda-2021.1~dfsg/debian/tests/compile-stl-headers	1970-01-01 00:00:00.000000000 +0000
+++ pycuda-2021.1~dfsg/debian/tests/compile-stl-headers	2022-06-03 04:11:21.000000000 +0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+
+CXX=${1:-g++}
+
+AUTOPKGTEST_TMP=${AUTOPKGTEST_TMP:-$(mktemp -d)}
+
+cd $AUTOPKGTEST_TMP
+
+res=0
+for header in /usr/include/c++/$($CXX --version | sed -rn '1s/.* ([0-9]+)\..*/\1/p')/*
+do
+	test -f "$header" || continue
+	header=$(basename $header)
+	flags=
+	case $header in
+		coroutine) flags="-Xcompiler -fcoroutines" ;;
+	esac
+	echo $header
+	echo "#include <$header>" | nvcc -ccbin $CXX -x cu $flags -o $header.o -c - || res=$?
+done
+
+exit $res
diff -Nru pycuda-2021.1~dfsg/debian/tests/control pycuda-2021.1~dfsg/debian/tests/control
--- pycuda-2021.1~dfsg/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
+++ pycuda-2021.1~dfsg/debian/tests/control	2022-06-03 04:11:21.000000000 +0000
@@ -0,0 +1,29 @@
+Test-Command: debian/tests/compile-stl-headers cuda-g++
+Features: test-name=compile-stl-headers_cuda-g++
+Architecture: amd64 arm64 ppc64el
+Depends:
+ nvidia-cuda-toolkit-gcc,
+Restrictions:
+ superficial,
+ allow-stderr,
+
+Test-Command: debian/tests/compile-stl-headers g++-11
+Features: test-name=compile-stl-headers_g++-11
+Architecture: amd64 arm64 ppc64el
+Depends:
+ g++-11,
+ nvidia-cuda-toolkit,
+Restrictions:
+ superficial,
+ allow-stderr,
+ flaky,
+
+Test-Command: debian/tests/compile-stl-headers g++-10
+Features: test-name=compile-stl-headers_g++-10
+Architecture: amd64 arm64 ppc64el
+Depends:
+ g++-10,
+ nvidia-cuda-toolkit,
+Restrictions:
+ superficial,
+ allow-stderr,