[Python-modules-commits] [flask-mail] 10/14: merge patched into master

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository flask-mail.

commit 517f59d243ac015a92987af2b74b683e541f8587
Merge: aed5192 2f7cf1c
Author: Dominik George <nik at naturalnet.de>
Date:   Sat Apr 29 17:33:15 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...to-generation-and-Sphinx-macros-from-docs.patch | 59 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/index.rst                                     | 18 +------
 4 files changed, 63 insertions(+), 19 deletions(-)

diff --cc debian/.git-dpm
index a1a3ed2,0000000..0af4cac
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
- c13e286ef1a66534ff2855118ab05a691aa89841
- c13e286ef1a66534ff2855118ab05a691aa89841
++2f7cf1c6339719e3a9c0c138d879ad957bb1e626
++2f7cf1c6339719e3a9c0c138d879ad957bb1e626
 +c13e286ef1a66534ff2855118ab05a691aa89841
 +c13e286ef1a66534ff2855118ab05a691aa89841
 +flask-mail_0.9.1.orig.tar.gz
 +ff3838a1933597f541dcad83a81c331cb7367fed
 +45654
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Strip-auto-generation-and-Sphinx-macros-from-docs.patch
index 0000000,0000000..c16d69e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Strip-auto-generation-and-Sphinx-macros-from-docs.patch
@@@ -1,0 -1,0 +1,59 @@@
++From 2f7cf1c6339719e3a9c0c138d879ad957bb1e626 Mon Sep 17 00:00:00 2001
++From: Dominik George <nik at naturalnet.de>
++Date: Sat, 29 Apr 2017 17:32:44 +0200
++Subject: Strip auto-generation and Sphinx macros from docs.
++
++---
++ docs/index.rst | 18 +-----------------
++ 1 file changed, 1 insertion(+), 17 deletions(-)
++
++diff --git a/docs/index.rst b/docs/index.rst
++index bae1758..a1af54f 100644
++--- a/docs/index.rst
+++++ b/docs/index.rst
++@@ -1,8 +1,6 @@
++ flask-mail
++ ======================================
++ 
++-.. module:: flask-mail
++-
++ One of the most basic functions in a web application is the ability to send
++ emails to your users.
++ 
++@@ -14,7 +12,6 @@ Links
++ 
++ * `documentation <http://packages.python.org/Flask-Mail/>`_
++ * `source <http://github.com/mattupstate/flask-mail>`_
++-* :doc:`changelog </changelog>`
++ 
++ Installing Flask-Mail
++ ---------------------
++@@ -219,8 +216,6 @@ a message with newlines in the subject, sender or recipient addresses will resul
++ Signalling support
++ ------------------
++ 
++-.. versionadded:: 0.4
++-
++ **Flask-Mail** now provides signalling support through a ``email_dispatched`` signal. This is sent whenever an email is
++ dispatched (even if the email is not actually sent, i.e. in a testing environment).
++ 
++@@ -236,18 +231,7 @@ app instance as an optional argument::
++ API
++ ---
++ 
++-.. module:: flask_mail
++-
++-.. autoclass:: Mail
++-   :members: send, connect, send_message
++-
++-.. autoclass:: Attachment
++-
++-.. autoclass:: Connection
++-   :members: send, send_message
++-
++-.. autoclass:: Message
++-   :members: attach, add_recipient
+++The API documentation can be read using ``pydoc flask_mail``.
++ 
++ .. _Flask: http://flask.pocoo.org
++ .. _GitHub: http://github.com/mattupstate/flask-mail
diff --cc debian/patches/series
index 0000000,0000000..bbe4a17
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Strip-auto-generation-and-Sphinx-macros-from-docs.patch

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