diff --git a/debian/changelog b/debian/changelog
index b6fb08a..6118b0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ecmwflibs (2:0.4.16-2) UNRELEASED; urgency=medium
+
+ * Trim trailing whitespace.
+ * Strip unusual field spacing from debian/control.
+ * Use versioned copyright format URI.
+ * Set upstream metadata fields: Bug-Database, Bug-Submit, Name, Repository,
+ Repository-Browse.
+ * Add debian/watch file, using github.
+ * Fix broken Vcs URL.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 01 Sep 2022 16:17:32 -0000
+
ecmwflibs (2:0.4.16-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/control b/debian/control
index 8893953..5e6f983 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: ecmwflibs
Section: python
Priority: optional
Maintainer: Alastair McKinstry <mckinstry@debian.org>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: debhelper-compat (= 13),
dh-sequence-python3,
- python3-all-dev,
+ python3-all-dev,
python3-setuptools,
libeccodes-dev,
python3-findlibs,
@@ -13,14 +13,14 @@ Build-Depends: debhelper-compat (= 13),
Standards-Version: 4.6.1
Homepage: https://github.com/ecmwf/ecmwflibs/
Vcs-Browser: https://salsa.debian.org:/science-team/ecmwflib
-Vcs-Git: https://salsa.debian.org:/science-team/ecmwflibs.git -b debian/latest
+Vcs-Git: https://salsa.debian.org/science-team/ecmwflibs.git -b debian/latest
Package: python3-ecmwflibs
Architecture: any
Depends: python3, ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}, python3-findlibs
Provides: ${python3:Provides}
-Description: Python 3 module to discover ECMWF libraries.
+Description: Python 3 module to discover ECMWF libraries.
This module is used by ECMWF python libraries to discover some dependencies.
.
ECMWF is the European Centre for Medium-Range Weather Forecasts.
diff --git a/debian/copyright b/debian/copyright
index 3f79da5..cc3c967 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ecmwflibs
Upstream-Source: https://github.com/ecmwf/ecmwflibs
diff --git a/debian/rules b/debian/rules
index 57a36e5..3cc11bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export PYBUILD_NAME=ecmwflibs
# magic debhelper rule
%:
- dh $@ --buildsystem=pybuild
+ dh $@ --buildsystem=pybuild
override_dh_auto_clean:
rm -rf *.egg-info .eggs .pybuild
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..b77a26a
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,6 @@
+---
+Name: ecmwflibs
+Bug-Database: https://github.com/ecmwf/ecmwflibs/issues
+Bug-Submit: https://github.com/ecmwf/ecmwflibs/issues/new
+Repository: https://github.com/ecmwf/ecmwflibs.git
+Repository-Browse: https://github.com/ecmwf/ecmwflibs
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..3bf801f
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=4
+opts=filenamemangle=s/.*\/(\d\S+)\.tar\.gz/ecmwflibs-$1\.tar\.gz/ https://github.com/ecmwf/ecmwflibs/tags .*\/(\d\S+)\.tar\.gz
