diff -Nru open-invaders-0.3/debian/changelog open-invaders-0.3/debian/changelog
--- open-invaders-0.3/debian/changelog	2021-09-16 11:27:04.000000000 +0000
+++ open-invaders-0.3/debian/changelog	2022-05-28 09:55:46.000000000 +0000
@@ -1,3 +1,13 @@
+open-invaders (0.3-8) unstable; urgency=medium
+
+  * QA upload.
+  * Drop 404-compliant git URLs to Salsa.
+  * Fix FTBFS on new platforms in a future-proof way, closes: #1011963
+  * Mark -data as MA:foreign.
+  * Fix an occassional crash during gameplay, closes: #989063 [John G]
+
+ -- Adam Borowski <kilobyte@angband.pl>  Sat, 28 May 2022 11:55:46 +0200
+
 open-invaders (0.3-7) unstable; urgency=medium
 
   * QA upload.
diff -Nru open-invaders-0.3/debian/control open-invaders-0.3/debian/control
--- open-invaders-0.3/debian/control	2021-05-10 17:49:33.000000000 +0000
+++ open-invaders-0.3/debian/control	2022-05-28 09:53:29.000000000 +0000
@@ -9,11 +9,9 @@
                libxext-dev,
                libxxf86vm1,
                pkg-config
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
 Rules-Requires-Root: no
 Homepage: https://sourceforge.net/projects/open-invaders
-Vcs-Browser: https://salsa.debian.org/debian/open-invaders
-Vcs-Git: https://salsa.debian.org/debian/open-invaders.git
 
 Package: open-invaders
 Architecture: any
@@ -31,6 +29,7 @@
 
 Package: open-invaders-data
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Recommends: open-invaders (= ${source:Version})
 Description: Space Invaders clone (data package)
diff -Nru open-invaders-0.3/debian/patches/collision-fix.patch open-invaders-0.3/debian/patches/collision-fix.patch
--- open-invaders-0.3/debian/patches/collision-fix.patch	1970-01-01 00:00:00.000000000 +0000
+++ open-invaders-0.3/debian/patches/collision-fix.patch	2022-05-28 09:55:46.000000000 +0000
@@ -0,0 +1,34 @@
+--- open-invaders-0.3.orig/src/collision.cc
++++ open-invaders-0.3/src/collision.cc
+@@ -269,11 +269,11 @@ void collision_detection()
+ 					explosionbits[current_particle].color=makecol16(0,230,230);
+ 					explosionbits[current_particle].life=10;
+ 					current_particle++;
+-				}
+ 					
+-				if(current_particle>499)
+-				{
+-					current_particle=0;
++					if(current_particle>499)
++					{
++						current_particle=0;
++					}
+ 				}
+ 			};				
+ 		};
+@@ -300,11 +300,11 @@ void collision_detection()
+ 				explosionbits[current_particle].color=makecol16(0,230,230);
+ 				explosionbits[current_particle].life=10;
+ 				current_particle++;
+-			}
+ 
+-			if(current_particle>499)
+-			{
+-				current_particle=0;
++				if(current_particle>499)
++				{
++					current_particle=0;
++				}
+ 			}
+ 		}
+ 	}
diff -Nru open-invaders-0.3/debian/patches/series open-invaders-0.3/debian/patches/series
--- open-invaders-0.3/debian/patches/series	2021-05-10 17:49:33.000000000 +0000
+++ open-invaders-0.3/debian/patches/series	2022-05-28 09:55:46.000000000 +0000
@@ -3,3 +3,5 @@
 format_security.patch
 gcc6.patch
 doc_directory_commented.patch
+collision-fix.patch
+word-size.patch
diff -Nru open-invaders-0.3/debian/patches/word-size.patch open-invaders-0.3/debian/patches/word-size.patch
--- open-invaders-0.3/debian/patches/word-size.patch	1970-01-01 00:00:00.000000000 +0000
+++ open-invaders-0.3/debian/patches/word-size.patch	2022-05-28 09:55:46.000000000 +0000
@@ -0,0 +1,12 @@
+--- open-invaders-0.3.orig/headers/pmask.h
++++ open-invaders-0.3/headers/pmask.h
+@@ -36,8 +36,7 @@ confusing.
+ //e.g. 4 for 16-bit ints, 5 for 32-bit ints, 6 for 64-bit ints
+ //don't worry about setting it incorrectly
+ //you'll get a compile error if you do, not a run-time error
+-#if defined(__alpha__) || defined(__ia64__) || (defined(__x86_64__) && defined(__LP64__)) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) \
+-      || defined(__powerpc64__) || defined(__aarch64__) || (defined(__mips64) && defined(__LP64__))
++#if __SIZEOF_SIZE_T__ == 8
+ 	#define MASK_WORD_BITBITS 6
+ #else
+ 	#define MASK_WORD_BITBITS 5