[Python-modules-commits] [python-cachecontrol] 03/04: merge patched into master

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository python-cachecontrol.

commit a964020b61c965685c4218587efa68fa9438fec4
Merge: 1fcb9ea 6c6c029
Author: Barry Warsaw <barry at python.org>
Date:   Mon Oct 31 17:31:56 2016 -0400

    merge patched into master

 debian/.git-dpm                            |  4 ++--
 debian/patches/no-doesitcache-script.patch | 33 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 setup.py                                   | 10 ++++-----
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 6e4a83b,0000000..1ef1321
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
- a35f01178dfeb5c41724f4c2dff587f20c1d593b
- a35f01178dfeb5c41724f4c2dff587f20c1d593b
++6c6c029ad80c0ef44f7ccb7fb7fa2406a81837cf
++6c6c029ad80c0ef44f7ccb7fb7fa2406a81837cf
 +a35f01178dfeb5c41724f4c2dff587f20c1d593b
 +a35f01178dfeb5c41724f4c2dff587f20c1d593b
 +python-cachecontrol_0.11.7.orig.tar.gz
 +b7b4bc1a532e56abfd7cfe5ba32e0199aaaaecc7
 +13902
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/no-doesitcache-script.patch
index 0000000,0000000..eeebef2
new file mode 100644
--- /dev/null
+++ b/debian/patches/no-doesitcache-script.patch
@@@ -1,0 -1,0 +1,33 @@@
++From 6c6c029ad80c0ef44f7ccb7fb7fa2406a81837cf Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Mon, 31 Oct 2016 17:31:16 -0400
++Subject: Edit setup.py entry_points.
++
++Don't install the undocumented and unnecessary doesitcache script.
++
++Patch-Name: no-doesitcache-script.patch
++---
++ setup.py | 10 +++++-----
++ 1 file changed, 5 insertions(+), 5 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index e8d255b..14ccf97 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -23,11 +23,11 @@ setup_params = dict(
++     extras_require={
++         'filecache': ['lockfile>=0.9'],
++     },
++-    entry_points={
++-        'console_scripts': [
++-            'doesitcache = cachecontrol._cmd:main',
++-        ]
++-    },
+++    ## entry_points={
+++    ##     'console_scripts': [
+++    ##         'doesitcache = cachecontrol._cmd:main',
+++    ##     ]
+++    ## },
++     classifiers=[
++         'Development Status :: 4 - Beta',
++         'Environment :: Web Environment',
diff --cc debian/patches/series
index 0000000,0000000..3637fc4
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++no-doesitcache-script.patch

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