diff -Nru aodh-13.0.0/debian/changelog aodh-13.0.0/debian/changelog --- aodh-13.0.0/debian/changelog 2021-10-06 15:13:18.000000000 +0000 +++ aodh-13.0.0/debian/changelog 2022-03-02 14:04:31.000000000 +0000 @@ -1,3 +1,10 @@ +aodh (1:13.0.0-0ubuntu2) impish; urgency=medium + + * d/gbp.conf: Create stable/xena branch. + * d/control, d/rules: Bump debhelper compat to 12 (LP: #1960636). + + -- Corey Bryant Wed, 02 Mar 2022 09:04:31 -0500 + aodh (1:13.0.0-0ubuntu1) impish; urgency=medium * New upstream release for OpenStack Xena. diff -Nru aodh-13.0.0/debian/compat aodh-13.0.0/debian/compat --- aodh-13.0.0/debian/compat 2021-10-06 15:13:18.000000000 +0000 +++ aodh-13.0.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru aodh-13.0.0/debian/control aodh-13.0.0/debian/control --- aodh-13.0.0/debian/control 2021-10-06 15:13:18.000000000 +0000 +++ aodh-13.0.0/debian/control 2022-03-02 14:04:31.000000000 +0000 @@ -7,7 +7,7 @@ Thomas Goirand , Build-Depends: apache2-dev, - debhelper (>= 10~), + debhelper-compat (= 12), dh-apache2, dh-python, openstack-pkg-tools (>= 85ubuntu3~), diff -Nru aodh-13.0.0/debian/gbp.conf aodh-13.0.0/debian/gbp.conf --- aodh-13.0.0/debian/gbp.conf 2021-10-06 15:13:18.000000000 +0000 +++ aodh-13.0.0/debian/gbp.conf 2022-03-02 14:04:31.000000000 +0000 @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = master +debian-branch = stable/xena upstream-tag = %(version)s pristine-tar = True diff -Nru aodh-13.0.0/debian/rules aodh-13.0.0/debian/rules --- aodh-13.0.0/debian/rules 2021-10-06 15:13:18.000000000 +0000 +++ aodh-13.0.0/debian/rules 2022-03-02 14:04:31.000000000 +0000 @@ -10,7 +10,7 @@ include /usr/share/openstack-pkg-tools/pkgos.make %: - dh $@ --with apache2,python3,systemd,sphinxdoc --buildsystem=pybuild + dh $@ --with apache2,python3,sphinxdoc --buildsystem=pybuild override_dh_clean: dh_clean @@ -24,7 +24,9 @@ PYTHONPATH=$(CURDIR) oslo-config-generator --config-file=$(CURDIR)/aodh/cmd/aodh-config-generator.conf \ --output-file=$(CURDIR)/debian/tmp/etc/aodh/aodh.conf crudini --merge $(CURDIR)/debian/tmp/etc/aodh/aodh.conf < $(CURDIR)/debian/aodh.conf.dist - dh_install --fail-missing -Xusr/etc/aodh/aodh-config-generator.conf -Xusr/bin/aodh-api \ + dh_install -Xusr/etc/aodh/aodh-config-generator.conf -Xusr/bin/aodh-api \ + -Xusr/etc/aodh/policy.json -Xusr/etc/aodh/api_paste.ini + dh_missing --fail-missing -Xusr/etc/aodh/aodh-config-generator.conf -Xusr/bin/aodh-api \ -Xusr/etc/aodh/policy.json -Xusr/etc/aodh/api_paste.ini override_dh_auto_clean: