diff -Nru netrek-client-cow-3.3.1/debian/changelog netrek-client-cow-3.3.1/debian/changelog
--- netrek-client-cow-3.3.1/debian/changelog	2016-09-15 22:08:44.000000000 +0000
+++ netrek-client-cow-3.3.1/debian/changelog	2019-04-10 15:34:14.000000000 +0000
@@ -1,3 +1,25 @@
+netrek-client-cow (3.3.1-4) unstable; urgency=medium
+
+  * Team upload.
+  * Build mkkey using the build CC when cross-compiling. Closes: #924291.
+
+ -- Stephen Kitt <skitt@debian.org>  Wed, 10 Apr 2019 17:34:14 +0200
+
+netrek-client-cow (3.3.1-3) unstable; urgency=medium
+
+  * Team upload.
+  * Fix infinite loop patch. Really (Closes: #924291)
+
+ -- Markus Koschany <apo@debian.org>  Sun, 24 Mar 2019 13:31:40 +0100
+
+netrek-client-cow (3.3.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix possible infinite loop. (Closes: #924291)
+  * Move the package to salsa.debian.org.
+
+ -- Markus Koschany <apo@debian.org>  Wed, 20 Mar 2019 21:31:57 +0100
+
 netrek-client-cow (3.3.1-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru netrek-client-cow-3.3.1/debian/control netrek-client-cow-3.3.1/debian/control
--- netrek-client-cow-3.3.1/debian/control	2016-09-15 22:08:44.000000000 +0000
+++ netrek-client-cow-3.3.1/debian/control	2019-04-10 15:31:04.000000000 +0000
@@ -8,6 +8,7 @@
  autotools-dev,
  debhelper (>= 9),
  libgmp-dev,
+ libgmp-dev:native,
  libimlib2-dev,
  libsdl-mixer1.2-dev,
  libsdl1.2-dev,
@@ -15,8 +16,8 @@
  libxxf86vm-dev
 Standards-Version: 3.9.8
 Homepage: http://www.netrek.org
-Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/netrek-client-cow/
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/netrek-client-cow/
+Vcs-Git: https://salsa.debian.org/games-team/netrek-client-cow.git
+Vcs-Browser: https://salsa.debian.org/games-team/netrek-client-cow
 
 Package: netrek-client-cow
 Architecture: any
diff -Nru netrek-client-cow-3.3.1/debian/patches/cross-build-mkkey.patch netrek-client-cow-3.3.1/debian/patches/cross-build-mkkey.patch
--- netrek-client-cow-3.3.1/debian/patches/cross-build-mkkey.patch	1970-01-01 00:00:00.000000000 +0000
+++ netrek-client-cow-3.3.1/debian/patches/cross-build-mkkey.patch	2019-04-10 15:30:55.000000000 +0000
@@ -0,0 +1,18 @@
+Description: Build mkkey correctly when cross-building
+Author: Stephen Kitt <skitt@debian.org>
+
+There are two parts to this:
+* use BUILDCC (provided by debian/rules) to build;
+* only link libgmp to minimise the native build-dependencies.
+
+--- a/system.mk.in
++++ b/system.mk.in
+@@ -150,7 +150,7 @@
+ 	$(MAKE) newkey
+ 
+ mkkey: mkkey.c $(RANDOMOBJ) defs.h
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MPINC) $(MPLIB) -o mkkey mkkey.c $(RANDOMOBJ) $(LIBRARIES)
++	$(BUILDCC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MPINC) $(MPLIB) -o mkkey mkkey.c $(RANDOMOBJ) $(LMP)
+ 
+ randomize: randomize.c $(RANDOMOBJ) defs.h
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o randomize randomize.c $(RANDOMOBJ) $(LIBRARIES)
diff -Nru netrek-client-cow-3.3.1/debian/patches/possible-infinite-loop.patch netrek-client-cow-3.3.1/debian/patches/possible-infinite-loop.patch
--- netrek-client-cow-3.3.1/debian/patches/possible-infinite-loop.patch	1970-01-01 00:00:00.000000000 +0000
+++ netrek-client-cow-3.3.1/debian/patches/possible-infinite-loop.patch	2019-04-10 12:44:23.000000000 +0000
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo@debian.org>
+Date: Wed, 20 Mar 2019 21:29:25 +0100
+Subject: possible infinite loop
+
+Bug-Debian: https://bugs.debian.org/924291
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index efb02ba..131f5af 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ convert: mkkey $(KEYFILE) $(KEYSH)
+ 	$(DESC) $(MAKER) $(COMMENT)
+ 
+ newkey: mkkey
+-	until ./mkkey $(KEYFILE) "Client Of Win" $(DESC) $(MAKER) $(COMMENT) "inl,standard2"; do sleep 1; done
++	attempts=32; until ./mkkey $(KEYFILE) "Client Of Win" $(DESC) $(MAKER) $(COMMENT) "inl,standard2"; do attempts=$$((attempts - 1)); test $$(attempts) -le 0 && exit 1; sleep 1; done
+ 
+ mkkey: system.mk
+ 	$(MAKE) -f system.mk KEYDEF=$(KEYDEF) mkkey
diff -Nru netrek-client-cow-3.3.1/debian/patches/series netrek-client-cow-3.3.1/debian/patches/series
--- netrek-client-cow-3.3.1/debian/patches/series	2016-09-15 22:08:44.000000000 +0000
+++ netrek-client-cow-3.3.1/debian/patches/series	2019-04-10 13:50:20.000000000 +0000
@@ -1 +1,3 @@
 gcc5.patch
+possible-infinite-loop.patch
+cross-build-mkkey.patch
diff -Nru netrek-client-cow-3.3.1/debian/rules netrek-client-cow-3.3.1/debian/rules
--- netrek-client-cow-3.3.1/debian/rules	2016-09-15 22:08:44.000000000 +0000
+++ netrek-client-cow-3.3.1/debian/rules	2019-04-10 13:51:46.000000000 +0000
@@ -2,6 +2,8 @@
 #export DH_VERBOSE=1
 export DEB_CFLAGS_MAINT_APPEND=-std=gnu89
 
+include /usr/share/dpkg/architecture.mk
+
 %:
 	dh $@ --with autotools_dev
 
@@ -11,6 +13,9 @@
 		--datadir=\$${prefix}/share/games \
 		--with-gmp
 
+override_dh_auto_build:
+	dh_auto_build -- BUILDCC=$(DEB_BUILD_GNU_TYPE)-gcc
+
 override_dh_auto_test:
 
 override_dh_auto_install: