[Python-modules-commits] [python-cement] 04/07: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository python-cement.

commit b96419ad62f328dd7f0e4eace1d3a9df2723b1b2
Merge: 6034129 e482d27
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri May 20 08:56:08 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...es-and-mailinglist-signup-form-from-docum.patch | 56 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 doc/source/index.rst                               | 28 -----------
 4 files changed, 59 insertions(+), 30 deletions(-)

diff --cc debian/.git-dpm
index 70a25f8,0000000..2d1e57b
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 71b6945457b2a54e3bbda057f92942fcadb82305
- 71b6945457b2a54e3bbda057f92942fcadb82305
++e482d27faec5373ae0019f0a2106798ce2c4563c
++e482d27faec5373ae0019f0a2106798ce2c4563c
 +71b6945457b2a54e3bbda057f92942fcadb82305
 +71b6945457b2a54e3bbda057f92942fcadb82305
 +python-cement_2.8.2.orig.tar.gz
 +ec56a0785c21c41bc0bce39abc1021a0ecafe8af
 +165697
diff --cc debian/patches/0001-Remove-badges-and-mailinglist-signup-form-from-docum.patch
index 0000000,0000000..9d2b27a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-badges-and-mailinglist-signup-form-from-docum.patch
@@@ -1,0 -1,0 +1,56 @@@
++From e482d27faec5373ae0019f0a2106798ce2c4563c Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Fri, 20 May 2016 08:55:11 +0200
++Subject: Remove badges and mailinglist signup form from documentation.
++
++This prevents privacy breaches from loading hosted assets.
++---
++ doc/source/index.rst | 28 ----------------------------
++ 1 file changed, 28 deletions(-)
++
++diff --git a/doc/source/index.rst b/doc/source/index.rst
++index 81be775..de3fd7f 100644
++--- a/doc/source/index.rst
+++++ b/doc/source/index.rst
++@@ -19,10 +19,6 @@ seen several iterations in design, and has continued to grow and improve
++ since it's inception.  Cement is the most stable, and complete framework for
++ command line and backend application development.
++ 
++-.. image:: https://secure.travis-ci.org/datafolklabs/cement.svg
++-  :target: https://travis-ci.org/#!/datafolklabs/cement
++-.. image:: https://badges.gitter.im/Join%20Chat.svg
++-  :target: https://gitter.im/datafolklabs/cement
++ 
++ Core features include (but are not limited to):
++ 
++@@ -70,30 +66,6 @@ new releases, important features, and other related news.  This not an open
++ email thread, but rather an extremely minimal, low noise announcement only 
++ list.  You can unsubscribe at any time.
++ 
++-.. raw:: html
++-
++-    <!-- Begin MailChimp Signup Form -->
++-    <link href="http://cdn-images.mailchimp.com/embedcode/slim-081711.css" rel="stylesheet" type="text/css">
++-    <style type="text/css">
++-      #mc_embed_signup{background:#fff; clear:left; font:14px Helvetica,Arial,sans-serif; }
++-      /* Add your own MailChimp form style overrides in your site stylesheet or in this style block.
++-         We recommend moving this block and the preceding CSS link to the HEAD of your HTML file. */
++-    </style>
++-    <div id="mc_embed_signup">
++-    <form action="http://datafolklabs.us7.list-manage.com/subscribe/post?u=444ce23fdf1c30e830f893b57&id=7be3a6a31e" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
++-        <div id="mc_embed_signup_scroll">
++-      
++-      <input type="email" value="" name="EMAIL" class="email" id="mce-EMAIL" placeholder="email address" required>
++-        <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
++-        <div style="position: absolute; left: -5000px;"><input type="text" name="b_444ce23fdf1c30e830f893b57_7be3a6a31e" tabindex="-1" value=""></div>
++-        <div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div>
++-        </div>
++-    </form>
++-    </div>
++-    <BR />
++-
++-    <!--End mc_embed_signup-->
++-
++ 
++ Documentation
++ -------------
diff --cc debian/patches/series
index 0000000,0000000..d6674d4
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-badges-and-mailinglist-signup-form-from-docum.patch

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