Merge branch 'lintian-fixes' into 'master'

Fix some issues reported by lintian

See merge request efi-team/shim!5

5 files changed, 28 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 242c6c32..2f9aec5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+shim (15+1533136590.3beb971-10) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Use secure copyright file specification URI.
+  * debian/copyright: use spaces rather than tabs to start continuation
+    lines.
+  * Bump debhelper from old 11 to 12.
+  * Set debhelper-compat version in Build-Depends.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit.
+  * Update standards version to 4.4.1, no changes needed.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 01 Apr 2020 06:38:02 +0000
+
 shim (15+1533136590.3beb971-9) unstable; urgency=medium
 
   [ Steve McIntyre ]
@@ -166,7 +179,7 @@ shim (0.9+1474479173.6c180c6-1) unstable; urgency=medium
 shim (0.9+1474479173.6c180c6-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Helen Koike ]
-  * debian/copyright: add OpenSSL license 
+  * debian/copyright: add OpenSSL license
 
   [ Mathieu Trudel-Lapierre ]
   * New upstream release.
@@ -191,7 +204,7 @@ shim (0.9+1465500757.14a5905-0ubuntu1) yakkety; urgency=medium
   * Refreshed patches.
     - Remaining patches:
       + second-stage-path
-      + sbsigntool-not-pesign 
+      + sbsigntool-not-pesign
   * debian/patches/unused-variable: remove unused variable size.
   * debian/patches/binutils-version-matching: revert d9a4c912 to correctly
     match objcopy's version on Ubuntu.
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de3947..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 250db5cc..10d83bc2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: admin
 Priority: optional
 Maintainer: Debian EFI team <debian-efi@lists.debian.org>
 Uploaders: Steve Langasek <vorlon@debian.org>, Steve McIntyre <93sam@debian.org>
-Standards-Version: 4.3.0
-Build-Depends: debhelper (>= 11), gnu-efi (>= 3.0u), sbsigntool, openssl, libelf-dev, gcc-9, pesign (>= 0.112-5)
+Standards-Version: 4.4.1
+Build-Depends: debhelper-compat (= 12), gnu-efi (>= 3.0u), sbsigntool, openssl, libelf-dev, gcc-9, pesign (>= 0.112-5)
 Vcs-Browser: https://salsa.debian.org/efi-team/shim
 Vcs-Git: https://salsa.debian.org/efi-team/shim.git
 
diff --git a/debian/copyright b/debian/copyright
index 3e8d5dd0..63723ead 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: shim
 Upstream-Contact: Matthew Garrett <mjg59@coreos.com>
 Source: https://github.com/rhboot/shim
 
 Files: *
 Copyright: 2012-2013 Red Hat, Inc
-	2009-2016 Intel Corporation
+ 	2009-2016 Intel Corporation
 License: BSD-2-Clause
 
 Files: debian/patches/*
@@ -32,25 +32,25 @@ License: BSD-2-Clause
 
 Files: include/Http.h
 Copyright: 2016 Intel Corporation
-	2015 Hewlett Packard Enterprise Development LP
+ 	2015 Hewlett Packard Enterprise Development LP
 License: BSD-2-Clause
 
 Files: include/PeImage.h
 Copyright: 2006-2010 Intel Corporation
-	2008-2009 Apple Inc
+ 	2008-2009 Apple Inc
 License: BSD-2-Clause
 
 Files: lib/*.c
 Copyright: 2011-2012 Intel Corporation
-	2012 <James.Bottomley@HansenPartnership.com>
-	2012-2013 Red Hat, Inc
+ 	2012 <James.Bottomley@HansenPartnership.com>
+ 	2012-2013 Red Hat, Inc
 License: BSD-2-Clause
 
 Files: Cryptlib/OpenSSL/* Cryptlib/Include/openssl/*
 Copyright: 1998-2016 The OpenSSL Project
-	1995-1998 Eric Young (eay@cryptsoft.com)
-	2002 Sun Microsystems, Inc
-	2005 Nokia
+ 	1995-1998 Eric Young (eay@cryptsoft.com)
+ 	2002 Sun Microsystems, Inc
+ 	2005 Nokia
 License: OpenSSL and Original-SSLeay
  OpenSSL License
  ---------------
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 00000000..0f318e7c
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,2 @@
+Bug-Database: https://github.com/rhboot/shim/issues
+Bug-Submit: https://github.com/rhboot/shim/issues/new