[Python-modules-commits] [gerritlib] 01/01: Use pkg-info.mk in d/rules and changelog fixes

[Filip Pytloun]

This is an automated email from the git hooks/post-receive script.

fpytloun-guest pushed a commit to branch master
in repository gerritlib.

commit e71fa5f9c0f92be524c38c7befc3895b38fabbaf
Author: Filip Pytloun <filip at pytloun.cz>
Date:   Tue Dec 19 11:48:03 2017 +0100

    Use pkg-info.mk in d/rules and changelog fixes
---
 debian/changelog | 12 +++++++-----
 debian/control   | 53 ++++++++++++++++++++++++++++++-----------------------
 debian/rules     |  3 ++-
 3 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56fa6f3..4dec62c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
 gerritlib (0.8.0-1) unstable; urgency=medium
 
   * Adopting orphaned package under DPMT (Closes: #881380)
-  * d/copyright: update copyright holders for debian/*
+  * d/copyright: add myself for Debian part
   * d/compat: update to version 10
-  * d/control: Remove Mathieu Parent from uploaders
-  * d/control: update standards version to 4.1.2
-  * d/control: Update Build-Depends to match new release
-  * d/control: add autopkgtest
+  * d/control:
+    - Remove Mathieu Parent from uploaders
+    - update standards version to 4.1.2 (no changes)
+    - Update Build-Depends to match new release
+    - Enable autopkgtest-pkg-python testsuite
+  * d/rules: use pkg-info.mk to determine PBR_VERSION
   * New upstream release
   * Fix python3 compatibility by converting bytes objects to string
     Upstream review: https://review.openstack.org/#/c/527704/
diff --git a/debian/control b/debian/control
index a5b205c..e682593 100644
--- a/debian/control
+++ b/debian/control
@@ -2,27 +2,30 @@ Source: gerritlib
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Filip Pytloun <filip at pytloun.cz>
-Build-Depends: debhelper (>=10),
-               dh-python,
-               python-all,
-               python-pbr (>= 0.8.2),
-               python-setuptools,
-               python3-all,
-               python3-pbr (>= 0.8.2),
-               python3-setuptools
-Build-Depends-Indep: python-hacking,
-                     python-paramiko (>=1.8.0),
-                     python-six (>=1.7.0),
-                     python-subunit,
-                     python-testrepository,
-                     python-testtools,
-                     python3-hacking,
-                     python3-paramiko (>=1.8.0),
-                     python3-six (>=1.7.0),
-                     python3-subunit,
-                     python3-testrepository,
-                     python3-testtools
+Uploaders:
+ Filip Pytloun <filip at pytloun.cz>,
+Build-Depends:
+ debhelper (>=10),
+ dh-python,
+ python-all,
+ python-pbr (>= 0.8.2),
+ python-setuptools,
+ python3-all,
+ python3-pbr (>= 0.8.2),
+ python3-setuptools,
+Build-Depends-Indep:
+ python-hacking,
+ python-paramiko (>=1.8.0),
+ python-six (>=1.7.0),
+ python-subunit,
+ python-testrepository,
+ python-testtools,
+ python3-hacking,
+ python3-paramiko (>=1.8.0),
+ python3-six (>=1.7.0),
+ python3-subunit,
+ python3-testrepository,
+ python3-testtools,
 Standards-Version: 4.1.2
 Testsuite: autopkgtest-pkg-python
 Homepage: https://git.openstack.org/cgit/openstack-infra/gerritlib
@@ -32,7 +35,9 @@ Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/gerritlib.git
 Package: python-gerritlib
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${python:Depends}
+Depends:
+ ${misc:Depends},
+ ${python:Depends},
 Description: client library for accessing Gerrit with Python
  Gerritlib is a Python library for interacting with Gerrit.
  .
@@ -42,7 +47,9 @@ Description: client library for accessing Gerrit with Python
 Package: python3-gerritlib
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
 Description: client library for accessing Gerrit with Python3
  Gerritlib is a Python3 library for interacting with Gerrit.
  .
diff --git a/debian/rules b/debian/rules
index c00e386..491278e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
+include /usr/share/dpkg/pkg-info.mk
 
 # Parse version from debian changelog (or pbr will try to use Git commit)
-export PBR_VERSION:=$(shell dpkg-parsechangelog --show-field version)
+export PBR_VERSION=$(DEB_VERSION_UPSTREAM)
 export PYBUILD_NAME=gerritlib
 
 %:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/gerritlib.git