Ubuntu
python-keystonemiddleware package

Merge ~chris.macnaughton/ubuntu/+source/python-keystonemiddleware:master into ~ubuntu-server-dev/ubuntu/+source/python-keystonemiddleware:master

  1. Git
  2. lp:~chris.macnaughton/ubuntu/+source/python-keystonemiddleware
  3. master
  4. Merge into master
Proposed by Chris MacNaughton
Status: Merged
Approved by: Corey Bryant
Approved revision: 7ad093988bb94f61927f7792eaf8a12584899b11
Merge reported by: Corey Bryant
Merged at revision: 7ad093988bb94f61927f7792eaf8a12584899b11
Proposed branch: ~chris.macnaughton/ubuntu/+source/python-keystonemiddleware:master
Merge into: ~ubuntu-server-dev/ubuntu/+source/python-keystonemiddleware:master
Diff against target: 30 lines (+9/-1)
2 files modified
debian/changelog (+6/-0)
debian/rules (+3/-1)
Reviewer Review Type Date Requested Status
Corey Bryant Approve
James Page Pending
Review via email: mp+388734@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Corey Bryant (corey.bryant) wrote :

Thanks. Merged and uploaded. I switched the other occurrences of python_distutils to pybuild as well in debian/rules.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 19c6fc5..83f7c56 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+python-keystonemiddleware (9.0.0-0ubuntu2) UNRELEASED; urgency=medium
7+
8+ * d/rules: Move to pybuild.
9+
10+ -- Chris MacNaughton <chris.macnaughton@canonical.com> Wed, 05 Aug 2020 11:42:15 +0000
11+
12 python-keystonemiddleware (9.0.0-0ubuntu1) focal; urgency=medium
13
14 * New upstream release for OpenStack Ussuri.
15diff --git a/debian/rules b/debian/rules
16index e60cbb6..cfde009 100755
17--- a/debian/rules
18+++ b/debian/rules
19@@ -3,8 +3,10 @@
20 UPSTREAM_GIT := https://github.com/openstack/keystonemiddleware.git
21 include /usr/share/openstack-pkg-tools/pkgos.make
22
23+export PYBUILD_NAME=keystonemiddleware
24+
25 %:
26- dh $@ --buildsystem=python_distutils --with python3,sphinxdoc
27+ dh $@ --buildsystem=pybuild --with python3,sphinxdoc
28
29 override_dh_auto_install:
30 pkgos-dh_auto_install --no-py2

Subscribers

People subscribed via source and target branches