[Python-modules-commits] [cookiecutter] 06/12: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository cookiecutter.

commit 9b63a8cc6e533ebb46b0a88e782bd0e5761e402a
Merge: 13fc7e6 6b92e06
Author: Vincent Bernat <bernat at debian.org>
Date:   Tue Oct 25 09:01:09 2016 +0200

    merge patched into master

 README.rst                                         | 40 +-----------
 debian/.git-dpm                                    |  4 +-
 ...-privacy-breach-images-from-documentation.patch | 75 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 81 insertions(+), 39 deletions(-)

diff --cc debian/.git-dpm
index 786e3cf,0000000..9ee6d72
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
- cc0a71fcdb9fcda5552eca0a7766c59fdda3ce34
- cc0a71fcdb9fcda5552eca0a7766c59fdda3ce34
++6b92e064e908f379af429f8ce22f594dbe951653
++6b92e064e908f379af429f8ce22f594dbe951653
 +2cff56151f5e99b0914d57e6202c4ce7abd84935
 +2cff56151f5e99b0914d57e6202c4ce7abd84935
 +cookiecutter_1.4.0.orig.tar.gz
 +b19b6fb4e912400514d2443be245536bc9cabfd5
 +226136
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Remove-all-privacy-breach-images-from-documentation.patch
index 0000000,0000000..4be9582
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Remove-all-privacy-breach-images-from-documentation.patch
@@@ -1,0 -1,0 +1,75 @@@
++From 6b92e064e908f379af429f8ce22f594dbe951653 Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Tue, 25 Oct 2016 09:00:50 +0200
++Subject: Remove all privacy-breach images from documentation
++
++---
++ README.rst | 40 +++-------------------------------------
++ 1 file changed, 3 insertions(+), 37 deletions(-)
++
++diff --git a/README.rst b/README.rst
++index 82ea8ab11586..4a8437676d3b 100644
++--- a/README.rst
+++++ b/README.rst
++@@ -2,36 +2,6 @@
++ Cookiecutter
++ =============
++ 
++-.. image:: https://img.shields.io/pypi/v/cookiecutter.svg
++-        :target: https://pypi.python.org/pypi/cookiecutter
++-
++-.. image:: https://travis-ci.org/audreyr/cookiecutter.png?branch=master
++-        :target: https://travis-ci.org/audreyr/cookiecutter
++-
++-.. image:: https://ci.appveyor.com/api/projects/status/github/audreyr/cookiecutter?branch=master
++-        :target: https://ci.appveyor.com/project/audreyr/cookiecutter/branch/master
++-
++-.. image:: https://img.shields.io/pypi/dm/cookiecutter.svg
++-        :target: https://pypi.python.org/pypi/cookiecutter
++-
++-.. image:: https://codecov.io/github/audreyr/cookiecutter/coverage.svg?branch=master
++-        :target: https://codecov.io/github/audreyr/cookiecutter?branch=master
++-
++-.. image:: https://badges.gitter.im/Join Chat.svg
++-        :target: https://gitter.im/audreyr/cookiecutter?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
++-
++-.. image:: https://readthedocs.org/projects/cookiecutter/badge/?version=latest
++-        :target: https://readthedocs.org/projects/cookiecutter/?badge=latest
++-        :alt: Documentation Status
++-
++-.. image:: https://landscape.io/github/audreyr/cookiecutter/master/landscape.svg?style=flat
++-        :target: https://landscape.io/github/audreyr/cookiecutter/master
++-        :alt: Code Health
++-
++-.. image:: https://img.shields.io/scrutinizer/g/audreyr/cookiecutter.svg
++-        :target: https://scrutinizer-ci.com/g/audreyr/cookiecutter/?branch=master
++-        :alt: Scrutinizer Code Quality
++-
++ A command-line utility that creates projects from **cookiecutters** (project
++ templates), e.g. creating a Python package project from a Python package project template.
++ 
++@@ -40,7 +10,7 @@ templates), e.g. creating a Python package project from a Python package project
++ * Free software: BSD license
++ * PyPI: https://pypi.python.org/pypi/cookiecutter
++ 
++-.. image:: https://raw.github.com/audreyr/cookiecutter/aa309b73bdc974788ba265d843a65bb94c2e608e/cookiecutter_medium.png
+++.. image:: cookiecutter_medium.png
++ 
++ Features
++ --------
++@@ -446,13 +416,9 @@ Waiting for a response to an issue/question?
++ Support This Project
++ --------------------
++ 
++-This project is maintained by volunteers. Support their efforts by spreading the word about:
+++This project is maintained by volunteers. Support their efforts by spreading the word about `Two Scoops Academy`_.
++ 
++-.. image:: https://s3.amazonaws.com/tsacademy/images/tsa-logo-250x60-transparent-01.png
++-   :name: Two Scoops Academy
++-   :align: center
++-   :alt: Two Scoops Academy
++-   :target: http://www.twoscoops.academy/
+++.. _`Two Scoops Academy`: http://www.twoscoops.academy/
++ 
++ Code of Conduct
++ ---------------
diff --cc debian/patches/series
index bd1cce5,0000000..02fbb94
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +0001-Don-t-test-for-.DS_Store.patch
 +0002-Use-PyYAML-instead-of-poyo.patch
 +0003-Make-the-build-reproducible-by-avoiding-nondetermini.patch
++0004-Remove-all-privacy-breach-images-from-documentation.patch

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