[bcolz] 02/02: deb/rules: preset SETUPTOOLS_SCM_PRETEND_VERSION; add version.py to deb/clean

[Daniel Stender]

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

stender pushed a commit to branch master
in repository bcolz.

commit 778ef4093fd13baeb5c31e925ea151d66ec49fb8
Author: Daniel Stender <stender at debian.org>
Date:   Sun Dec 18 18:49:32 2016 +0100

    deb/rules: preset SETUPTOOLS_SCM_PRETEND_VERSION; add version.py to deb/clean
---
 bcolz/version.py | 4 ----
 debian/changelog | 5 ++++-
 debian/clean     | 3 ++-
 debian/rules     | 5 +++++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/bcolz/version.py b/bcolz/version.py
deleted file mode 100644
index 8d4686c..0000000
--- a/bcolz/version.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# coding: utf-8
-# file generated by setuptools_scm
-# don't change, don't track in version control
-version = '1.1.0'
diff --git a/debian/changelog b/debian/changelog
index 40eed28..b4b4c78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ bcolz (1.1.0+ds1-2) UNRELEASED; urgency=medium
 
   * deb/control:
     + make short description line more precise.
+  * deb/rules:
+    + preset SETUPTOOLS_SCM_PRETEND_VERSION.
+  * add bcolz/version.py to deb/clean.
 
- -- Daniel Stender <stender at debian.org>  Sun, 18 Dec 2016 16:38:43 +0100
+ -- Daniel Stender <stender at debian.org>  Sun, 18 Dec 2016 19:20:47 +0100
 
 bcolz (1.1.0+ds1-1) experimental; urgency=medium
 
diff --git a/debian/clean b/debian/clean
index 4d1b967..4514a9f 100644
--- a/debian/clean
+++ b/debian/clean
@@ -4,4 +4,5 @@ DISK_FORMAT_v1
 README
 THANKS
 bcolz.egg-info/
-.eggs/
\ No newline at end of file
+.eggs/
+bcolz/version.py
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 493cf96..d9444a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,11 @@ export PYBUILD_NAME=bcolz
 export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
 export BLOSC_DIR=/usr
 
+# preset version for setuptools-scm to prevent "1.1.0+ds1" etc. from Git tags
+include /usr/share/dpkg/pkg-info.mk
+VERSION_UPSTREAM = $(shell echo '$(DEB_VERSION_UPSTREAM)' | sed -e 's/\+[^+]*//')
+export SETUPTOOLS_SCM_PRETEND_VERSION = $(VERSION_UPSTREAM)
+
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/bcolz.git