diff --git a/debian/changelog b/debian/changelog
index 4167e4b..23f592a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pyferret (7.6.5-2) UNRELEASED; urgency=medium
+
+ * Trim trailing whitespace.
+ * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+ Repository-Browse.
+ * Fix broken Vcs URL.
+
+ -- Debian Janitor <janitor@jelmer.uk> Tue, 26 Apr 2022 12:32:04 -0000
+
pyferret (7.6.5-1) unstable; urgency=medium
* New upstream release
@@ -49,7 +58,7 @@ pyferret (7.6.3-2) unstable; urgency=medium
- make_dsg_ftrset_mask.F
- reload_dsg_ftrmaskvar.F
- dsg_pltalong_setup.F
- - make_dsg_feature_mask_dirs.F
+ - make_dsg_feature_mask_dirs.F
-- Alastair McKinstry <mckinstry@debian.org> Sat, 17 Oct 2020 08:52:39 +0100
@@ -139,7 +148,7 @@ pyferret (7.4-1) unstable; urgency=medium
* New upstream release
* Drop Java dependencies; threddsBrowser code no longer shipped
* Standards-Version: 4.1.4
- * Set NETCDF_LIB in site_specific.mk.in
+ * Set NETCDF_LIB in site_specific.mk.in
-- Alastair McKinstry <mckinstry@debian.org> Tue, 24 Apr 2018 15:32:40 +0100
@@ -174,7 +183,7 @@ pyferret (7.1.1.beta-1) unstable; urgency=medium
* New upstream release.
- remove obsolete py3 patches
- patch to fixup setup.py for py3 libname
- * Ignore tests for this build
+ * Ignore tests for this build
* Standards-Version: 4.0.0. No changes required
* Enable builds with python3.5, py3.6 simultaneously. Closes: #863004
@@ -196,7 +205,7 @@ pyferret (7.0.0-2) unstable; urgency=medium
pyferret (7.0.0-1) experimental; urgency=medium
* New upstream release
- * Experimental python3 build
+ * Experimental python3 build
* Include pyferret executable in python*-ferret, with alternatives
-- Alastair McKinstry <mckinstry@debian.org> Sun, 14 Aug 2016 10:13:52 +0100
@@ -219,7 +228,7 @@ pyferret (1.2.0-1) unstable; urgency=medium
pyferret (1.1.0-1) unstable; urgency=medium
* Initial release. (Closes: #732290)
- * Resubmitted with corrections to debian/copyright as recommended by
+ * Resubmitted with corrections to debian/copyright as recommended by
Paul Tagliamonte
-- Alastair McKinstry <mckinstry@debian.org> Tue, 01 Mar 2016 10:00:37 +0000
diff --git a/debian/control b/debian/control
index 0504c10..c5f94ad 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pyferret
Standards-Version: 4.6.0
Homepage: https://ferret.pmel.noaa.gov/Ferret/documentation/pyferret
Vcs-Browser: https://salsa.debian.org:/science-team/pyferret
-Vcs-Git: https://salsa.debian.org:/science-team/pyferret.git -b debian/latest
+Vcs-Git: https://salsa.debian.org/science-team/pyferret.git -b debian/latest
Maintainer: Alastair McKinstry <mckinstry@debian.org>
Section: science
Priority: optional
@@ -12,14 +12,14 @@ Build-Depends: debhelper-compat (= 13),
gfortran | fortran-compiler,
pkg-config,
csh,
- libreadline-dev | libeditreadline-dev,
- libcurl4-openssl-dev | libcurl-dev,
- libncurses-dev,
+ libreadline-dev | libeditreadline-dev,
+ libcurl4-openssl-dev | libcurl-dev,
+ libncurses-dev,
libnetcdf-dev (>= 4.3.0),
libnetcdff-dev,
- libxpm-dev,
- libxt-dev,
- libcairo2-dev,
+ libxpm-dev,
+ libxt-dev,
+ libcairo2-dev,
libpango1.0-dev,
python3-all-dev,
python3-numpy,
@@ -38,4 +38,3 @@ Description: Python3 wrapper for the Ferret visualization and analysis environme
remote Internet data bases using OPeNDAP (formerly known as DODS)
.
This is the Python3 wrapper for Ferret
-
diff --git a/debian/rules b/debian/rules
index 177527a..bbda0d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ export DH_VERBOSE=1
# magic debhelper rule
%:
- dh $@
+ dh $@
# To aid reproducible builds
LC_ALL=C
@@ -47,9 +47,9 @@ override_dh_auto_build:
cp site_specific.mk external_functions/ef_utility
override_dh_auto_install:
- # Build and install
+ # Build and install
# Horrible hack breaks The Debian Way. I'm doing the build in the 'install' phase, as i'm installing into debian/tmp
- # Doing it any earlier, and dh_prep will remove debian/tmp.
+ # Doing it any earlier, and dh_prep will remove debian/tmp.
# This means I'm also doing 'test' after the Install, not between during make & install. gack.
for p in $(PY3) ; do \
mkdir -p $(INSTALLDIR)/lib/$$p ; \
@@ -84,7 +84,6 @@ override_dh_auto_clean:
# use system xpm.h, not supplied ones
rm -f fer/gui/xpm*.h
rm -rf ./build ./install
- find . -type l -delete
+ find . -type l -delete
find . -name '*.o' -o -name '*.so' -delete
- [ ! -f platform_specific_flags.mk.debian ] || $(MAKE) clean HOSTTYPE=debian
-
+ [ ! -f platform_specific_flags.mk.debian ] || $(MAKE) clean HOSTTYPE=debian
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..f7bb8f8
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/NOAA-PMEL/PyFerret/issues
+Bug-Submit: https://github.com/NOAA-PMEL/PyFerret/issues/new
+Repository: https://github.com/NOAA-PMEL/PyFerret.git
+Repository-Browse: https://github.com/NOAA-PMEL/PyFerret
