[Python-modules-commits] [python-django-contact-form] 08/14: merge patched into master

[Andrew Starr-Bochicchio]

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

asb pushed a commit to branch master
in repository python-django-contact-form.

commit a7a418579480c199898d8ef7546f3107af231182
Merge: 40eb0ee ed69bcb
Author: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
Date:   Sun Oct 11 13:18:28 2015 -0400

    merge patched into master

 .../tests/templates/contact_form/contact_form.html |  1 +
 .../tests/templates/contact_form/contact_form.txt  |  1 +
 .../templates/contact_form/contact_form_sent.html  |  1 +
 .../contact_form/contact_form_subject.txt          |  1 +
 .../contact_form/test_callable_template_name.html  |  1 +
 debian/.git-dpm                                    |  4 +-
 ...es-for-tests-that-are-missing-from-the-up.patch | 56 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 8 files changed, 64 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 0bc9d21,0000000..4ccd966
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
- 051cb7d03e5982de809187e9a53c1451eaeb4ec3
- 051cb7d03e5982de809187e9a53c1451eaeb4ec3
++ed69bcbb6e66f87deef9539f47b5707e4d8c9e1c
++ed69bcbb6e66f87deef9539f47b5707e4d8c9e1c
 +051cb7d03e5982de809187e9a53c1451eaeb4ec3
 +051cb7d03e5982de809187e9a53c1451eaeb4ec3
 +python-django-contact-form_1.1.orig.tar.gz
 +d2ab7eaeac360b5d36e0bd0723248d7dad1bb774
 +15334
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Add-templates-for-tests-that-are-missing-from-the-up.patch
index 0000000,0000000..5aa6f40
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Add-templates-for-tests-that-are-missing-from-the-up.patch
@@@ -1,0 -1,0 +1,56 @@@
++From ed69bcbb6e66f87deef9539f47b5707e4d8c9e1c Mon Sep 17 00:00:00 2001
++From: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
++Date: Sun, 11 Oct 2015 13:18:23 -0400
++Subject: Add templates for tests that are missing from the upstream pypi
++ distribution.
++
++---
++ contact_form/tests/templates/contact_form/contact_form.html              | 1 +
++ contact_form/tests/templates/contact_form/contact_form.txt               | 1 +
++ contact_form/tests/templates/contact_form/contact_form_sent.html         | 1 +
++ contact_form/tests/templates/contact_form/contact_form_subject.txt       | 1 +
++ .../tests/templates/contact_form/test_callable_template_name.html        | 1 +
++ 5 files changed, 5 insertions(+)
++ create mode 100644 contact_form/tests/templates/contact_form/contact_form.html
++ create mode 100644 contact_form/tests/templates/contact_form/contact_form.txt
++ create mode 100644 contact_form/tests/templates/contact_form/contact_form_sent.html
++ create mode 100644 contact_form/tests/templates/contact_form/contact_form_subject.txt
++ create mode 100644 contact_form/tests/templates/contact_form/test_callable_template_name.html
++
++diff --git a/contact_form/tests/templates/contact_form/contact_form.html b/contact_form/tests/templates/contact_form/contact_form.html
++new file mode 100644
++index 0000000..30580d0
++--- /dev/null
+++++ b/contact_form/tests/templates/contact_form/contact_form.html
++@@ -0,0 +1 @@
+++{{ body }}
++diff --git a/contact_form/tests/templates/contact_form/contact_form.txt b/contact_form/tests/templates/contact_form/contact_form.txt
++new file mode 100644
++index 0000000..ba6f437
++--- /dev/null
+++++ b/contact_form/tests/templates/contact_form/contact_form.txt
++@@ -0,0 +1 @@
+++{{ body }}
++\ No newline at end of file
++diff --git a/contact_form/tests/templates/contact_form/contact_form_sent.html b/contact_form/tests/templates/contact_form/contact_form_sent.html
++new file mode 100644
++index 0000000..d77907c
++--- /dev/null
+++++ b/contact_form/tests/templates/contact_form/contact_form_sent.html
++@@ -0,0 +1 @@
+++<p>Message sent!</p>
++diff --git a/contact_form/tests/templates/contact_form/contact_form_subject.txt b/contact_form/tests/templates/contact_form/contact_form_subject.txt
++new file mode 100644
++index 0000000..dbe1d01
++--- /dev/null
+++++ b/contact_form/tests/templates/contact_form/contact_form_subject.txt
++@@ -0,0 +1 @@
+++Contact form message
++\ No newline at end of file
++diff --git a/contact_form/tests/templates/contact_form/test_callable_template_name.html b/contact_form/tests/templates/contact_form/test_callable_template_name.html
++new file mode 100644
++index 0000000..7856439
++--- /dev/null
+++++ b/contact_form/tests/templates/contact_form/test_callable_template_name.html
++@@ -0,0 +1 @@
+++Callable template_name used.
diff --cc debian/patches/series
index 0000000,0000000..12dddc6
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Add-templates-for-tests-that-are-missing-from-the-up.patch

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