[Python-modules-commits] [pywavelets] 02/03: merge patched into master

[Daniele Tricoli]

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

eriol-guest pushed a commit to branch master
in repository pywavelets.

commit 2cfce67e70077b23d211d52d31f8a0d8755dd8bb
Merge: 7f5ce20 a3f05a1
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Wed Nov 4 19:52:57 2015 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../do_not_rewrite_git_revision_on_build.patch     | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  4 +--
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 6c613c0,0000000..3d87355
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
- e6e88770db15ea4d97661875617f771dbe7f9155
- e6e88770db15ea4d97661875617f771dbe7f9155
++a3f05a1086c7b196793009c650fc20254b011d9e
++a3f05a1086c7b196793009c650fc20254b011d9e
 +34b87011e29e8813e694f2805d58d9d64c6849b5
 +34b87011e29e8813e694f2805d58d9d64c6849b5
 +pywavelets_0.3.0.orig.tar.gz
 +7b8bdcc6a2744c78acefe3e1dbb97ece6e20a3f7
 +635537
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/do_not_rewrite_git_revision_on_build.patch
index 0000000,0000000..48c3013
new file mode 100644
--- /dev/null
+++ b/debian/patches/do_not_rewrite_git_revision_on_build.patch
@@@ -1,0 -1,0 +1,29 @@@
++From a3f05a1086c7b196793009c650fc20254b011d9e Mon Sep 17 00:00:00 2001
++From: Daniele Tricoli <eriol at mornie.org>
++Date: Wed, 4 Nov 2015 19:39:08 +0100
++Subject: Don't rewrite git revision during build
++
++Upstream uses git revision to report it inside version string. In Debian
++we want to take it from source distribution to show same revision as upstream,
++not Debian packaging repository revision.
++
++Patch-Name: do_not_rewrite_git_revision_on_build.patch
++---
++ setup.py | 4 +---
++ 1 file changed, 1 insertion(+), 3 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 8e02b7f..7c6063d 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -44,9 +44,7 @@ def get_version_info():
++     # write_version_py(), otherwise the import of pywt.version messes
++     # up the build under Python 3.
++     FULLVERSION = VERSION
++-    if os.path.exists('.git'):
++-        GIT_REVISION = git_version()
++-    elif os.path.exists('pywt/version.py'):
+++    if os.path.exists('pywt/version.py'):
++         # must be a source distribution, use existing version file
++         # load it as a separate module to not load pywt/__init__.py
++         import imp
diff --cc debian/patches/series
index 6eaece6,0000000..3994b3a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +01-get_version_from_source.patch
 +02-remove_privacy_offenders.patch
++do_not_rewrite_git_revision_on_build.patch

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