Merge ~debian-janitor/ufw:lintian-fixes into ufw:debian/master

[Debian Janitor]

Fix lintian issues: Set upstream metadata fields: Repository, Repository-Browse., Update watch file format version to 4., Use secure copyright file specification URI., Use set -e rather than passing -e on the shebang-line.

Fix some issues reported by lintian
* Use secure copyright file specification URI. (insecure-copyright-format-uri)
* Use set -e rather than passing -e on the shebang-line. (maintainer-script-without-set-e)
* Set upstream metadata fields: Repository, Repository-Browse. (upstream-metadata-file-is-missing, upstream-metadata-missing-repository)
* Update watch file format version to 4. (older-debian-watch-file-standard)

This merge proposal was created automatically by the Janitor bot.
For more information, including instructions on how to disable
these merge proposals, see https://janitor.debian.net/lintian-fixes.

You can follow up to this merge proposal as you normally would.

The bot will automatically update the merge proposal to resolve merge conflicts
or close the merge proposal when all changes are applied through other means
(e.g. cherry-picks). Updates may take several hours to propagate.

Build and test logs for this branch can be found at
https://janitor.debian.net/lintian-fixes/pkg/ufw/e9f11848-6f2b-425f-bfda-b14132a536a2.

These changes have no impact on the binary debdiff. See
https://janitor.debian.net/api/run/e9f11848-6f2b-425f-bfda-b14132a536a2/debdiff?filter_boring=1 to
download the raw debdiff.

You can also view the diffoscope diff at
https://janitor.debian.net/api/run/e9f11848-6f2b-425f-bfda-b14132a536a2/diffoscope?filter_boring=1,
or unfiltered at https://janitor.debian.net/api/run/e9f11848-6f2b-425f-bfda-b14132a536a2/diffoscope.

[Jamie Strandboge (jdstrand)]

LGTM. Thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index f708003..0353d6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
 ufw (0.36-8) UNRELEASED; urgency=medium
 
+  [ Jamie Strandboge ]
   * ufw.lintian-overrides:
     - remove init.d-script-possible-missing-stop override
     - adjust "allow to" override
     - override spare-manual-page for ufw-framework as it gives additional
       details for the ufw command
 
+  [ Debian Janitor ]
+  * Use secure copyright file specification URI.
+  * Use set -e rather than passing -e on the shebang-line.
+  * Set upstream metadata fields: Repository, Repository-Browse.
+  * Update watch file format version to 4.
+
  -- Jamie Strandboge <[e-mail]>  Tue, 22 Sep 2020 11:50:27 -0500
 
 ufw (0.36-7) unstable; urgency=medium
diff --git a/debian/config b/debian/config
index ed17f0b..094d5bf 100644
--- a/debian/config
+++ b/debian/config
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 # debconf
 . /usr/share/debconf/confmodule
diff --git a/debian/copyright b/debian/copyright
index 6c90a2b..b32db5d 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: ufw
 Upstream-Contact: Jamie Strandboge <[e-mail]>
 Upstream-Source: https://code.launchpad.net/ufw
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..a0f4fb2
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,3 @@
+---
+Repository: https://code.launchpad.net/ufw
+Repository-Browse: https://code.launchpad.net/ufw
diff --git a/debian/watch b/debian/watch
index 9453078..e1b5fa6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
+version=4
 https://launchpad.net/ufw/+download/ https://launchpad.net/ufw/.*/ufw-(.*)\.tar\.gz