[Python-modules-commits] [django-simple-captcha] 03/05: merge patched into master
Brian May
bam at moszumanska.debian.org
Sun Dec 6 01:51:39 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 f219494d3cacabeec52c7d3b11cfc2d33c03f392
Merge: aec09a6 a30a7ec
Author: Brian May <bam at debian.org>
Date: Sun Dec 6 12:10:07 2015 +1100
merge patched into master
CHANGES | 5 +
MANIFEST.in | 9 +-
PKG-INFO | 2 +-
captcha/__init__.py | 2 +-
debian/.git-dpm | 6 +-
debian/patches/pillow | 29 -
debian/patches/series | 1 -
django_simple_captcha.egg-info/PKG-INFO | 2 +-
django_simple_captcha.egg-info/SOURCES.txt | 92 -
django_simple_captcha.egg-info/requires.txt | 1 +
django_simple_captcha.egg-info/top_level.txt | 1 -
docs/.DS_Store | Bin 6148 -> 0 bytes
docs/_build/doctrees/advanced.doctree | Bin 31619 -> 0 bytes
docs/_build/doctrees/environment.pickle | Bin 15936 -> 0 bytes
docs/_build/doctrees/index.doctree | Bin 9242 -> 0 bytes
docs/_build/doctrees/usage.doctree | Bin 20599 -> 0 bytes
docs/_build/html/.buildinfo | 4 -
docs/_build/html/.doctrees/advanced.doctree | Bin 45903 -> 0 bytes
docs/_build/html/.doctrees/environment.pickle | Bin 17394 -> 0 bytes
docs/_build/html/.doctrees/index.doctree | Bin 8370 -> 0 bytes
docs/_build/html/.doctrees/usage.doctree | Bin 21586 -> 0 bytes
docs/_build/html/_images/captcha3.png | Bin 9633 -> 0 bytes
docs/_build/html/_images/dict.png | Bin 7859 -> 0 bytes
docs/_build/html/_images/math.png | Bin 7491 -> 0 bytes
docs/_build/html/_images/random_chars.png | Bin 8136 -> 0 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 673 -> 0 bytes
docs/_build/html/_static/basic.css | 599 --
docs/_build/html/_static/captcha3.png | Bin 9633 -> 0 bytes
docs/_build/html/_static/classic.css | 261 -
docs/_build/html/_static/comment-bright.png | Bin 3500 -> 0 bytes
docs/_build/html/_static/comment-close.png | Bin 3578 -> 0 bytes
docs/_build/html/_static/comment.png | Bin 3445 -> 0 bytes
docs/_build/html/_static/default.css | 256 -
docs/_build/html/_static/dict.png | Bin 7859 -> 0 bytes
docs/_build/html/_static/doctools.js | 263 -
docs/_build/html/_static/down-pressed.png | Bin 347 -> 0 bytes
docs/_build/html/_static/down.png | Bin 347 -> 0 bytes
docs/_build/html/_static/file.png | Bin 358 -> 0 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 7491 -> 0 bytes
docs/_build/html/_static/minus.png | Bin 173 -> 0 bytes
docs/_build/html/_static/plus.png | Bin 173 -> 0 bytes
docs/_build/html/_static/pygments.css | 63 -
docs/_build/html/_static/random_chars.png | Bin 8136 -> 0 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 345 -> 0 bytes
docs/_build/html/_static/up.png | Bin 345 -> 0 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 277 -> 0 bytes
docs/_build/html/search.html | 99 -
docs/_build/html/searchindex.js | 1 -
docs/_build/html/usage.html | 269 -
docs/conf.py | 4 +-
setup.py | 36 +-
testproject/.DS_Store | Bin 6148 -> 0 bytes
testproject/.coverage | Bin 5116 -> 0 bytes
testproject/__init__.pyc | Bin 150 -> 0 bytes
testproject/__pycache__/__init__.cpython-32.pyc | Bin 154 -> 0 bytes
testproject/__pycache__/__init__.cpython-33.pyc | Bin 158 -> 0 bytes
testproject/__pycache__/__init__.cpython-34.pyc | Bin 146 -> 0 bytes
testproject/__pycache__/forms.cpython-33.pyc | Bin 634 -> 0 bytes
testproject/__pycache__/forms.cpython-34.pyc | Bin 436 -> 0 bytes
testproject/__pycache__/settings.cpython-32.pyc | Bin 1562 -> 0 bytes
testproject/__pycache__/settings.cpython-33.pyc | Bin 1650 -> 0 bytes
testproject/__pycache__/settings.cpython-34.pyc | Bin 1360 -> 0 bytes
testproject/__pycache__/settings_17.cpython-34.pyc | Bin 1363 -> 0 bytes
testproject/__pycache__/urls.cpython-33.pyc | Bin 524 -> 0 bytes
testproject/__pycache__/urls.cpython-34.pyc | Bin 436 -> 0 bytes
testproject/__pycache__/views.cpython-33.pyc | Bin 1081 -> 0 bytes
testproject/__pycache__/views.cpython-34.pyc | Bin 673 -> 0 bytes
testproject/coverage.xml | 385 -
testproject/django-simple-captcha.db | Bin 100352 -> 0 bytes
testproject/forms.pyc | Bin 510 -> 0 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 264 -> 0 bytes
testproject/htmlcov/keybd_open.png | Bin 267 -> 0 bytes
testproject/htmlcov/status.dat | 309 -
testproject/htmlcov/style.css | 300 -
testproject/settings.pyc | Bin 1458 -> 0 bytes
testproject/settings_17.pyc | Bin 1572 -> 0 bytes
testproject/urls.pyc | Bin 481 -> 0 bytes
testproject/views.pyc | Bin 803 -> 0 bytes
105 files changed, 54 insertions(+), 19371 deletions(-)
diff --cc debian/.git-dpm
index 15747f9,0000000..ca063b9
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
- dd5da5f5a496af44c0b5f25b30fef1386e5a77ee
- dd5da5f5a496af44c0b5f25b30fef1386e5a77ee
- 1f67652dd2c36057028760405212c1f421866299
++a30a7ecc1f2d8660f3e8f99505e457f8e8bcf88d
++a30a7ecc1f2d8660f3e8f99505e457f8e8bcf88d
++a30a7ecc1f2d8660f3e8f99505e457f8e8bcf88d
+a30a7ecc1f2d8660f3e8f99505e457f8e8bcf88d
+django-simple-captcha_0.5.1.orig.tar.gz
+91778a0efd29f4000a246edba13a9b9306678a7e
+107458
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
--
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