[Python-modules-commits] [pytest-runner] 01/09: Depend on newer dh-python which sets SETUPTOOLS_SCM_PRETEND_VERSION

[Ondřej Nový]

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

onovy-guest pushed a commit to branch master
in repository pytest-runner.

commit ccb4f66aa6ac0f9a1fb85ee93c21c65e0f7fa3b2
Author: Ondřej Nový <novy at ondrej.org>
Date:   Fri Jun 17 18:38:11 2016 +0200

    Depend on newer dh-python which sets SETUPTOOLS_SCM_PRETEND_VERSION
---
 debian/changelog | 3 +--
 debian/control   | 2 +-
 debian/rules     | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 77da5a0..78f421e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,7 @@ pytest-runner (2.7.1-2) UNRELEASED; urgency=medium
   * Standards-Version is 3.9.8 now (no changes needed)
   * Distinguish between Py2 and Py3 version in short description
   * Added upstream changelog
-  * Set SETUPTOOLS_SCM_PRETEND_VERSION during build to fix building from
-    Debian git
+  * Depend on newer dh-python which sets SETUPTOOLS_SCM_PRETEND_VERSION
 
  -- Ondřej Nový <novy at ondrej.org>  Wed, 25 May 2016 16:31:17 +0200
 
diff --git a/debian/control b/debian/control
index b1e8450..0332da8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Brian May <bam at debian.org>
-Build-Depends: debhelper (>=9), dh-python,
+Build-Depends: debhelper (>=9), dh-python (>= 2.20160609~),
  python-all (>= 2.6.6-3~), python-setuptools, python-setuptools-scm,
  python3-all, python3-setuptools, python3-setuptools-scm,
 Standards-Version: 3.9.8
diff --git a/debian/rules b/debian/rules
index e670e2b..79375d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
 # -*- makefile -*-
 
 export PYBUILD_NAME=pytest-runner
-export DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-export SETUPTOOLS_SCM_PRETEND_VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//')
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild

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