Lintian Fixes - cmor
Ready changes
Summary
- Trim trailing whitespace. ( trailing-whitespace )
- Strip unusual field spacing from debian/control. ( debian-control-has-unusual-field-spacing )
- Set upstream metadata fields: Bug-Database, Bug-Submit, Name (from ./configure), Repository-Browse. ( upstream-metadata-file-is-missing , upstream-metadata-missing-bug-tracking )
Failed fixers:
- extended-description-contains-empty-paragraph
- ancient-python-version-field
- build-depends-on-build-essential
- build-depends-on-obsolete-package
- debhelper-but-no-misc-depends
- debian-control-has-empty-field
- debian-control-has-obsolete-dbg-package
- homepage-in-binary-package
- homepage-field-uses-insecure-uri
- libmodule-build-perl-needs-to-be-in-build-depends
- dm-upload-allowed
- maintainer-also-in-uploaders
- vcs-field-for-maintainer
- python-teams-merged
- missing-build-dependency-for-dh_-command
- missing-vcs-browser-field
- obsolete-url-in-packaging
- no-homepage-field
- orphaned-package-should-not-have-uploaders
- declares-possibly-conflicting-debhelper-compat-versions
- debhelper-compat-wrong-field
- package-uses-deprecated-debhelper-compat-version
- priority-extra-is-replaced-by-priority-optional
- transitional-package-should-be-oldlibs-optional
- unnecessary-team-upload
- unnecessary-testsuite-autopkgtest-field
- vcs-field-uses-insecure-uri
- vcs-field-uses-not-recommended-uri-format
- wrong-debian-qa-group-name
- xs-vcs-field-in-debian-control
- field-name-typo-in-dep5-copyright
- vcs-field-bitrotted
- vcs-field-mismatch
- vcs-field-not-canonical
- vcs-broken-uri
- unused-build-dependency-on-cdbs
- excessive-priority-for-library-package
- built-using-for-golang
- font-package-not-multi-arch-foreign
- no-priority-field
- no-section-field
- invalid-standards-version
- out-of-date-standards-version
- binary-control-field-duplicates-source
- pkg-perl-vcs
- pkg-perl-testsuite
- field-name-typo-in-control
- obsolete-vim-addon-manager
See the worker log for details.
Diff
diff --git a/debian/changelog b/debian/changelog
index fb372b1..b7e8c21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cmor (3.7.2-2) UNRELEASED; urgency=medium
+
+ * Trim trailing whitespace.
+ * Strip unusual field spacing from debian/control.
+ * Set upstream metadata fields: Bug-Database, Bug-Submit, Name (from
+ ./configure), Repository-Browse.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 20 Apr 2023 17:17:41 -0000
+
cmor (3.7.2-1) experimental; urgency=medium
* New upstream release
@@ -66,7 +75,7 @@ cmor (3.5.0-1) unstable; urgency=medium
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
@@ -210,7 +219,7 @@ cmor (2.9.3-2) experimental; urgency=medium
* 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
@@ -296,7 +305,7 @@ cmor (2.8.0-3) unstable; urgency=low
* 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
@@ -305,7 +314,7 @@ cmor (2.8.0-2) unstable; urgency=low
* 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
@@ -342,13 +351,13 @@ cmor (2.7.1-1) unstable; urgency=low
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
@@ -360,7 +369,7 @@ cmor (2.6-1) unstable; urgency=low
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
@@ -374,32 +383,32 @@ cmor (2.5.8-1) unstable; urgency=low
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
@@ -412,7 +421,7 @@ cmor (2.5.1-2) unstable; urgency=low
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
@@ -435,8 +444,8 @@ cmor (2.4.0-1) unstable; urgency=low
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.
@@ -444,7 +453,7 @@ cmor (2.3.0-2) unstable; urgency=low
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
@@ -463,7 +472,7 @@ cmor (2.2.0-2) unstable; urgency=low
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
diff --git a/debian/control b/debian/control
index 7672ba6..2aaa2b3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,27 +2,27 @@ Source: cmor
Section: utils
Priority: optional
Maintainer: Alastair McKinstry <mckinstry@debian.org>
-Build-Depends: debhelper-compat (= 13),
- dh-buildinfo,
+Build-Depends: debhelper-compat (= 13),
+ 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.6.2
-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
@@ -32,17 +32,16 @@ Architecture: any
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 +50,10 @@ Depends: libcmor2 ( = ${binary:Version}), ${misc:Depends},
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 +66,3 @@ Depends: ${python3:Depends}, ${misc:Depends}, ${shlibs:Depends}
Provides: ${python3:Provides}
Description: Python3 interface to CMOR
This is a Python3 interface to CMOR, the Climate Model Output Rewriter.
-
diff --git a/debian/rules b/debian/rules
index bdf4560..6866a53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
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 @@ ifeq ($(BUILD_ARCH_CPU),s390x)
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"
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..2859e62
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Name: cmor
+Bug-Database: https://github.com/PCMDI/cmor/issues
+Bug-Submit: https://github.com/PCMDI/cmor/issues/new
+Repository-Browse: https://github.com/PCMDI/cmor