Run of lintian-fixes for cyrus-imapd

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

debcheckout cyrus-imapd
cd cyrus-imapd
lintian-brush

Merge these changes:

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

Summary

  • debian/copyright: use spaces rather than tabs to start continuation lines. (tab-in-licence-text)
  • Set upstream metadata fields: Bug-Submit (from ./configure).
  • Remove obsolete fields Contact, Name from debian/upstream/metadata (already present in machine-readable debian/copyright).
  • Rely on pre-initialized dpkg-architecture variables. (debian-rules-sets-dpkg-architecture-variable)

Diff

diff --git a/debian/copyright b/debian/copyright
index 225579c0..a976307a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,15 +9,15 @@ License: CMU
 
 Files: tools/vzic/*
 Copyright: 2000-2001 Ximian, Inc.
-	   2003 Damon Chaplin.
+           2003 Damon Chaplin.
 License: GPL-2+
 
 Files: debian/*
 Copyright: 2002-2010 Henrique de Moraes Holschuh
-	   	     Sven Mueller
-		     Benjamin Seidenberg
-		     Farzad FARID
-		     Christoph Berg
+ 	   	     Sven Mueller
+ 		     Benjamin Seidenberg
+ 		     Farzad FARID
+ 		     Christoph Berg
            2005-2015 Ondřej Surý
 License: CMU
 
diff --git a/debian/rules b/debian/rules
index 830421cd..0a710728 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,8 +25,7 @@ export DEB_CFLAGS_MAINT_APPEND  = -Wall -Wextra -g -fno-strict-aliasing -pipe $(
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export PERL_MM_OPT              = INSTALLDIRS="vendor" CCFLAGS="$(dpkg-buildflags --get CFLAGS)" LDDLFLAGS="$(dpkg-buildflags --get LDFLAGS)"
 
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/dpkg/architecture.mk
 
 # Extra version information to add to Cyrus IMAPd ID
 EXTRA_IDENT := Debian-$(DEB_VERSION)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 24e91a33..640b4ca2 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,7 +1,6 @@
 ---
 Archive: GitHub
 Bug-Database: https://github.com/cyrusimap/cyrus-imapd/issues
-Contact: https://github.com/cyrusimap/cyrus-imapd/issues
-Name: cyrus-imapd
+Bug-Submit: https://github.com/cyrusimap/cyrus-imapd/issues
 Repository: https://github.com/cyrusimap/cyrus-imapd.git
 Repository-Browse: https://github.com/cyrusimap/cyrus-imapd

Full worker log Full build log