Lintian Fixes - inventor

Ready changes

Merge these changes:

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

Summary

Diff

diff --git a/debian/changelog b/debian/changelog
index 110d1a1..ff6dd8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+inventor (2.1.5-10-22) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Bump debhelper from old 11 to 12.
+  * Use canonical URL in Vcs-Browser.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 06 May 2019 08:35:04 +0000
+
 inventor (2.1.5-10-21) unstable; urgency=medium
 
   * Team upload.
@@ -31,7 +39,7 @@ inventor (2.1.5-10-18) unstable; urgency=low
 
   * patches/endianness.patch: Add s390x and aarch64 to list of 64-bit
     architectures.  Closes: #739186.
-  
+
   * patches/add-required-libs.patch: Link Decal.so explicitly against
     libc.  Closes: #719485.
 
@@ -44,10 +52,10 @@ inventor (2.1.5-10-17) unstable; urgency=low
   * control: Change from lesstif2 to motif.  Closes: #714864.
   * Bump SOVERSION to 1.0.0.
 
-  * patches/add-required-libs.patch: Link with -lXm before -lXt.  
+  * patches/add-required-libs.patch: Link with -lXm before -lXt.
     Closes: #718691.
-  
-  * patches/buildsystem.patch: Use xdg-open as PDF viewer.  
+
+  * patches/buildsystem.patch: Use xdg-open as PDF viewer.
     Closes: #718784.
 
  -- Steve M. Robbins <smr@debian.org>  Fri, 09 Aug 2013 22:50:15 -0500
@@ -55,9 +63,9 @@ inventor (2.1.5-10-17) unstable; urgency=low
 inventor (2.1.5-10-16) unstable; urgency=low
 
   * patches/add-required-libs.patch: Do not hard-code libGLw path.  Bug
-    fix for #624156 restores ability to use shared libGLw.  
+    fix for #624156 restores ability to use shared libGLw.
     Closes: #634559.
-  
+
   * control: change recommends from xpdf-reader to xpdf.
 
  -- Steve M. Robbins <smr@debian.org>  Sat, 24 Sep 2011 15:50:51 -0500
@@ -71,11 +79,11 @@ inventor (2.1.5-10-15) unstable; urgency=low
   * compat:
   * control: Require use of debhelper v8.  Add ${misc:Depends} to all
     packages.
-  
+
   * source/format: Switch to source format 3.0.  Closes: #620531.
     - patches/add-required-libs.patch:
     - patches/bison-workaround.patch:
-    - patches/buildman.patch: 
+    - patches/buildman.patch:
     - patches/buildsystem.patch:
     - patches/configurability.patch:
     - patches/const-correctness.patch:
@@ -87,7 +95,7 @@ inventor (2.1.5-10-15) unstable; urgency=low
     - patches/socalcparse.patch:
     - patches/use-tcsh.patch: New.  Patch set created from previous debian
       diff, augmented to link all required lib.  Closes: #554921.
-  
+
   * Build on i386 to ensure docs are built.  Closes: #595405.
 
  -- Steve M. Robbins <smr@debian.org>  Tue, 26 Apr 2011 00:46:51 -0500
@@ -106,10 +114,10 @@ inventor (2.1.5-10-13) unstable; urgency=low
     Closes: #515454.  Build-depend on libglu1-mesa-dev instead of
     libglu1-xorg-dev.  Update standards-version to 3.8.2.0.  Change
     ${Source-Version} to ${binary:Version}.  Move -doc to section doc.
-  
+
   * debian/inventor-clients.menu: Update section from Apps/Graphics to
     Applications/Graphics.
-  
+
   * debian/libinventor0.lintian-overrides: New.  Override lintian check
     for dependency on xfonts.  Debian policy doesn't apply here because
     we're not getting font info from the server, but directly reading the
@@ -143,12 +151,12 @@ inventor (2.1.5-10-9) unstable; urgency=low
 
   * debian/control: Build with lesstif2 instead of lesstif1.  Closes:
     #374235, #311381.
-  
+
   * debian/control: Build with libgl1-mesa-swx11-dev rather than
     libgl1-mesa-dev because only the former includes library GLw.
     Closes: #374303.  Maybe someday libgl1-mesa-dev will also
     support GLw (see #374904).
-  
+
   * debian/link-fonts.sh: Update source font path from
     /usr/lib/X11/fonts/Type1 to /usr/share/fonts/X11/Type1.
 
@@ -158,17 +166,17 @@ inventor (2.1.5-10-8) unstable; urgency=low
 
   * lib/database/include/machine.h: Add __powerpc64__ to list that enables
     USE_64BIT_HACKS.  Closes: #361049.
-  
+
   * debian/rules: fix up path to data files in example source
     code. Closes: #297141.
-  
+
   * debian/copyright: delete old FSF address.
 
  -- Steve M. Robbins <smr@debian.org>  Fri,  7 Apr 2006 23:26:51 -0400
 
 inventor (2.1.5-10-7) unstable; urgency=low
 
-  * debian/control: Replace xlibs-dev dependency by four others; 
+  * debian/control: Replace xlibs-dev dependency by four others;
   closes: #346691.  Update standards-version to 3.6.2; no changes.
 
  -- Steve M. Robbins <smr@debian.org>  Tue, 17 Jan 2006 00:38:31 -0500
@@ -190,10 +198,10 @@ inventor (2.1.5-10-5) unstable; urgency=low
 inventor (2.1.5-10-4) unstable; urgency=low
 
   * G++ 4.0 transition: rename back to libinventor0.
-  
-  * lib/database/include/Inventor/SoPath.h: Declare SoTempPath.  
+
+  * lib/database/include/Inventor/SoPath.h: Declare SoTempPath.
   Closes: #320906.
-  
+
   * lib/database/include/machine.h: Define USE_64BIT_HACKS as true
   for 64-bit machines, including AMD 64.
 
@@ -203,9 +211,9 @@ inventor (2.1.5-10-4) unstable; urgency=low
   * lib/interaction/src/draggers/SoDragger.c++:
   * lib/nodekits/src/nodekits/SoNkCatalog.c++:
   * lib/nodekits/src/upgraders/SoV1NkCatalog.c++:
-  * libSoXt/src/SoXtRsrc.c++: Replace occurrances of 
+  * libSoXt/src/SoXtRsrc.c++: Replace occurrances of
     '_MIPS_SZLONG == 64 || __ia64' by USE_64BIT_HACKS.  Closes: #286471.
-  
+
  -- Steve M. Robbins <smr@debian.org>  Sun,  7 Aug 2005 21:25:40 -0400
 
 inventor (2.1.5-10-3) unstable; urgency=low
@@ -220,11 +228,11 @@ inventor (2.1.5-10-2) unstable; urgency=low
   * debian/control: New package inventor-doc for documentation.
     Program ivman used to generate manpages only built on
     certain architectures.  Closes: #240927.
-  
+
   * doc/GNUmakefile: Generate manpages only if requested.
-  
+
   * doc/man/ivman: Fixes to make 'g++ -Wall' quiet.
-  
+
  -- Steve M. Robbins <smr@debian.org>  Tue,  1 Jun 2004 22:24:10 -0400
 
 inventor (2.1.5-10-1) unstable; urgency=low
@@ -233,31 +241,31 @@ inventor (2.1.5-10-1) unstable; urgency=low
   from the upstream version: I had to remove all CVS directories.
 
   * Replaced all usage of "acroread" by "xpdf".  Closes: #227794.
-  
+
   * debian/control: -dev package depends on lesstif-dev.  Closes: #237699.
-  
+
  -- Steve M. Robbins <smr@debian.org>  Fri, 28 May 2004 22:19:43 -0400
 
 inventor (2.1.5-9-4) unstable; urgency=low
-  
+
   * libFL/ang/flfreetype.h: Conform to ever-changing freetype library.
     Thanks to Daniel Schepler for the patch.  Closes: #225395.
 
   * debian/control: Bump standards version to 3.6.1.0.
-  * debian/rules: Set optimization and debugging flags for build.  
-  
+  * debian/rules: Set optimization and debugging flags for build.
+
   * debian/rules: Set _REENTRANT for build to conform to policy 10.2.
-  
+
   * make/ivcommondefs: Use linker flag '-z defs' to catching missing
     library references at build time (policy 10.2).
-  
+
  -- Steve M. Robbins <smr@debian.org>  Sun, 11 Jan 2004 15:28:04 -0500
 
 inventor (2.1.5-9-3) unstable; urgency=low
 
   * Build GCC 3.2 package.
     - new patch debian/Patches/light-resources-offset.
-  
+
   * lib/database/src/so/engines/GNUmakefile: change 2093 => 12093 in y.tab.c.
     Workaround for bison bug (#176535,#177041,#177640).
     Closes: #178704.
@@ -273,7 +281,7 @@ inventor (2.1.5-9-2) unstable; urgency=low
  -- Steve M. Robbins <smr@debian.org>  Sat, 26 Oct 2002 20:38:03 -0400
 
 inventor (2.1.5-9-1) unstable; urgency=low
-  
+
   * New upstream release.
   * link-fonts.sh: Make script idempotent.  Closes: #138635.
 
@@ -283,18 +291,18 @@ inventor (2.1.5-8-4) unstable; urgency=low
 
   * debian/Patches/main-return-int: Change programs in apps so that main()
     returns int, to please GCC 3.
-  
+
  -- Steve M. Robbins <smr@debian.org>  Sat, 16 Feb 2002 10:24:52 -0500
 
 inventor (2.1.5-8-3) unstable; urgency=low
 
   * lib/database/src/sb/SbTime.c++: Do not define function trunc()
     which exists in standard library, at least for hppa.
-  
+
  -- Steve M. Robbins <smr@debian.org>  Sun, 27 Jan 2002 09:51:45 -0500
 
 inventor (2.1.5-8-2) unstable; urgency=low
-  
+
   * lib/database/include/machine.h: Use <endian.h> to determine
     machine word order.  Closes: #107470.
     - change architecture field to "any".
@@ -309,7 +317,7 @@ inventor (2.1.5-8-1) unstable; urgency=low
   * Build-depend on bison.  Closes: #123173.
   * Build-depend on libjpeg-dev.
   * Change build-depend "xlibmesa-dev|libgl-dev" to simply "xlibmesa-dev".
-  * -dev package conflicts with libcoin20-dev (headers) 
+  * -dev package conflicts with libcoin20-dev (headers)
     and libcoin20-doc (manpages).
   * Remove -lpthread, -lXext, and -ldl from lib/GNUmakefile.
   * Do not define DEBUG in lib/database/src/so/nodes/GNUmakefile.
@@ -330,7 +338,7 @@ inventor (2.1.5-7-1) unstable; urgency=low
 
   * Initial release.  Closes: #106101.
 
-  * apps/converters/ivdowngrade/SoLODV2.c++: 
+  * apps/converters/ivdowngrade/SoLODV2.c++:
   * lib/database/src/sb/SbTime.c++:
   * lib/database/src/so/actions/SoGLRenderAction.c++: Include more headers.
 
@@ -358,10 +366,10 @@ inventor (2.1.5-7-1) unstable; urgency=low
 
   * lib/GNUmakefile:
   * libSoXt/GNUmakefile: Add SONAME to shared library.
-  
-  * make/ivcommondefs: 
+
+  * make/ivcommondefs:
   * make/ivcommonrules:
-  * libFL/ang/GNUmakefile: Changes for shared libs, and setting 
+  * libFL/ang/GNUmakefile: Changes for shared libs, and setting
   directory names.
 
   * doc/man/ivman/Main.c++: Remove SoDB::init() call.
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 5499086..796a844 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Science Team <debian-science-maintainers@lists.alioth.debian.
 Uploaders: Steve M. Robbins <smr@debian.org>
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 12),
                libx11-dev,
                libxi-dev,
                libxt-dev,
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 11~),
                tcsh,
                bison
 Standards-Version: 4.1.3
-Vcs-Browser: https://salsa.debian.org/science-team/inventor.git
+Vcs-Browser: https://salsa.debian.org/science-team/inventor
 Vcs-Git: https://salsa.debian.org/science-team/inventor.git
 Homepage: http://oss.sgi.com/projects/inventor/
 
diff --git a/debian/rules b/debian/rules
index b5ea9b0..791b9a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 # This version is for a multibinary package. It also allows you to build any
 # of the binary packages independantly, via binary-<package> targets.
 
-# Uncomment this to turn on verbose mode. 
+# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
@@ -34,14 +34,14 @@ export VCXXOPTS=$(VCOPTS)
 
 # Set linking flags.
 # These options are controlled by the variable VLDOPTS;
-# see setting of "LDFLAGS" in make/commondefs for details. 
+# see setting of "LDFLAGS" in make/commondefs for details.
 export VLDOPTS=-Wl,--as-needed
 
 # Sadly, the program "ivman" used to generate manual pages
 # is broken on several architectures.  It looks to me like
 # there are assumptions being made about the form of mangled
 # identifiers, or maybe some bad assumptions being broken on 64-bit
-# architectures.  Whatever. 
+# architectures.  Whatever.
 #
 # The man pages are therefore only generated on certain architectures,
 # but since it is an architecture "all" package, we only have to
@@ -79,7 +79,7 @@ install: DH_OPTIONS=
 install: build
 	dh_testdir
 	dh_testroot
-	#dh_clean -k
+	#dh_prep
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp.

Run locally

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

debcheckout inventor
cd inventor
lintian-brush

More details

Full run details