From 69a55e2416c824e443e3cb6b1729d498a19178ca Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Wed, 1 Apr 2020 06:38:15 +0000 Subject: Trim trailing whitespace. Fixes: lintian: file-contains-trailing-whitespace See-also: https://lintian.debian.org/tags/file-contains-trailing-whitespace.html --- debian/changelog | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 242c6c32..688f7ed8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +shim (15+1533136590.3beb971-10) UNRELEASED; urgency=medium + + * Trim trailing whitespace. + + -- Debian Janitor Wed, 01 Apr 2020 06:38:02 +0000 + shim (15+1533136590.3beb971-9) unstable; urgency=medium [ Steve McIntyre ] @@ -166,7 +172,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 +197,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. -- cgit v1.2.3 From 1a8bb34c7ee4789f47f1f7bb4dc904ae127230c6 Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Wed, 1 Apr 2020 06:38:44 +0000 Subject: Use secure copyright file specification URI. Fixes: lintian: insecure-copyright-format-uri See-also: https://lintian.debian.org/tags/insecure-copyright-format-uri.html --- debian/changelog | 1 + debian/copyright | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 688f7ed8..2153fe9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ shim (15+1533136590.3beb971-10) UNRELEASED; urgency=medium * Trim trailing whitespace. + * Use secure copyright file specification URI. -- Debian Janitor Wed, 01 Apr 2020 06:38:02 +0000 diff --git a/debian/copyright b/debian/copyright index 3e8d5dd0..e9e69b04 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -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 Source: https://github.com/rhboot/shim -- cgit v1.2.3 From e1df2a1d8734ec256e5be3513c023dd75a791725 Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Wed, 1 Apr 2020 06:39:14 +0000 Subject: debian/copyright: use spaces rather than tabs to start continuation lines. Fixes: lintian: tab-in-license-text See-also: https://lintian.debian.org/tags/tab-in-license-text.html --- debian/changelog | 2 ++ debian/copyright | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2153fe9d..28e47753 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ 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. -- Debian Janitor Wed, 01 Apr 2020 06:38:02 +0000 diff --git a/debian/copyright b/debian/copyright index e9e69b04..63723ead 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ 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 - 2012-2013 Red Hat, Inc + 2012 + 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 --------------- -- cgit v1.2.3 From 6ce7b6e0599755d32329d80661935c860a5f09b1 Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Wed, 1 Apr 2020 06:39:44 +0000 Subject: Bump debhelper from old 11 to 12. Fixes: lintian: package-uses-old-debhelper-compat-version See-also: https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html --- debian/changelog | 1 + debian/compat | 2 +- debian/control | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 28e47753..f66bc1c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ shim (15+1533136590.3beb971-10) UNRELEASED; urgency=medium * Use secure copyright file specification URI. * debian/copyright: use spaces rather than tabs to start continuation lines. + * Bump debhelper from old 11 to 12. -- Debian Janitor Wed, 01 Apr 2020 06:38:02 +0000 diff --git a/debian/compat b/debian/compat index b4de3947..48082f72 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/debian/control b/debian/control index 250db5cc..33664417 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian EFI team Uploaders: Steve Langasek , 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) +Build-Depends: debhelper (>= 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 -- cgit v1.2.3 From 7d69650c4c19c68238216f687751510cd0f12205 Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Wed, 1 Apr 2020 06:40:13 +0000 Subject: Set debhelper-compat version in Build-Depends. Fixes: lintian: uses-debhelper-compat-file See-also: https://lintian.debian.org/tags/uses-debhelper-compat-file.html --- debian/changelog | 1 + debian/compat | 1 - debian/control | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index f66bc1c7..8d5f23ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ shim (15+1533136590.3beb971-10) UNRELEASED; urgency=medium * 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. -- Debian Janitor Wed, 01 Apr 2020 06:38:02 +0000 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f72..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index 33664417..ef8c2664 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian EFI team Uploaders: Steve Langasek , Steve McIntyre <93sam@debian.org> Standards-Version: 4.3.0 -Build-Depends: debhelper (>= 12~), gnu-efi (>= 3.0u), sbsigntool, openssl, libelf-dev, gcc-9, pesign (>= 0.112-5) +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 -- cgit v1.2.3 From 90f64daec9821c12a8cb98cf9b71795e443b2fa2 Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Wed, 1 Apr 2020 06:40:47 +0000 Subject: Set upstream metadata fields: Bug-Database, Bug-Submit. Fixes: lintian: upstream-metadata-file-is-missing See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html --- debian/changelog | 1 + debian/upstream/metadata | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index 8d5f23ef..90bb08ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ shim (15+1533136590.3beb971-10) UNRELEASED; urgency=medium lines. * Bump debhelper from old 11 to 12. * Set debhelper-compat version in Build-Depends. + * Set upstream metadata fields: Bug-Database, Bug-Submit. -- Debian Janitor Wed, 01 Apr 2020 06:38:02 +0000 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 -- cgit v1.2.3 From 434300fcc78917d8e36854842d30aa0fc6ce0f00 Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Wed, 1 Apr 2020 06:41:16 +0000 Subject: Update standards version to 4.4.1, no changes needed. Fixes: lintian: out-of-date-standards-version See-also: https://lintian.debian.org/tags/out-of-date-standards-version.html --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 90bb08ba..2f9aec5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ shim (15+1533136590.3beb971-10) UNRELEASED; urgency=medium * 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 Wed, 01 Apr 2020 06:38:02 +0000 diff --git a/debian/control b/debian/control index ef8c2664..10d83bc2 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: Debian EFI team Uploaders: Steve Langasek , Steve McIntyre <93sam@debian.org> -Standards-Version: 4.3.0 +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 -- cgit v1.2.3