diff -Nru openarena-085-data-0.8.5split/debian/changelog openarena-085-data-0.8.5split/debian/changelog
--- openarena-085-data-0.8.5split/debian/changelog	2023-01-24 10:08:26.000000000 +0000
+++ openarena-085-data-0.8.5split/debian/changelog	2023-08-14 10:30:46.000000000 +0000
@@ -1,3 +1,15 @@
+openarena-085-data (0.8.5split-15) unstable; urgency=medium
+
+  * Merge from openarena-data/0.8.5split-15
+    - d/clean, d/.gitignore: Clean up generated .qvm files.
+      This avoids FTBFS when built twice in a row. (Closes: #1046510)
+    - d/watch: Remove.
+      uscan considers it to be valid for a watch file to contain
+      only comments, but udd.debian.org diagnoses this as an error
+      (#884135). Override the Lintian tag instead.
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 14 Aug 2023 11:30:46 +0100
+
 openarena-085-data (0.8.5split-14) unstable; urgency=medium
 
   * d/control: Mark data package as Multi-Arch: foreign
diff -Nru openarena-085-data-0.8.5split/debian/clean openarena-085-data-0.8.5split/debian/clean
--- openarena-085-data-0.8.5split/debian/clean	2023-01-24 10:08:26.000000000 +0000
+++ openarena-085-data-0.8.5split/debian/clean	2023-08-14 10:30:46.000000000 +0000
@@ -3,6 +3,7 @@
 debian/*.pk3.contents.raw
 debian/*.pk3.filenames
 debian/*.pk3.qvms
+debian/*.qvm
 debian/openarena-085-data.README.Debian
 debian/openarena-088-data.README.Debian
 debian/openarena-data.README.Debian
diff -Nru openarena-085-data-0.8.5split/debian/.gitignore openarena-085-data-0.8.5split/debian/.gitignore
--- openarena-085-data-0.8.5split/debian/.gitignore	2023-01-24 10:08:26.000000000 +0000
+++ openarena-085-data-0.8.5split/debian/.gitignore	2023-08-14 10:30:46.000000000 +0000
@@ -1,6 +1,7 @@
 /openarena-*/
 /files
 /*.debhelper.log
+/*.qvm
 /*.substvars
 /openarena-data.README.Debian
 /openarena-085-data.README.Debian
diff -Nru openarena-085-data-0.8.5split/debian/source/lintian-overrides openarena-085-data-0.8.5split/debian/source/lintian-overrides
--- openarena-085-data-0.8.5split/debian/source/lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ openarena-085-data-0.8.5split/debian/source/lintian-overrides	2023-08-14 10:30:46.000000000 +0000
@@ -0,0 +1,2 @@
+# See src:openarena for release monitoring.
+debian-watch-file-is-missing
diff -Nru openarena-085-data-0.8.5split/debian/watch openarena-085-data-0.8.5split/debian/watch
--- openarena-085-data-0.8.5split/debian/watch	2023-01-24 10:08:26.000000000 +0000
+++ openarena-085-data-0.8.5split/debian/watch	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-# Intentionally no watch file here, see src:openarena for release monitoring