Run of lintian-fixes for spring

Try this locally (using the lintian-brush package):

debcheckout spring
cd spring
lintian-brush

Merge these changes:

git pull https://janitor.debian.net/git/spring lintian-fixes/main

Summary

Diff

diff --git a/debian/changelog b/debian/changelog
index 0180b74f..3e54b67f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spring (104.0+dfsg-7) UNRELEASED; urgency=low
+
+  * Set upstream metadata fields: Archive, Repository.
+  * Rely on pre-initialized dpkg-architecture variables.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 14 Jul 2020 00:19:40 -0000
+
 spring (104.0+dfsg-6) unstable; urgency=medium
 
   * Add bug-954722.patch and fix FTBFS due to error: conflicting declaration
diff --git a/debian/rules b/debian/rules
index 234bf6bf..1c044d9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,7 @@ DTYPE := +dfsg
 VER   ?= $(subst $(DTYPE),,$(UVER))
 BUILD_DATE := $(shell dpkg-parsechangelog --show-field=Date)
 
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+include /usr/share/dpkg/architecture.mk
 ifeq ($(DEB_HOST_ARCH_CPU),i386)
 	MARCH_FLAG :="i686"
 else
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 00000000..b920dafb
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,3 @@
+---
+Archive: SourceForge
+Repository: https://git.code.sf.net/p/springrts/code

Full worker log Full build log