[Python-modules-commits] [citeproc-py] 02/03: added no-version-from-git.patch

[Daniel Stender]

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

danstender-guest pushed a commit to branch master
in repository citeproc-py.

commit 9ceeeecf7314c9aebd8c0a24656efe90a3bbf327
Merge: a04dc83 282254c
Author: Daniel Stender <debian at danielstender.com>
Date:   Fri Oct 16 18:43:52 2015 +0200

    added no-version-from-git.patch

 debian/.git-dpm                               |  4 ++--
 debian/patches/0001-no-git-from-version.patch | 22 ++++++++++++++++++++++
 debian/patches/series                         |  1 +
 setup.py                                      |  1 +
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 0c102ff,0000000..16fa22d
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 74a1c5f63a232cf6d1f47035f8726abff6e8e6c0
- 74a1c5f63a232cf6d1f47035f8726abff6e8e6c0
++282254c8ea9cdd65eacd9fdba0b204d38a9035af
++282254c8ea9cdd65eacd9fdba0b204d38a9035af
 +74a1c5f63a232cf6d1f47035f8726abff6e8e6c0
 +74a1c5f63a232cf6d1f47035f8726abff6e8e6c0
 +citeproc-py_0.3.0.orig.tar.gz
 +9f9ed9031315458a8be3d444a9aa60548ede6c5f
 +91543
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-no-git-from-version.patch
index 0000000,0000000..8ebf04e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-no-git-from-version.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 282254c8ea9cdd65eacd9fdba0b204d38a9035af Mon Sep 17 00:00:00 2001
++From: Daniel Stender <debian at danielstender.com>
++Date: Fri, 16 Oct 2015 18:43:13 +0200
++Subject: no-git-from-version
++
++   Forwarded: not-needed
++---
++ setup.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/setup.py b/setup.py
++index 99e2b13..ecdf9a6 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -19,6 +19,7 @@ VERSION_FILE = PACKAGE + '/version.py'
++ # retrieve the version number from git or VERSION_FILE
++ # inspired by http://dcreager.net/2010/02/10/setuptools-git-version-numbers/
++ try:
+++    raise OSError
++     print('Attempting to get version number from git...')
++     git = Popen(['git', 'describe', '--abbrev=4', '--dirty'],
++                 stdout=PIPE, stderr=sys.stderr)
diff --cc debian/patches/series
index 0000000,0000000..555eb19
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-no-git-from-version.patch

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