diff --git a/debian/changelog b/debian/changelog
index ba0a5c263..67f3b64a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+cinder (2:22.0.0-6) UNRELEASED; urgency=medium
+
+ * Update lintian override info to new format:
+ + debian/cinder-common.lintian-overrides: line 1-9
+ + debian/cinder-api.lintian-overrides: line 1-7
+ * Bump debhelper from old 11 to 13.
+ + Rename debian/cinder-common.tmpfile to debian/cinder-common.tmpfiles.
+ + Replace python_distutils buildsystem with pybuild.
+ + debian/rules: Drop --fail-missing argument to dh_missing, which is now the
+ default.
+ * Set upstream metadata fields: Repository-Browse.
+ * Update standards version to 4.6.2, no changes needed.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 11 Aug 2023 14:37:51 -0000
+
cinder (2:22.0.0-5) unstable; urgency=medium
* Define export MALLOC_ARENA_MAX=1, export MALLOC_MMAP_THRESHOLD_=131072
diff --git a/debian/cinder-api.lintian-overrides b/debian/cinder-api.lintian-overrides
index a9a2a018d..28cf103dc 100644
--- a/debian/cinder-api.lintian-overrides
+++ b/debian/cinder-api.lintian-overrides
@@ -1,7 +1,7 @@
-cinder-api: unused-debconf-template cinder/register-endpoint
-cinder-api: unused-debconf-template cinder/keystone-ip
-cinder-api: unused-debconf-template cinder/keystone-admin-name
-cinder-api: unused-debconf-template cinder/keystone-project-name
-cinder-api: unused-debconf-template cinder/keystone-admin-password
-cinder-api: unused-debconf-template cinder/endpoint-ip
-cinder-api: unused-debconf-template cinder/region-name
+cinder-api: unused-debconf-template cinder/register-endpoint [*:*]
+cinder-api: unused-debconf-template cinder/keystone-ip [*:*]
+cinder-api: unused-debconf-template cinder/keystone-admin-name [*:*]
+cinder-api: unused-debconf-template cinder/keystone-project-name [*:*]
+cinder-api: unused-debconf-template cinder/keystone-admin-password [*:*]
+cinder-api: unused-debconf-template cinder/endpoint-ip [*:*]
+cinder-api: unused-debconf-template cinder/region-name [*:*]
diff --git a/debian/cinder-common.lintian-overrides b/debian/cinder-common.lintian-overrides
index 1731b553e..d131275e7 100644
--- a/debian/cinder-common.lintian-overrides
+++ b/debian/cinder-common.lintian-overrides
@@ -1,9 +1,9 @@
-cinder-common: unused-debconf-template cinder/start_services
-cinder-common: unused-debconf-template cinder/start_services
-cinder-common: unused-debconf-template cinder/auth-host
-cinder-common: unused-debconf-template cinder/admin-tenant-name
-cinder-common: unused-debconf-template cinder/admin-user
-cinder-common: unused-debconf-template cinder/admin-password
-cinder-common: unused-debconf-template cinder/rabbit_host
-cinder-common: unused-debconf-template cinder/rabbit_userid
-cinder-common: unused-debconf-template cinder/rabbit_password
+cinder-common: unused-debconf-template cinder/start_services [*:*]
+cinder-common: unused-debconf-template cinder/start_services [*:*]
+cinder-common: unused-debconf-template cinder/auth-host [*:*]
+cinder-common: unused-debconf-template cinder/admin-tenant-name [*:*]
+cinder-common: unused-debconf-template cinder/admin-user [*:*]
+cinder-common: unused-debconf-template cinder/admin-password [*:*]
+cinder-common: unused-debconf-template cinder/rabbit_host [*:*]
+cinder-common: unused-debconf-template cinder/rabbit_userid [*:*]
+cinder-common: unused-debconf-template cinder/rabbit_password [*:*]
diff --git a/debian/cinder-common.tmpfile b/debian/cinder-common.tmpfiles
similarity index 100%
rename from debian/cinder-common.tmpfile
rename to debian/cinder-common.tmpfiles
diff --git a/debian/control b/debian/control
index c3f271449..487c491c5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Thomas Goirand <zigo@debian.org>,
Michal Arbet <michal.arbet@ultimum.io>,
Build-Depends:
- debhelper-compat (= 11),
+ debhelper-compat (= 13),
dh-python,
openstack-pkg-tools (>= 123~),
po-debconf,
@@ -99,7 +99,7 @@ Build-Depends-Indep:
python3-webob,
python3-zstd,
subunit,
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/openstack-team/services/cinder
Vcs-Git: https://salsa.debian.org/openstack-team/services/cinder.git
Homepage: https://github.com/openstack/cinder
diff --git a/debian/rules b/debian/rules
index ff5ad9ea9..f74c37ac2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ UPSTREAM_GIT ?= https://opendev.org/openstack/cinder.git
include /usr/share/openstack-pkg-tools/pkgos.make
%:
- dh $@ --buildsystem=python_distutils --with python3,sphinxdoc
+ dh $@ --buildsystem=pybuild --with python3,sphinxdoc
override_dh_clean:
dh_clean
@@ -89,7 +89,7 @@ endif
pkgos-fix-config-default $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf oslo_policy policy_dirs /etc/cinder/policy.d
dh_install
- dh_missing --fail-missing -Xbin/cinder-all
+ dh_missing -Xbin/cinder-all
install -D -m 0440 debian/cinder-common.sudoers $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common
pkgos-fix-config-default $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf DEFAULT auth_strategy keystone
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 000000000..08f53b7c1
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,2 @@
+---
+Repository-Browse: https://github.com/openstack/cinder
