Merge branch 'lintian-fixes' into 'master'

Fix some issues reported by lintian

See merge request pascal-team/winff!1

6 files changed, 29 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 2e70d24..db733ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+winff (1.5.5-7) UNRELEASED; urgency=low
+
+  * Trim trailing whitespace.
+  * Use secure copyright file specification URI.
+  * debian/copyright: use spaces rather than tabs to start continuation lines.
+  * Use secure URI in Homepage field.
+  * Bump debhelper from old 11 to 12.
+  * Set debhelper-compat version in Build-Depends.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+  * Update standards version to 4.5.0, no changes needed.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 24 Aug 2020 20:11:00 -0000
+
 winff (1.5.5-6) unstable; urgency=medium
 
   * Update Portuguese translation (Closes: #919437)
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index e38568d..d40af86 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: winff
 Section: video
 Priority: optional
 Maintainer: Paul Gevers <elbrus@debian.org>
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 12),
  fpc,
  lazarus-src,
  libgtk2.0-dev,
@@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 11~),
  lcl-gtk2,
  lcl-qt5,
 Build-Depends-Indep: libreoffice
-Standards-Version: 4.3.0
-Homepage: http://www.winff.org/
+Standards-Version: 4.5.0
+Homepage: https://www.winff.org/
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/pascal-team/winff
 Vcs-Git: https://salsa.debian.org/pascal-team/winff.git
diff --git a/debian/copyright b/debian/copyright
index ff21f19..9fe9e30 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: WinFF
 Source: http://winff.org/sources
 Upstream-Contact: Matthew Weatherford <matt@biggmatt.com>
@@ -89,10 +89,10 @@ License: GPL-3+
 
 Files: languages/*
 Copyright: © 2006-2013 Matthew Weatherford <matt@biggmatt.com>
-	   (c) 2011-2016 Rosetta Contributors and Canonical Ltd
-	   © 2008-2010 Marcin Trybus <mtrybus@o2.pl>
-	   © 2008 Luís Torrao <luistorrao@gmail.com>
-	   © 2009 Joe Black <vladimir-irina@mail.ru>
+           (c) 2011-2016 Rosetta Contributors and Canonical Ltd
+           © 2008-2010 Marcin Trybus <mtrybus@o2.pl>
+           © 2008 Luís Torrao <luistorrao@gmail.com>
+           © 2009 Joe Black <vladimir-irina@mail.ru>
   	   © 2011 Alexey Osipov <lion-simba@pridelands.ru>
 License: GPL-3+
 
diff --git a/debian/rules b/debian/rules
index 2fb89d1..6ce1f5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@
 	dh ${@} --ddeb-migration='winff-dbg (<< 1.5.3-7~)'
 
 override_dh_auto_configure:
-	if [ -f presets.xml ] ; then mv presets.xml presets-orig.xml; fi 
+	if [ -f presets.xml ] ; then mv presets.xml presets-orig.xml; fi
 
 override_dh_auto_build-arch:
 # bug 713492: if primary-config-path is not set, lazarus is using $HOME
@@ -30,7 +30,7 @@ override_dh_auto_build-indep:
 	fi
 
 override_dh_clean:
-	if [ -f presets-orig.xml ] ; then mv presets-orig.xml presets.xml; fi 
+	if [ -f presets-orig.xml ] ; then mv presets-orig.xml presets.xml; fi
 	dh_clean
 
 override_dh_fixperms-indep:
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..e95185e
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/WinFF/winff/issues
+Bug-Submit: https://github.com/WinFF/winff/issues/new
+Repository: https://github.com/WinFF/winff.git
+Repository-Browse: https://github.com/WinFF/winff