Lintian Fixes - ogre-1.9

Ready changes

Merge these changes:

git pull https://janitor.debian.net/git/ogre-1.9 lintian-fixes/main

Summary

Diff

diff --git a/debian/changelog b/debian/changelog
index f23764f..070ba54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+ogre-1.9 (1.9.0+dfsg1-13) UNRELEASED; urgency=low
+
+  * Trim trailing whitespace.
+  * Bump debhelper from old 11 to 12.
+    + debian/rules: Rely on default use of dh_missing rather than using
+      dh_install --list-missing.
+  * Set debhelper-compat version in Build-Depends.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit.
+  * Use canonical URL in Vcs-Git.
+  * Fix day-of-week for changelog entries 1.7.3-3, 0.15.0-3.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sun, 19 Jul 2020 23:01:03 -0000
+
 ogre-1.9 (1.9.0+dfsg1-12) unstable; urgency=medium
 
   * Bump Standards-Version to 4.2.1 (no changes needed)
@@ -382,7 +395,7 @@ ogre (1.7.3-3) unstable; urgency=low
   * Remove Michael Koch <konqueror@gmx.de> as Uploader, not active for years and
     only active for a brief period in time
 
- -- Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com>  Fri, 21 Dec 2011 12:50:31 +0000
+ -- Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com>  Wed, 21 Dec 2011 12:50:31 +0000
 
 ogre (1.7.3-2) unstable; urgency=low
 
@@ -790,7 +803,7 @@ ogre (1.2.4-1) UNRELEASED; urgency=low
   * Added lintian overrides to the blender-ogrexml package about the
     unusual-for-lintian but usual-for-blender interpreter (#!BPY).
     Updated blender-ogrexml.{dirs,install} accordingly.
- 
+
   [Documentation]
   * Added `elinks' to Build-Depends, so that a proper changelog and other
     useful documentation can be generated from the HTML files.  Maybe one
@@ -881,7 +894,7 @@ ogre (1.0.3-2) unstable; urgency=low
 
   * Now all required C++ libraries hopefullt c2 versions (Closes: #318943,
     #320595).
-  * Removed from Build-depends: doxygen. 
+  * Removed from Build-depends: doxygen.
   * Added to Build-depends: libxxf86vm-dev.
   * Using automake and autoheader 1.9 explicitly.
   * Re-upload of the upstrea source (first upload, associated to 1.0.3-1
@@ -890,7 +903,7 @@ ogre (1.0.3-2) unstable; urgency=low
  -- Federico Di Gregorio <fog@debian.org>  Tue,  2 Aug 2005 23:27:30 +0200
 
 ogre (1.0.3-1) unstable; urgency=low
-  
+
   * New upstream release (Closes: #314490).
   * Removing two debian-specific patches:
     04_enable_rtti - rtti re-enabled upstream
@@ -908,7 +921,7 @@ ogre (1.0.2-1) unstable; urgency=low
     enabled.)
   * Build tested with preliminary Xorg packages; Build-depends will
     need the following additions: libxxf86vm-dev.
-    
+
  -- Federico Di Gregorio <fog@debian.org>  Thu,  2 Jun 2005 17:27:57 +0200
 
 ogre (1.0.1-2) unstable; urgency=low
@@ -934,22 +947,22 @@ ogre (1.0.0-4) unstable; urgency=low
   * Added patch 04_pyogre to enable pyogre builds (but not yet applied)
   * Added buildall.sh script to build all Samples in a pristine Ogre
     distribution (we can't distribute Samples for license problems.)
-  
+
  -- Federico Di Gregorio <fog@debian.org>  Tue, 29 Mar 2005 16:00:21 +0200
-  
+
 ogre (1.0.0-3) unstable; urgency=low
 
   * Enabled CEGUI renderer build.
-  
+
  -- Federico Di Gregorio <fog@debian.org>  Sun, 13 Mar 2005 12:19:35 +0100
-  
+
 ogre (1.0.0-2) unstable; urgency=low
 
   * Added missing Build-Depends on libzzip-dev.
   * Added Scripts/m4 to aclocal include path.
-  
+
  -- Federico Di Gregorio <fog@debian.org>  Sun,  6 Mar 2005 11:45:18 +0100
-  
+
 ogre (1.0.0-1) unstable; urgency=low
 
   * New upstream release (Closes: #296972).
@@ -1059,7 +1072,7 @@ ogre (0.15.1-1) unstable; urgency=low
 
   * New upstream release.
   * With the new configure switch patch 001_cg is no longer necessary.
-  
+
  -- Federico Di Gregorio <fog@debian.org>  Wed,  1 Dec 2004 19:00:01 +0100
 
 ogre (0.15.0-4) unstable; urgency=low
@@ -1072,17 +1085,17 @@ ogre (0.15.0-4) unstable; urgency=low
     configure.in)
   * Removed dh_compress call when building ogre-doc, we want all
     the documentation to be readily accessible in a -doc package.
-  * Include pre-converted Cg fragment and vertex programs, to avoid 
+  * Include pre-converted Cg fragment and vertex programs, to avoid
     problems with Cg compiler and libraries being non free.
 
  -- Federico Di Gregorio <fog@debian.org>  Mon, 22 Nov 2004 20:00:14 +0100
 
 ogre (0.15.0-3) unstable; urgency=low
-  
+
   * Applied patch from Moritz Muehlenhoff to fix terrain scene
     manager (change is already in upstream CVS.)
 
- -- Federico Di Gregorio <fog@debian.org>  Mon,  9 Nov 2004 23:12:34 +0200
+ -- Federico Di Gregorio <fog@debian.org>  Tue, 09 Nov 2004 23:12:34 +0200
 
 ogre (0.15.0-2) unstable; urgency=low
 
@@ -1094,11 +1107,11 @@ ogre (0.15.0-2) unstable; urgency=low
 ogre (0.15.0-1) unstable; urgency=low
 
   * New upstream version.
-  
+
  -- Federico Di Gregorio <fog@initd.org>  Mon, 25 Oct 2004 12:15:08 +0200
- 
+
 ogre (0.14.1.p1.cvs.20041005-1) unstable; urgency=low
-  
+
   * New CVS snapshot.
 
  -- Federico Di Gregorio <fog@initd.org>  Tue,  5 Oct 2004 23:25:47 +0200
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 fa3dfdd..136209c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders: Manuel A. Fernandez Montecelo <mafm@debian.org>
 Homepage: https://ogre3d.org/
 Vcs-Browser: https://salsa.debian.org/games-team/ogre-1.9
-Vcs-Git: https://salsa.debian.org/games-team/ogre-1.9
+Vcs-Git: https://salsa.debian.org/games-team/ogre-1.9.git
 Rules-Requires-Root: no
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 12),
                dpkg-dev (>= 1.16.1~),
                cmake (>= 2.8.0),
                pkg-config,
diff --git a/debian/rules b/debian/rules
index 7323e48..bdb7296 100755
--- a/debian/rules
+++ b/debian/rules
@@ -110,13 +110,13 @@ override_dh_install-arch:
         # remove .md5, .map and other files that we do not want installed
         #find debian/tmp/usr/share/OGRE/docs/api/html -type f -not \( -iname '*.html' -or -iname '*.png' -or -iname '*.css' -or -iname '*.js' \) -exec rm -fv {} \;
 
-	dh_install -a --list-missing
+	dh_install -a
 
 override_dh_install-indep:
         # remove .md5, .map and other files that we do not want installed
 	find debian/tmp/usr/share/OGRE/docs/api/html -type f -not \( -iname '*.html' -or -iname '*.png' -or -iname '*.css' -or -iname '*.js' \) -exec rm -fv {} \;
 
-	dh_install -i --list-missing -Xjquery.js
+	dh_install -i -Xjquery.js
 
 override_dh_installchangelogs:
 	dh_installchangelogs -- $(OGRE_CHANGELOG)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..1a95f76
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,3 @@
+---
+Bug-Database: https://github.com/OGRECave/ogre/issues
+Bug-Submit: https://github.com/OGRECave/ogre/issues/new

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.build-id/01/917e9b5bb1c24d80231bf7b233eea8c471fbe2.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/26/bd42fe08ffd7358c53f19cf4c1f884e044550a.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/3d/739ba0083e7dafc2652885d0355819ec1df2cd.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/40/c421deb3bb7af389de9ccaad499bc94d0123b8.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/46/16906177aea4ded304d24e1ac45a075a5f9b78.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/6d/cc7223c06e53998b145d508f23bc0ad127cf24.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/7f/326362fed59659abed99944cab6f7abadd1f11.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/9a/3b4e31dd3e3cd0e0f6ff2feed2b42cf4f1257d.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/a8/4d2863a653be62019e04271cc00be21dba00b7.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/aa/62c7ec62e8d03b89cdd75ed2599f72530041c7.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/ae/9ac94571e6e51c351201ba8650d17a84febb0e.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/b6/3d8c9f33e6968653266b5f2549d3df3b46f6ea.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/b6/b5901aa7eacc9d575777f7e1f6af6c4ce7ce6c.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/b9/ee48890d98bbe70aad9bc31dccbf2ae4bc3b74.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/e3/d1a9af243d297d160180c84c9feb3a854223e9.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/ed/bc2b89d4e9ce6e49c76641608630082218e192.debug
-rw-r--r--  root/root   /usr/lib/debug/.dwz/x86_64-linux-gnu/libogre-1.9.0v5.debug
-rw-r--r--  root/root   /usr/lib/debug/.dwz/x86_64-linux-gnu/ogre-1.9-tools.debug

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/0a/9b65dfd1b838f2b09b1cfdeb66099a2e4ec638.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/10/39dbcfd6373e814b4098a5fd83f1f8d478be40.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/29/361c31b2ee0eea0475d2b37b8fafb9154e38f5.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/2f/53d3c7dbe07587a5227336d135e6bf786e873d.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/5e/c8b06b424c83b663f1c43fb83bbede735f23df.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/7e/4fb2644a4b543c993ccbcb78202a13825a6cc1.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/7f/48a195910ab0672df8c9791712b35ad3e5046a.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/92/079196b9a430e298882ab14c07d300e59216de.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/97/479c5b4cdac1ad7d4383457e54297fb72ecd77.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/9f/c17216fbd41a57deaf72946085037cb61626cd.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/a3/c45f5bef60dd41b4af03f30c45c27b77c6473c.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/a8/489995633739189ff2e4fb59fe2feac9d2c81f.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/bb/e3c75208318c8ec64109c89d53a2964acca52c.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/c8/b03edc7c4b2f405ae3ba777ae9b70efeaeb6f1.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/cb/234b69d384f836f7e4f574a88c0f23fbf39771.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/cf/c7046b861f27dc4e9f9a756bca715c8f49a7e7.debug

No differences were encountered between the control files of package blender-ogrexml-1.9

No differences were encountered between the control files of package libogre-1.9-dev

No differences were encountered between the control files of package libogre-1.9.0v5

Control files of package libogre-1.9.0v5-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 0a9b65dfd1b838f2b09b1cfdeb66099a2e4ec638 1039dbcfd6373e814b4098a5fd83f1f8d478be40 29361c31b2ee0eea0475d2b37b8fafb9154e38f5 2f53d3c7dbe07587a5227336d135e6bf786e873d 7e4fb2644a4b543c993ccbcb78202a13825a6cc1 7f48a195910ab0672df8c9791712b35ad3e5046a 92079196b9a430e298882ab14c07d300e59216de 97479c5b4cdac1ad7d4383457e54297fb72ecd77 9fc17216fbd41a57deaf72946085037cb61626cd a3c45f5bef60dd41b4af03f30c45c27b77c6473c bbe3c75208318c8ec64109c89d53a2964acca52c c8b03edc7c4b2f405ae3ba777ae9b70efeaeb6f1 cb234b69d384f836f7e4f574a88c0f23fbf39771 cfc7046b861f27dc4e9f9a756bca715c8f49a7e7 01917e9b5bb1c24d80231bf7b233eea8c471fbe2 26bd42fe08ffd7358c53f19cf4c1f884e044550a 3d739ba0083e7dafc2652885d0355819ec1df2cd 40c421deb3bb7af389de9ccaad499bc94d0123b8 6dcc7223c06e53998b145d508f23bc0ad127cf24 7f326362fed59659abed99944cab6f7abadd1f11 9a3b4e31dd3e3cd0e0f6ff2feed2b42cf4f1257d a84d2863a653be62019e04271cc00be21dba00b7 aa62c7ec62e8d03b89cdd75ed2599f72530041c7 ae9ac94571e6e51c351201ba8650d17a84febb0e b63d8c9f33e6968653266b5f2549d3df3b46f6ea b9ee48890d98bbe70aad9bc31dccbf2ae4bc3b74 e3d1a9af243d297d160180c84c9feb3a854223e9 edbc2b89d4e9ce6e49c76641608630082218e192

No differences were encountered between the control files of package ogre-1.9-doc

No differences were encountered between the control files of package ogre-1.9-tools

Control files of package ogre-1.9-tools-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 5ec8b06b424c83b663f1c43fb83bbede735f23df a8489995633739189ff2e4fb59fe2feac9d2c81f 4616906177aea4ded304d24e1ac45a075a5f9b78 b6b5901aa7eacc9d575777f7e1f6af6c4ce7ce6c

Run locally

Try this locally (using the lintian-brush package):

debcheckout ogre-1.9
cd ogre-1.9
lintian-brush

More details

Full run details