Lintian Fixes - cmor

Ready changes

Merge these changes:

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

Summary

Diff

=== modified file 'debian/changelog'
--- a/debian/changelog	2020-05-21 15:13:48 +0000
+++ b/debian/changelog	2020-06-11 19:34:45 +0000
@@ -1,3 +1,13 @@
+cmor (3.6.0-2) UNRELEASED; urgency=low
+
+  * Trim trailing whitespace.
+  * Strip unusual field spacing from debian/control.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Name (from
+    ./configure), Repository, Repository-Browse.
+  * Fix broken Vcs URL.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Thu, 11 Jun 2020 19:32:28 -0000
+
 cmor (3.6.0-1) unstable; urgency=medium
 
   * New upstream release
@@ -34,7 +44,7 @@
 cmor (3.4.0-3) unstable; urgency=medium
 
   * Drop python2 (python-cmor) for Bullseye
-  * B-D on gfortran | fortran-compiler 
+  * B-D on gfortran | fortran-compiler
   * Use  f95 as alias for Fortran compiler
 
  -- Alastair McKinstry <mckinstry@debian.org>  Sun, 14 Jul 2019 13:15:41 +0100
@@ -178,7 +188,7 @@
 
   * Add experimental python3 support
   * Add libsz support via libaec-dev
-  * Add Heimdall-gssapi support	
+  * Add Heimdall-gssapi support
 
  -- Alastair McKinstry <mckinstry@debian.org>  Mon, 08 Aug 2016 16:45:37 +0100
 
@@ -264,7 +274,7 @@
   * Drop reference to upstream git repo for now. Closes: #661325
   * Fix broken symlink libcmor.so. Closes: #681891
   * Don't run test suite on kfreebsd-i386 as the buildds typically don't
-    have DFLSIZ set high enough. Closes: #598745. 
+    have DFLSIZ set high enough. Closes: #598745.
   * Standards-Version: 3.9.3
 
  -- Alastair McKinstry <mckinstry@debian.org>  Sun, 09 Sep 2012 13:56:03 +0100
@@ -273,7 +283,7 @@
 
   * Add lintian override for DH 9 without versioned depends.
   * Remove libcmor2.install that adds incorrect double copy of library.
-    Closes: #650387. 
+    Closes: #650387.
 
  -- Alastair McKinstry <mckinstry@debian.org>  Sat, 04 Feb 2012 16:33:01 +0000
 
@@ -310,13 +320,13 @@
 
 cmor (2.7.0-1) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
 
  -- Alastair McKinstry <mckinstry@debian.org>  Tue, 21 Jun 2011 17:00:17 +0100
 
 cmor (2.6.1-1) unstable; urgency=low
 
-  * New upstream release 
+  * New upstream release
 
  -- Alastair McKinstry <mckinstry@debian.org>  Tue, 14 Jun 2011 10:39:10 +0100
 
@@ -328,7 +338,7 @@
 
 cmor (2.5.9-1) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
   * Recommend latest cmip5 tables. (1.3.9).
   * Standards-Version : 3.9.2
 
@@ -342,32 +352,32 @@
 
 cmor (2.5.7-1) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
 
  -- Alastair McKinstry <mckinstry@debian.org>  Fri, 25 Feb 2011 23:24:49 +0000
 
 cmor (2.5.5-1) unstable; urgency=low
 
-  * New upstream release, fixing MPI issue. 
+  * New upstream release, fixing MPI issue.
 
  -- Alastair McKinstry <mckinstry@debian.org>  Thu, 17 Feb 2011 09:33:18 +0000
 
 cmor (2.5.4-1) unstable; urgency=low
 
-  * New upstream release, fixing memory issue in python module. 
+  * New upstream release, fixing memory issue in python module.
 
  -- Alastair McKinstry <mckinstry@debian.org>  Thu, 03 Feb 2011 15:42:41 +0000
 
 cmor (2.5.3-1) unstable; urgency=low
 
   * New upstream release.
-  * Add Recommends: cmip5-cmor-tables to libcmor2 
+  * Add Recommends: cmip5-cmor-tables to libcmor2
 
  -- Alastair McKinstry <mckinstry@debian.org>  Tue, 01 Feb 2011 09:51:35 +0000
 
 cmor (2.5.2-1) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
 
  -- Alastair McKinstry <mckinstry@debian.org>  Fri, 24 Dec 2010 15:17:40 +0000
 
@@ -380,7 +390,7 @@
 
 cmor (2.5.1-1) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
   * Added debug-test.patch to help debug FTFBS on s390, kfreebsd-*
 
  -- Alastair McKinstry <mckinstry@debian.org>  Sun, 05 Dec 2010 15:16:25 +0000
@@ -403,8 +413,8 @@
 
 cmor (2.3.0-2) unstable; urgency=low
 
-  * --enable-netcdf-4 not a valid option; remove. Just use autodetection. 
-  * libcmor.so.2 should be linked against -lossp-uuid; 
+  * --enable-netcdf-4 not a valid option; remove. Just use autodetection.
+  * libcmor.so.2 should be linked against -lossp-uuid;
   * Add -I${includedir}/cdTime to CFlags in cmor.pc
   * Add FFlags variable to cmor.pc for Fortran.
 
@@ -412,7 +422,7 @@
 
 cmor (2.3.0-1) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
 
  -- Alastair McKinstry <mckinstry@debian.org>  Fri, 08 Oct 2010 06:28:20 +0100
 
@@ -431,7 +441,7 @@
 
 cmor (2.2.0-1) unstable; urgency=low
 
-  * Upstream release 2.2.0. 
+  * Upstream release 2.2.0.
 
  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 25 Aug 2010 19:16:37 +0100
 

=== modified file 'debian/control'
--- a/debian/control	2020-03-06 16:00:39 +0000
+++ b/debian/control	2020-06-11 19:34:45 +0000
@@ -2,29 +2,29 @@
 Section: utils
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry@debian.org>
-Build-Depends: debhelper-compat (= 12), 
- dh-buildinfo, 
+Build-Depends: debhelper-compat (= 12),
+ dh-buildinfo,
  dh-sequence-python3,
  dh-sequence-fortran-mod,
  heimdal-multidev,
  libossp-uuid-dev,
  libjson-c-dev (>= 0.13.1) ,
- libudunits2-dev, 
- libnetcdf-dev, 
+ libudunits2-dev,
+ libnetcdf-dev,
  uuid-dev,
  python3-all-dev (>= 2.6.6-3~), python3-setuptools (>= 0.6b3), python3-numpy,
- gfortran | fortran-compiler, 
+ gfortran | fortran-compiler,
  pkg-config,
  libhdf5-dev,
- libaec-dev, 
+ libaec-dev,
  libffi-dev,
  krb5-multidev | heimdal-multidev
-Build-Conflicts: libcmor2, 
+Build-Conflicts: libcmor2,
  python3-cmor
 Standards-Version: 4.5.0
-Homepage:  https://pcmdi.github.io/cmor-site/
+Homepage: https://pcmdi.github.io/cmor-site/
 Vcs-Browser: https://salsa.debian.org:/science-team/cmor.git
-Vcs-Git: https://salsa.debian.org:/science-team/cmor.git
+Vcs-Git: https://salsa.debian.org/science-team/cmor.git
 
 Package: libcmor2
 Section: libs
@@ -32,17 +32,17 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: cmor-tables 
+Recommends: cmor-tables
 Description: Climate Model Output Rewriter library
- The "Climate Model Output Rewriter" (CMOR, pronounced "Seymour") 
- comprises a set of C-based functions, with bindings to both Python 
- and FORTRAN 90, that can be used to produce CF-compliant netCDF files 
- that fulfill the requirements of many of the climate community's 
- standard model experiments. These experiments are collectively 
- referred to as MIP's and include, for example, AMIP, CMIP, CFMIP, 
- PMIP, APE, and IPCC scenario runs. The output resulting from CMOR 
+ The "Climate Model Output Rewriter" (CMOR, pronounced "Seymour")
+ comprises a set of C-based functions, with bindings to both Python
+ and FORTRAN 90, that can be used to produce CF-compliant netCDF files
+ that fulfill the requirements of many of the climate community's
+ standard model experiments. These experiments are collectively
+ referred to as MIP's and include, for example, AMIP, CMIP, CFMIP,
+ PMIP, APE, and IPCC scenario runs. The output resulting from CMOR
  is "self-describing" and facilitates analysis of results across models.
- 
+
 Package: libcmor-dev
 Section: libdevel
 Architecture: any
@@ -51,10 +51,10 @@
  libjson-c-dev, ${python3:Depends}, python3
 Recommends: pkg-config
 Description: Development files for Climate Model Output Rewriter
- The "Climate Model Output Rewriter" (CMOR, pronounced "Seymour") 
- comprises a set of C-based functions, with bindings to both Python 
+ The "Climate Model Output Rewriter" (CMOR, pronounced "Seymour")
+ comprises a set of C-based functions, with bindings to both Python
  and FORTRAN 90, that can be used to produce CF-compliant netCDF files.
- that fulfill the requirements of many of the climate community's 
+ that fulfill the requirements of many of the climate community's
  standard model experiments.
  .
  This package contains files needed to build and link against the CMOR library.
@@ -67,4 +67,3 @@
 Provides: ${python3:Provides}
 Description: Python3 interface to CMOR
  This is a Python3 interface to CMOR, the Climate Model Output Rewriter.
-

=== modified file 'debian/rules'
--- a/debian/rules	2020-03-06 16:00:39 +0000
+++ b/debian/rules	2020-06-11 19:32:44 +0000
@@ -7,7 +7,7 @@
 LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 #DEB_BUILD_MAINT_OPTIONS:= hardening=+all
-DEB_CFLAGS_MAINT_APPEND:= -Wall 
+DEB_CFLAGS_MAINT_APPEND:= -Wall
 export DEB_BUILD_MAINT_OPTIONS
 #export DEB_CFLAGS_MAINT_APPEND
 
@@ -31,10 +31,10 @@
 endif
 
 %:
-	dh $@ 
+	dh $@
 
 override_dh_auto_configure:
-	ln -sf  /usr/share/misc/config.sub 
+	ln -sf  /usr/share/misc/config.sub
 	dh_auto_configure -- --disable-color --enable-verbose-test  --with-uuid --without-python \
 		UUIDLDFLAGS="-lossp-uuid" UUIDFLAGS="-I/usr/include/ossp" \
 		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" SZLIBFLAGS=" -lsz"

=== added directory 'debian/upstream'
=== added file 'debian/upstream/metadata'
--- a/debian/upstream/metadata	1970-01-01 00:00:00 +0000
+++ b/debian/upstream/metadata	2020-06-11 19:34:06 +0000
@@ -0,0 +1,6 @@
+---
+Name: cmor
+Bug-Database: https://github.com/PCMDI/cmor/issues
+Bug-Submit: https://github.com/PCMDI/cmor/issues/new
+Repository: https://github.com/PCMDI/cmor.git
+Repository-Browse: https://github.com/PCMDI/cmor

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/2e/b7ea11c10f8a3bab5e8d7e1f17c99cf303615d.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/3a/7c7d2cd0ac527ae44cfa23c85eee3e123eca13.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/e4/425dd4346b10651d1909d2e20dd8db32706b4f.debug

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/0f/c68f50635abf349fb821c86f6e891a9467e8be.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/12/1b530bc3f0a5b58bbd10707e4f8b3fd58e2e3c.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/d2/60de87ba13c2b1874cf2dc4cbb16b32810465f.debug

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

No differences were encountered between the control files of package libcmor2

Control files of package libcmor2-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 0fc68f50635abf349fb821c86f6e891a9467e8be 2eb7ea11c10f8a3bab5e8d7e1f17c99cf303615d

No differences were encountered between the control files of package python3-cmor

Control files of package python3-cmor-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 121b530bc3f0a5b58bbd10707e4f8b3fd58e2e3c d260de87ba13c2b1874cf2dc4cbb16b32810465f 3a7c7d2cd0ac527ae44cfa23c85eee3e123eca13 e4425dd4346b10651d1909d2e20dd8db32706b4f

Run locally

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

debcheckout cmor
cd cmor
lintian-brush

More details

Full run details