[Python-modules-commits] [citeproc-py] 02/02: corrected patch name

[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 1289461aea42e974154d740de09870421a6fc297
Merge: 51f71f7 aa27e70
Author: Daniel Stender <debian at danielstender.com>
Date:   Fri Oct 16 19:00:45 2015 +0200

    corrected patch name

 debian/.git-dpm                                                       | 4 ++--
 ...{0001-no-git-from-version.patch => 0001-no-version-from-git.patch} | 4 ++--
 debian/patches/series                                                 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 16fa22d,0000000..81c640d
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
- 282254c8ea9cdd65eacd9fdba0b204d38a9035af
- 282254c8ea9cdd65eacd9fdba0b204d38a9035af
++aa27e709dd23b360e17aac31dbf54ddb475a534c
++aa27e709dd23b360e17aac31dbf54ddb475a534c
 +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-version-from-git.patch
index 8ebf04e,0000000..4395762
mode 100644,000000..100644
--- a/debian/patches/0001-no-version-from-git.patch
+++ b/debian/patches/0001-no-version-from-git.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 282254c8ea9cdd65eacd9fdba0b204d38a9035af Mon Sep 17 00:00:00 2001
++From aa27e709dd23b360e17aac31dbf54ddb475a534c 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
++Subject: no-version-from-git
 +
 +   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 555eb19,0000000..0c34a43
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- 0001-no-git-from-version.patch
++0001-no-version-from-git.patch

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