[Python-modules-commits] [django-simple-captcha] 04/05: merge patched into master
Brian May
bam at moszumanska.debian.org
Fri Dec 4 00:35:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository django-simple-captcha.
commit d35a5675a37e1d5c56c8a344c3d71ceaa38b45ab
Merge: 3a87093 dd5da5f
Author: Brian May <bam at debian.org>
Date: Fri Dec 4 11:15:29 2015 +1100
merge patched into master
.pep8 | 3 +
CHANGES | 4 +-
MANIFEST.in | 5 +
PKG-INFO | 2 +-
captcha/__init__.py | 2 +-
debian/.git-dpm | 6 +-
debian/patches/0002-Add-missing-files.patch | 44 -
debian/patches/pillow | 2 +-
debian/patches/series | 1 -
django_simple_captcha.egg-info/PKG-INFO | 2 +-
django_simple_captcha.egg-info/SOURCES.txt | 109 +-
docs/.DS_Store | Bin 0 -> 6148 bytes
docs/Makefile | 89 +
docs/_build/doctrees/advanced.doctree | Bin 0 -> 31619 bytes
docs/_build/doctrees/environment.pickle | Bin 0 -> 15936 bytes
docs/_build/doctrees/index.doctree | Bin 0 -> 9242 bytes
docs/_build/doctrees/usage.doctree | Bin 0 -> 20599 bytes
docs/_build/html/.buildinfo | 4 +
docs/_build/html/.doctrees/advanced.doctree | Bin 0 -> 45903 bytes
docs/_build/html/.doctrees/environment.pickle | Bin 0 -> 17394 bytes
docs/_build/html/.doctrees/index.doctree | Bin 0 -> 8370 bytes
docs/_build/html/.doctrees/usage.doctree | Bin 0 -> 21586 bytes
docs/_build/html/_images/captcha3.png | Bin 0 -> 9633 bytes
docs/_build/html/_images/dict.png | Bin 0 -> 7859 bytes
docs/_build/html/_images/math.png | Bin 0 -> 7491 bytes
docs/_build/html/_images/random_chars.png | Bin 0 -> 8136 bytes
docs/_build/html/_sources/advanced.txt | 244 +
docs/_build/html/_sources/index.txt | 40 +
docs/_build/html/_sources/usage.txt | 148 +
docs/_build/html/_static/ajax-loader.gif | Bin 0 -> 673 bytes
docs/_build/html/_static/basic.css | 599 ++
docs/_build/html/_static/captcha3.png | Bin 0 -> 9633 bytes
docs/_build/html/_static/classic.css | 261 +
docs/_build/html/_static/comment-bright.png | Bin 0 -> 3500 bytes
docs/_build/html/_static/comment-close.png | Bin 0 -> 3578 bytes
docs/_build/html/_static/comment.png | Bin 0 -> 3445 bytes
docs/_build/html/_static/default.css | 256 +
docs/_build/html/_static/dict.png | Bin 0 -> 7859 bytes
docs/_build/html/_static/doctools.js | 263 +
docs/_build/html/_static/down-pressed.png | Bin 0 -> 347 bytes
docs/_build/html/_static/down.png | Bin 0 -> 347 bytes
docs/_build/html/_static/file.png | Bin 0 -> 358 bytes
docs/_build/html/_static/jquery-1.11.1.js | 10308 +++++++++++++++++++
docs/_build/html/_static/jquery.js | 4 +
docs/_build/html/_static/math.png | Bin 0 -> 7491 bytes
docs/_build/html/_static/minus.png | Bin 0 -> 173 bytes
docs/_build/html/_static/plus.png | Bin 0 -> 173 bytes
docs/_build/html/_static/pygments.css | 63 +
docs/_build/html/_static/random_chars.png | Bin 0 -> 8136 bytes
docs/_build/html/_static/searchtools.js | 622 ++
docs/_build/html/_static/sidebar.js | 159 +
docs/_build/html/_static/underscore-1.3.1.js | 999 ++
docs/_build/html/_static/underscore.js | 31 +
docs/_build/html/_static/up-pressed.png | Bin 0 -> 345 bytes
docs/_build/html/_static/up.png | Bin 0 -> 345 bytes
docs/_build/html/_static/websupport.js | 808 ++
docs/_build/html/advanced.html | 317 +
docs/_build/html/genindex.html | 92 +
docs/_build/html/index.html | 156 +
docs/_build/html/objects.inv | Bin 0 -> 277 bytes
docs/_build/html/search.html | 99 +
docs/_build/html/searchindex.js | 1 +
docs/_build/html/usage.html | 269 +
docs/_static/captcha3.png | Bin 0 -> 9633 bytes
docs/_static/dict.png | Bin 0 -> 7859 bytes
docs/_static/math.png | Bin 0 -> 7491 bytes
docs/_static/random_chars.png | Bin 0 -> 8136 bytes
docs/advanced.rst | 244 +
docs/conf.py | 203 +
docs/index.rst | 40 +
docs/usage.rst | 148 +
testproject/.DS_Store | Bin 0 -> 6148 bytes
testproject/.coverage | Bin 0 -> 5116 bytes
testproject/.coveragerc | 10 +
testproject/__init__.pyc | Bin 0 -> 150 bytes
testproject/__pycache__/__init__.cpython-32.pyc | Bin 0 -> 154 bytes
testproject/__pycache__/__init__.cpython-33.pyc | Bin 0 -> 158 bytes
testproject/__pycache__/__init__.cpython-34.pyc | Bin 0 -> 146 bytes
testproject/__pycache__/forms.cpython-33.pyc | Bin 0 -> 634 bytes
testproject/__pycache__/forms.cpython-34.pyc | Bin 0 -> 436 bytes
testproject/__pycache__/settings.cpython-32.pyc | Bin 0 -> 1562 bytes
testproject/__pycache__/settings.cpython-33.pyc | Bin 0 -> 1650 bytes
testproject/__pycache__/settings.cpython-34.pyc | Bin 0 -> 1360 bytes
testproject/__pycache__/settings_17.cpython-34.pyc | Bin 0 -> 1363 bytes
testproject/__pycache__/urls.cpython-33.pyc | Bin 0 -> 524 bytes
testproject/__pycache__/urls.cpython-34.pyc | Bin 0 -> 436 bytes
testproject/__pycache__/views.cpython-33.pyc | Bin 0 -> 1081 bytes
testproject/__pycache__/views.cpython-34.pyc | Bin 0 -> 673 bytes
testproject/coverage.sh | 5 +
testproject/coverage.xml | 385 +
testproject/django-simple-captcha.db | Bin 0 -> 100352 bytes
testproject/forms.pyc | Bin 0 -> 510 bytes
...ode_django-simple-captcha_captcha___init__.html | 96 +
...jango-simple-captcha_captcha_conf___init__.html | 84 +
...jango-simple-captcha_captcha_conf_settings.html | 188 +
..._Code_django-simple-captcha_captcha_fields.html | 346 +
...Code_django-simple-captcha_captcha_helpers.html | 250 +
..._Code_django-simple-captcha_captcha_models.html | 222 +
...co_Code_django-simple-captcha_captcha_urls.html | 104 +
...o_Code_django-simple-captcha_captcha_views.html | 326 +
testproject/htmlcov/coverage_html.js | 376 +
testproject/htmlcov/index.html | 186 +
testproject/htmlcov/jquery-1.4.3.min.js | 166 +
testproject/htmlcov/jquery.hotkeys.js | 99 +
testproject/htmlcov/jquery.isonscreen.js | 53 +
testproject/htmlcov/jquery.tablesorter.min.js | 2 +
testproject/htmlcov/keybd_closed.png | Bin 0 -> 264 bytes
testproject/htmlcov/keybd_open.png | Bin 0 -> 267 bytes
testproject/htmlcov/status.dat | 309 +
testproject/htmlcov/style.css | 300 +
testproject/settings.pyc | Bin 0 -> 1458 bytes
testproject/settings_17.pyc | Bin 0 -> 1572 bytes
testproject/urls.pyc | Bin 0 -> 481 bytes
testproject/views.pyc | Bin 0 -> 803 bytes
tox.ini | 63 +
115 files changed, 20162 insertions(+), 55 deletions(-)
diff --cc debian/.git-dpm
index 606877a,0000000..ccf8eac
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
- c1fc139718340e94ba319bc1b2c0d7da1987183a
- c1fc139718340e94ba319bc1b2c0d7da1987183a
- d88edf05e266f6f90d8eae0d9c06c1aff8fce76a
++dd5da5f5a496af44c0b5f25b30fef1386e5a77ee
++dd5da5f5a496af44c0b5f25b30fef1386e5a77ee
++1f67652dd2c36057028760405212c1f421866299
+1f67652dd2c36057028760405212c1f421866299
+django-simple-captcha_0.5.0.orig.tar.gz
+82afbcea02a6217099ba29bbda3041bf83e306e4
+475730
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/pillow
index 05ad22b,0000000..d131fdb
mode 100644,000000..100644
--- a/debian/patches/pillow
+++ b/debian/patches/pillow
@@@ -1,29 -1,0 +1,29 @@@
- From ca2d27ebb3f16ad6490814afaaedd48d42dd9ae9 Mon Sep 17 00:00:00 2001
++From dd5da5f5a496af44c0b5f25b30fef1386e5a77ee Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 08:57:07 -0700
+Subject: pillow
+
+Patch-Name: pillow
+---
+ setup.py | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 8ac4232..1f122e5 100644
+--- a/setup.py
++++ b/setup.py
+@@ -4,12 +4,10 @@ from captcha import pillow_required, get_version as get_captcha_version
+ install_requires = [
+ 'setuptools',
+ 'six >=1.2.0',
+- 'Django >= 1.7'
++ 'Django >= 1.7',
++ 'Pillow >= 2.2.2',
+ ]
+
+-if pillow_required():
+- install_requires.append('Pillow >=2.2.2')
+-
+ setup(
+ name='django-simple-captcha',
+ version=get_captcha_version(),
diff --cc debian/patches/series
index cc16b35,0000000..3868fb1
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
+pillow
- 0002-Add-missing-files.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-simple-captcha.git
More information about the Python-modules-commits
mailing list