[Python-modules-commits] [django-simple-captcha] 10/10: merge patched into master

Wed Dec 2 21:49:01 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 86a8410064f8b3930ed3136fcc12ed503a15e877
Merge: e4ce625 c1fc139
Author: Brian May <bam at debian.org>
Date:   Thu Dec 3 08:14:42 2015 +1100

    merge patched into master

 debian/.git-dpm                               |  4 +--
 debian/patches/0002-Add-missing-files.patch   | 44 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 testproject/templates/captcha_test/image.html |  4 +++
 testproject/templates/home.html               | 12 ++++++++
 5 files changed, 63 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 61e55a8,0000000..6261a8a
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
- ca2d27ebb3f16ad6490814afaaedd48d42dd9ae9
- ca2d27ebb3f16ad6490814afaaedd48d42dd9ae9
++c1fc139718340e94ba319bc1b2c0d7da1987183a
++c1fc139718340e94ba319bc1b2c0d7da1987183a
 +d88edf05e266f6f90d8eae0d9c06c1aff8fce76a
 +d88edf05e266f6f90d8eae0d9c06c1aff8fce76a
 +django-simple-captcha_0.4.8.orig.tar.gz
 +92d1a3321435beff187bd38316927bf270bad44c
 +66697
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Add-missing-files.patch
index 0000000,0000000..12b999c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Add-missing-files.patch
@@@ -1,0 -1,0 +1,44 @@@
++From c1fc139718340e94ba319bc1b2c0d7da1987183a Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Thu, 3 Dec 2015 08:13:29 +1100
++Subject: Add missing files.
++
++These files were missing from the upstream 0.4.8 release.
++https://github.com/mbi/django-simple-captcha/issues/100
++---
++ testproject/templates/captcha_test/image.html |  4 ++++
++ testproject/templates/home.html               | 12 ++++++++++++
++ 2 files changed, 16 insertions(+)
++ create mode 100644 testproject/templates/captcha_test/image.html
++ create mode 100644 testproject/templates/home.html
++
++diff --git a/testproject/templates/captcha_test/image.html b/testproject/templates/captcha_test/image.html
++new file mode 100644
++index 0000000..36ae498
++--- /dev/null
+++++ b/testproject/templates/captcha_test/image.html
++@@ -0,0 +1,4 @@
+++{% load i18n %}
+++{% spaceless %}
+++    {% if audio %}<a title="{% trans "Play CAPTCHA as audio file" %}" href="{{audio}}">{% endif %}<img src="{{image}}" alt="captcha-template-test" class="captcha" />{% if audio %}</a>{% endif %}
+++{% endspaceless %}
++\ No newline at end of file
++diff --git a/testproject/templates/home.html b/testproject/templates/home.html
++new file mode 100644
++index 0000000..6ed1f8a
++--- /dev/null
+++++ b/testproject/templates/home.html
++@@ -0,0 +1,12 @@
+++<body style="background-color: #aba">
+++<form action="." method="post">
+++    {% csrf_token %}
+++
+++    {{form.captcha.errors}}
+++    {{form.captcha}}
+++
+++    <div>
+++        <input type="submit" value="Submit" />
+++    </div>
+++</form>
+++</body>
++\ No newline at end of file
diff --cc debian/patches/series
index 3868fb1,0000000..cc16b35
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +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

