[Python-modules-commits] [dill] 05/07: merge patched into master

[Josué Ortega]

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

noahfx-guest pushed a commit to branch master
in repository dill.

commit c1faea9c87e7e062917dbf760a42280816aa2aa1
Merge: cf39aae 4665bd5
Author: Josue Ortega <josueortega at debian.org.gt>
Date:   Sun Nov 1 13:07:40 2015 -0600

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...oid-the-installation-of-upstream-binaries.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  8 +++---
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index dc31fe2,0000000..0e28d88
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- c53066906cd37a44b46647dac1c47c4bbd65861d
- c53066906cd37a44b46647dac1c47c4bbd65861d
++4665bd546e8104b6a4bc245215b3846ff243ffe7
++4665bd546e8104b6a4bc245215b3846ff243ffe7
 +c53066906cd37a44b46647dac1c47c4bbd65861d
 +c53066906cd37a44b46647dac1c47c4bbd65861d
 +dill_0.2.4.orig.tar.gz
 +f36c57e0146b9c570db7040f1a1b0da9b69a4b41
 +58607
diff --cc debian/patches/0001-Patch-to-avoid-the-installation-of-upstream-binaries.patch
index 0000000,0000000..d734ec5
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Patch-to-avoid-the-installation-of-upstream-binaries.patch
@@@ -1,0 -1,0 +1,29 @@@
++From 4665bd546e8104b6a4bc245215b3846ff243ffe7 Mon Sep 17 00:00:00 2001
++From: Josue Ortega <josueortega at debian.org.gt>
++Date: Sun, 1 Nov 2015 13:07:04 -0600
++Subject: Patch to avoid the installation of upstream binaries under the wrong
++ directories
++
++---
++ setup.py | 8 ++++----
++ 1 file changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 1289ce4..bdeea24 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -283,10 +283,10 @@ if has_setuptools:
++ """ % (ctypes_version)
++ 
++ # add the scripts, and close 'setup' call
++-setup_code += """    
++-      scripts=['scripts/unpickle.py','scripts/get_objgraph.py'])
++-"""
++-
+++#setup_code += """    
+++#      scripts=['scripts/unpickle.py','scripts/get_objgraph.py'])
+++#"""
+++setup_code += ")"
++ # exec the 'setup' code
++ exec(setup_code)
++ 
diff --cc debian/patches/series
index 0000000,0000000..cbf9dcd
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Patch-to-avoid-the-installation-of-upstream-binaries.patch

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