Merge branch 'lintian-fixes' into 'master'

Fix some issues reported by lintian

See merge request pkg-llvm-team/iwyu!1

6 files changed, 18 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 96e7372..e0dd4bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+iwyu (8.0-3) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Use secure copyright file specification URI.
+  * Use secure URI in Homepage field.
+  * Bump debhelper from old 10 to 12.
+  * Set debhelper-compat version in Build-Depends.
+  * Set upstream metadata fields: Repository, Repository-Browse.
+  * Rely on pre-initialized dpkg-architecture variables.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Fri, 06 Dec 2019 17:58:34 +0000
+
 iwyu (8.0-2) unstable; urgency=medium
 
   * Cherry-pick the upstream patch to address
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 528665f..bb79d1f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: devel
 Priority: optional
 Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre@debian.org>
-Build-Depends: debhelper (>= 10.0.0), cmake, clang-8, libclang-8-dev,
+Build-Depends: debhelper-compat (= 12), cmake, clang-8, libclang-8-dev,
  llvm-8-dev, help2man, libncurses5-dev, zlib1g-dev, chrpath
 Build-Conflicts: llvm-5.0-dev, llvm-6.0-dev
 Standards-Version: 4.2.1
-Homepage: http://include-what-you-use.org/
+Homepage: https://include-what-you-use.org/
 Vcs-Git: https://salsa.debian.org/pkg-llvm-team/iwyu.git
 Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/iwyu
 
diff --git a/debian/copyright b/debian/copyright
index b6274ba..5ce9c59 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: iwyu (include what you use)
 Upstream-Contact: https://groups.google.com/forum/#!forum/include-what-you-use
 Source: https://github.com/include-what-you-use/include-what-you-use
diff --git a/debian/rules b/debian/rules
index 28546d2..703d51c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 
 TARGET_BUILD=iwyu-build
 VERSION=$(shell dpkg-parsechangelog |grep "^Version:"|sed -e "s|Version: \(.*\)|\1|")
-DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+include /usr/share/dpkg/architecture.mk
 ADDITIONAL_CXX_FLAGS=""
 
 ifneq (,$(filter $(DEB_BUILD_ARCH),mips64el))
@@ -42,4 +42,3 @@ override_dh_auto_install:
 
 override_dh_auto_clean:
 	rm -rf $(TARGET_BUILD)
-
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..f348a73
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,2 @@
+Repository: https://github.com/include-what-you-use/include-what-you-use
+Repository-Browse: https://github.com/include-what-you-use/include-what-you-use