[Python-modules-commits] [dill] 09/10: merge patched into master

Sun Jul 16 19:38:23 UTC 2017

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

josue pushed a commit to branch master
in repository dill.

commit 5f7ab8879e1597f23cc71fff16969dfa464528f8
Merge: 245e0df bdf23b2
Author: Josue Ortega <josue at debian.org>
Date:   Sun Jul 16 13:30:41 2017 -0600

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 debian/changelog                                   |  1 +
 debian/control                                     |  2 +-
 ...-Removes-scripts-generation-from-setup.py.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 9288a6e,0000000..b9b5d4b
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
- c20e30aed981f371730b6e4695fb3a3cfae9731b
- c20e30aed981f371730b6e4695fb3a3cfae9731b
++bdf23b2fe730c60208d2c4cb41d2f48bd0aad11a
++bdf23b2fe730c60208d2c4cb41d2f48bd0aad11a
 +c2d618870e42c2013c6ee2691c9349a7b3c1f3f5
 +c2d618870e42c2013c6ee2691c9349a7b3c1f3f5
 +dill_0.2.7.orig.tar.gz
 +37c1fced841324716d3e329045210a94065e0498
 +64067
diff --cc debian/changelog
index 43258ee,0000000..b54e46d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,55 -1,0 +1,56 @@@
 +dill (0.2.7-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release (0.2.7):
 +    - debian/copyright: Adds new copyright holder (The Uncertainty
 +      Quantification Foundation) and updates copyright holder range.
 +    - debian/rules: Adds override_dh_auto_test, upstream tests are broken using
 +      unnitest.
++    - Adds patch to avoid installation of python scripts under `/usr/bin`.
 +  * debian/control:
 +    - Updates uploader email.
 +    - Bumps Standards-Version to 4.0.0: debian/copyright Format field changed
 +      to use https mode.
 +
 + -- Josue Ortega <josue at debian.org>  Sun, 16 Jul 2017 12:07:04 -0600
 +
 +dill (0.2.5-2) unstable; urgency=medium
 +
 +  * Team upload.
 +  * Drop obsolete depends on python-ctypeslib (Closes: #827565)
 +  * Fix typo in Vcs-Git field in debian/control
 +
 + -- Scott Kitterman <scott at kitterman.com>  Sat, 18 Jun 2016 01:39:04 -0400
 +
 +dill (0.2.5-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * debian/control:
 +    - Bumped X-Python3-Version to 3.4
 +    - Changed Vcs-* fields to use secure uri
 +
 + -- Josue Ortega <josueortega at debian.org.gt>  Wed, 10 Feb 2016 08:12:50 -0600
 +
 +dill (0.2.4-1) unstable; urgency=medium
 +
 +  * New upstream release:
 +    - Updated debian/patches/*.
 +  * debian/control:
 +    - Changed VCS from collab-maint to python-modules repository.
 +    - Removed unnecessary dependencies: python-setuptools, python3-setuptools.
 +    - Removed version from python-all and python3-all
 + -- Josue Ortega <josueortega at debian.org.gt>  Thu, 20 Aug 2015 12:06:36 +0200
 +
 +dill (0.2.3-1) unstable; urgency=medium
 +
 +  * New upstream release:
 +    - Updated debian/patches.
 +  * debian/watch: Fixed versioning format, since upstream changed it.
 +  * debian/control: Added missing dh-python dependency
 +
 + -- Josue Ortega <josueortega at debian.org.gt>  Thu, 16 Jul 2015 23:42:46 -0600
 +
 +dill (0.2.1-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #771596).
 +
 + -- Josue Ortega <josueortega at debian.org.gt>  Sun, 30 Nov 2014 16:38:44 -0600
diff --cc debian/control
index 6f3cc59,0000000..f5702b8
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,45 -1,0 +1,45 @@@
 +Source: dill
 +Section: python
 +Priority: optional
 +Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 +Uploaders: Josue Ortega <josue at debian.org>
 +Build-Depends: debhelper (>= 9),
 + dh-python,
 + python-all,
 + python3-all
 +X-Python-Version: >= 2.7
 +X-Python3-Version: >= 3.4
- Standards-Version: 3.9.6
++Standards-Version: 4.0.0
 +Homepage: https://github.com/uqfoundation/dill
 +Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/dill.git
 +Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/dill.git
 +
 +Package: python-dill
 +Architecture: all
 +Depends: ${misc:Depends},
 + ${python:Depends}
 +Suggests: python-objgraph (>= 1.8.1)
 +Description: Serialize all of Python (almost)
 + Dill extends Python's 'pickle' module for serializing and de-serializing Python
 + objects to the majority of the built-in Python types.
 + Dill provides the user the same interface as the 'pickle' module, and also
 + includes some additional features. In addition to pickling Python objects,
 + dill provides the ability to save the state of an interpreter session in a
 + single command.
 + Dill can be used to store Python objects to a file, but the primary usage is to
 + send Python objects across the network as a byte stream.
 +
 +Package: python3-dill
 +Architecture: all
 +Depends: ${misc:Depends},
 + ${python3:Depends}
 +Suggests: python3-objgraph (>= 1.8.1)
 +Description: Serialize all of Python 3 (almost)
 + Dill extends Python 3's 'pickle' module for serializing and
 + de-serializing Python 3 objects to the majority of the built-in Python 3 types.
 + Dill provides the user the same interface as the 'pickle' module, and also
 + includes some additional features. In addition to pickling Python 3 objects,
 + dill provides the ability to save the state of an interpreter session in a
 + single command.
 + Dill can be used to store Python 3 objects to a file, but the primary usage is
 + to send Python 3 objects across the network as a byte stream.
diff --cc debian/patches/0002-Removes-scripts-generation-from-setup.py.patch
index 0000000,0000000..b271f18
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Removes-scripts-generation-from-setup.py.patch
@@@ -1,0 -1,0 +1,22 @@@
++From bdf23b2fe730c60208d2c4cb41d2f48bd0aad11a Mon Sep 17 00:00:00 2001
++From: Josue Ortega <josue at debian.org>
++Date: Sun, 16 Jul 2017 13:30:26 -0600
++Subject: Removes scripts generation from setup.py
++
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index eca7e92..6ba1146 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -289,7 +289,7 @@ if has_setuptools:
++ 
++ # add the scripts, and close 'setup' call
++ setup_code += """    
++-      scripts=['scripts/dill_unpickle.py','scripts/get_objgraph.py'])
+++      scripts=[])
++ """
++ 
++ # exec the 'setup' code
diff --cc debian/patches/series
index a426812,0000000..332b4ce
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Removes-install_requires-in-order-to-avoid-automatic.patch
++0002-Removes-scripts-generation-from-setup.py.patch

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

