diff --git a/debian/changelog b/debian/changelog
index 66e451a..6afa3e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ncl (6.6.2.dfsg.1-2) UNRELEASED; urgency=medium
+
+ * Trim trailing whitespace.
+ * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository-Browse.
+ * Fix broken Vcs URL.
+ * Update standards version to 4.6.2, no changes needed.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 08 Jun 2023 19:58:45 -0000
+
ncl (6.6.2.dfsg.1-1) unstable; urgency=medium
* DSFG-version, without ncarview/src/lib/libictrans/lex.yy_linux.c
@@ -71,7 +80,7 @@ ncl (6.6.2-3) unstable; urgency=medium
* Set d/gbp.conf to point to the new DEP-14 branch names
* Ensure fortran/$(FC) page is in libdir path in d/rules
* Fix bug in gfortran-10 conditional that FTBFS. Closes: #966872
- * patch gcc10.patch for invalid BOZ constants.
+ * patch gcc10.patch for invalid BOZ constants.
* Move to debhelper level 13
* Add -Wl,-z,muldefs , needed for stricter ld linking
* Add d/not-installed; install extra manpages due to dh_missing audit
@@ -83,10 +92,10 @@ ncl (6.6.2-2) unstable; urgency=medium
* Standards-Version: 4.5.0
* Use debhelper-compat (=12)
* Use external spherepack lib
- * Drop flang dependency for now
- * Enable -fallow-invalid-boz, -fallow-argument-mismatch
+ * Drop flang dependency for now
+ * Enable -fallow-invalid-boz, -fallow-argument-mismatch
with gfortran-10. Closes: #957583
- * Drop obsolete libxgks-dev in d/control
+ * Drop obsolete libxgks-dev in d/control
-- Alastair McKinstry <mckinstry@debian.org> Mon, 04 May 2020 14:49:03 +0100
@@ -176,7 +185,7 @@ ncl (6.4.0-4) unstable; urgency=medium
ncl (6.4.0-3) unstable; urgency=medium
* Set ncl-ncarg as Multi-Arch: foreign
- * Fix manpage errors (thanks Lint.)
+ * Fix manpage errors (thanks Lint.)
* Set ksh paths to /bin/ksh in scripts. (ksh.patch)
* Ensure all ksh scripts are executable
* Move all ksh scripts to libncarg-dev examples (not -data package)
@@ -274,10 +283,10 @@ ncl (6.3.0-4) unstable; urgency=medium
ncl (6.3.0-4~exp2) experimental; urgency=medium
- * Move /etc/bash_completions.d/* to new /usr/share/bash_completions
+ * Move /etc/bash_completions.d/* to new /usr/share/bash_completions
* Install DEBIAN link earlier before configuration.
* Remove '-ansi' to fix FTBFS on mips*.
-
+
-- Alastair McKinstry <mckinstry@debian.org> Mon, 24 Aug 2015 16:25:19 +0100
ncl (6.3.0-4~exp1) experimental; urgency=medium
@@ -295,7 +304,7 @@ ncl (6.3.0-3) experimental; urgency=medium
ncl (6.3.0-3~exp1) unstable; urgency=medium
- * Use canonical anonscm.debian.org URL scheme.
+ * Use canonical anonscm.debian.org URL scheme.
* Update VERSION to 6.3.0 in debian/rules
-- Alastair McKinstry <mckinstry@debian.org> Wed, 15 Jul 2015 10:05:22 +0100
@@ -304,7 +313,7 @@ ncl (6.3.0-2) unstable; urgency=medium
* Build-Depend on libgdal-dev not libgdal1-dev, for gdal-2.0.0 transition.
Closes: #789489
- * Add Vcs-Git: to debian/control; debian-science repo.
+ * Add Vcs-Git: to debian/control; debian-science repo.
-- Alastair McKinstry <mckinstry@debian.org> Sun, 21 Jun 2015 15:33:45 +0100
@@ -334,7 +343,7 @@ ncl (6.2.0-2.1) unstable; urgency=medium
ncl (6.2.0-2) unstable; urgency=medium
- * libproj-dev now needed explicitly.
+ * libproj-dev now needed explicitly.
-- Alastair McKinstry <mckinstry@debian.org> Mon, 28 Jul 2014 21:07:13 +0100
@@ -354,7 +363,7 @@ ncl (6.2.0-1) unstable; urgency=medium
ncl (6.1.2-7) unstable; urgency=medium
- * Add support for kFreeBSD, Hurd to support-archs.patch
+ * Add support for kFreeBSD, Hurd to support-archs.patch
* Add support for aarch64 to support-archs.patch. Closes: #742467.
-- Alastair McKinstry <mckinstry@debian.org> Mon, 03 Mar 2014 11:02:41 +0000
@@ -364,17 +373,17 @@ ncl (6.1.2-6) unstable; urgency=medium
* proj library not needed. Drop references in config/Project.
* Fix library references and refactor patches to fix FTBFS.
Closes: #733003.
- * Fix bash_completion.d ; wrong file installed.
+ * Fix bash_completion.d ; wrong file installed.
-- Alastair McKinstry <mckinstry@debian.org> Fri, 28 Feb 2014 15:56:27 +0000
ncl (6.1.2-5) unstable; urgency=medium
- * Don't redirect output to tty in ymake; breaks on FreeBSD, not
+ * Don't redirect output to tty in ymake; breaks on FreeBSD, not
guaranteed anywhere.
* Build executables with shared libraries, fPIC as otherwise fPIE doesn't
work on amd64.
- * Add flex, bison build-dependencies to generate wrapit.
+ * Add flex, bison build-dependencies to generate wrapit.
* Build by setting RootPath rather than $(DESTDIR)
-- Alastair McKinstry <mckinstry@debian.org> Sun, 12 Jan 2014 10:22:17 +0000
@@ -384,18 +393,18 @@ ncl (6.1.2-4) unstable; urgency=medium
* Enforce building libraries first, as build-order via makefile
not reliable.
* Add -I/usr/include/mpi when building when libhdf-mpi-dev rather than
- serial.
+ serial.
-- Alastair McKinstry <mckinstry@debian.org> Fri, 03 Jan 2014 11:40:02 +0000
ncl (6.1.2-3) unstable; urgency=medium
* Depend on gfortran, libxt-dev
- * Add dependency on fonts-lyx for cms*ttf fonts, rather than shipping them.
+ * Add dependency on fonts-lyx for cms*ttf fonts, rather than shipping them.
* tty_patch: don't use /dev/tty directly in ymake as it breaks on kFreeBSD.
* manpages_patch: Fix (some) lintian warnings on whatis entries, hyphens
More to do next year.
- * link_pie_prog.patch: Link Programs with -fPIE, immediate binding,
+ * link_pie_prog.patch: Link Programs with -fPIE, immediate binding,
for hardening.
* Add sonames, hardening to shared libraries.
* Now needs security.patch to fix false alarms after hardening enabled.
@@ -406,8 +415,8 @@ ncl (6.1.2-2) unstable; urgency=medium
* Add tcsh | csh | c-shell as Build-Dependency. Closes: #733033.
Also as dep for binary packages.
- * Label libncarg-data as Multi-Arch: foreign.
- * Move to Standards-Version: 3.9.5. No changes required.
+ * Label libncarg-data as Multi-Arch: foreign.
+ * Move to Standards-Version: 3.9.5. No changes required.
* libncarg-bin is now Multi-Arch: foreign
-- Alastair McKinstry <mckinstry@debian.org> Mon, 30 Dec 2013 16:29:09 +0000
diff --git a/debian/control b/debian/control
index a486faf..892093b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,45 +2,45 @@ Source: ncl
Section: science
Priority: optional
Maintainer: Alastair McKinstry <mckinstry@debian.org>
-Build-Depends: debhelper-compat (= 13),
- flex,
- bison,
- gfortran | fortran-compiler,
- zlib1g-dev,
- libbz2-dev,
+Build-Depends: debhelper-compat (= 13),
+ flex,
+ bison,
+ gfortran | fortran-compiler,
+ zlib1g-dev,
+ libbz2-dev,
libxt-dev,
libxaw7-dev, libxmu-headers, libcairo2-dev, libjpeg-dev, libpng-dev,
- pkg-config,
- fontconfig,
- libfontconfig1-dev,
- libfreetype6-dev,
+ pkg-config,
+ fontconfig,
+ libfontconfig1-dev,
+ libfreetype6-dev,
libexpat1-dev,
- libpixman-1-dev,
- libcurl4-gnutls-dev | libcurl-dev,
+ libpixman-1-dev,
+ libcurl4-gnutls-dev | libcurl-dev,
libgdal-dev,
- libnetcdf-dev,
- libnetcdff-dev,
- libudunits2-dev,
+ libnetcdf-dev,
+ libnetcdff-dev,
+ libudunits2-dev,
libmotif-dev,
libatlas3-base,
liblapack-dev | libopenblas-dev | libatlas-base-dev | liblapack.so,
libblas-dev | libopenblas-dev | libatlas-base-dev | libblas.so,
- libg2c-dev | libgrib2c-dev,
- libsphere-dev (>= 3.3~a1),
- libhdf4-alt-dev,
+ libg2c-dev | libgrib2c-dev,
+ libsphere-dev (>= 3.3~a1),
+ libhdf4-alt-dev,
libhdfeos-dev,
- libgctp-dev,
+ libgctp-dev,
libhe5-hdfeos-dev,
tcsh | csh | c-shell,
libhdf5-dev | libhdf5-mpi-dev,
- libproj-dev,
+ libproj-dev,
libaec-dev,
- libfl-dev,
+ libfl-dev,
libgsl-dev
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
Homepage: https://www.ncl.ucar.edu/
Vcs-Browser: https://salsa.debian.org:/science-team/ncl.git
-Vcs-Git: https://salsa.debian.org:/science-team/ncl.git -b debian/latest
+Vcs-Git: https://salsa.debian.org/science-team/ncl.git -b debian/latest
Package: ncl-ncarg
Architecture: any
@@ -72,18 +72,18 @@ Package: libncarg-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends}, libncarg0 (= ${binary:Version} ), libudunits2-dev,
- libsphere-dev, libhdf4-alt-dev,
+ libsphere-dev, libhdf4-alt-dev,
ncl-ncarg, ksh | mksh | pdksh | zsh
Multi-Arch: same
Description: Development files for the NCAR command language library
- ncarg is the NCAR command-language.
+ ncarg is the NCAR command-language.
Package: libncarg-bin
Architecture: any
Depends: ${misc:Depends}, libncarg-dev (= ${binary:Version} ), ${shlibs:Depends}, tcsh | csh | c-shell
Multi-Arch: foreign
Description: NCAR command-language library - development tools
- This package provides development tools for developing applications of the
+ This package provides development tools for developing applications of the
NCARG command library, such as wrappers for compilation of NCL executables.
Package: libncarg-data
diff --git a/debian/rules b/debian/rules
index 1532e24..12961fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/dpkg/pkg-info.mk
# The magic debhelper rule
%:
- dh $@
+ dh $@
DESTDIR:=$(CURDIR)/debian/tmp/
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -20,10 +20,10 @@ GF_FLAGS:=$(if $(filter $(shell readlink /usr/bin/gfortran), gfortran-9), , \
-fallow-invalid-boz -fallow-argument-mismatch )
# For the config file. Done this way to pull in stuff from hardening, etc.
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
# LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS:=
+LDFLAGS:=
FFLAGS=$(shell dpkg-buildflags --get FFLAGS) $(GF_FLAGS)
CC ?= cc
@@ -58,7 +58,7 @@ LIBS:= \
libNGcgm.so libNGctrans.so libNGgksPDF.so libNGgksX.so libNGlluC.so libNGmisc2.so libNGncl.so \
libNGcn.so libNGff.so libNGgksPS.so libNGhlu.so libNGllu.so libNGmisc.so libNGnfp.so \
libNGc.so libNGgksCTXT.so libNGgks.so libNGictrans.so libNGmath.so libNGmp.so libNGras.so \
- libfftpack5_dp.so libNGnfpfort.so
+ libfftpack5_dp.so libNGnfpfort.so
# Add extra libs to ensure all shared libs link
EXTRA_LIBS:= -lpng -lz -lX11 -lcairo -lsphere-$(F77)
@@ -93,7 +93,7 @@ override_dh_auto_configure:
< debian/Site.local.static.in > config/Site.local.static
sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%' \
< config/Project > config/Project.post
- mv config/Project.post config/Project
+ mv config/Project.post config/Project
override_dh_auto_build:
cp config/Site.local.shared config/Site.local
@@ -108,7 +108,7 @@ override_dh_auto_build:
$(MAKE) Makefiles includes depend
for d in common external ngmath/src/lib ncarg2d/src/libncarg_gks ncarg2d/src/libncarg ncarg2d/src/liboptional ncarview ni/src/lib ; do \
$(MAKE) -C $$d install INCSEARCH=${INCS} INC_SEARCH=${INCS} ; done
- LD_LIBRARY_PATH=$(DESTDIR)/lib:$(LIBDIR)/fortran/$(F77) $(MAKE) install INCSEARCH=${INCS} INC_SEARCH=${INCS}
+ LD_LIBRARY_PATH=$(DESTDIR)/lib:$(LIBDIR)/fortran/$(F77) $(MAKE) install INCSEARCH=${INCS} INC_SEARCH=${INCS}
# Install them safely in $(DESTDIR) as originals will be removed making shared libs
mkdir -p $(DESTDIR)/staticlibs
mv $(DESTDIR)/lib/*.a $(DESTDIR)/staticlibs
@@ -129,7 +129,7 @@ override_dh_auto_build:
override_dh_auto_install:
dh_auto_install
mkdir -p debian/libncarg-dev/$(LIBDIR)/ncarg
- # TODO: These may not be present on mips64el.
+ # TODO: These may not be present on mips64el.
mkdir -p debian/libncarg-data/usr/share/ncarg/nug
[ -d $(DESTDIR)/lib/ncarg/fontcaps ] && cp -a $(DESTDIR)/lib/ncarg/fontcaps debian/libncarg-data/usr/share/ncarg || true
[ -d $(DESTDIR)/lib/ncarg/nclex/nug ] && cp -a $(DESTDIR)/lib/ncarg/nclex/nug debian/libncarg-data/usr/share/ncarg/nug || true
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index f5031e9..5d1e4e3 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,3 +1,5 @@
+Bug-Database: https://github.com/NCAR/ncl/issues
+Bug-Submit: https://github.com/NCAR/ncl/issues/new
Cite-As: >
NCL has a Digital Object Identifier (DOI), which is a persistent identifier for web-based resources. The NCL DOI, when used in URL form, http://dx.doi.org/10.5065/D6WD3XH5, provides a persistent link to the NCL web page. The benefit of DOIs is that they are widely accepted by academic publishers as citable locators for scholarly objects.
.
@@ -7,3 +9,4 @@ Cite-As: >
.
The NCAR Command Language (Version 6.3.0) [Software]. (2015).
Boulder, Colorado: UCAR/NCAR/CISL/TDD. http://dx.doi.org/10.5065/D6WD3XH5
+Repository-Browse: https://github.com/NCAR/ncl
