[Python-modules-commits] [cookiecutter] 11/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 f14542e5cb91f1c93ab73a3fd110f74ab091b8cf
Merge: 524d581 33756fe
Author: Vincent Bernat <bernat at debian.org>
Date:   Tue Oct 25 09:07:59 2016 +0200

    merge patched into master

 README.rst                                           |  2 +-
 debian/.git-dpm                                      |  4 ++--
 ...ll-privacy-breach-images-from-documentation.patch | 20 +++++++++++++++-----
 docs/cookiecutter_medium.png                         |  1 +
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 768fa80,0000000..294ed26
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
- 2bfe6ead4bc4415d5c68aa249c2c7039a2da6ceb
- 2bfe6ead4bc4415d5c68aa249c2c7039a2da6ceb
++33756fe4b6713bb4f492a80579ce5e520fe5e847
++33756fe4b6713bb4f492a80579ce5e520fe5e847
 +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 56a528b,0000000..ae97775
mode 100644,000000..100644
--- a/debian/patches/0004-Remove-all-privacy-breach-images-from-documentation.patch
+++ b/debian/patches/0004-Remove-all-privacy-breach-images-from-documentation.patch
@@@ -1,75 -1,0 +1,85 @@@
- From 2bfe6ead4bc4415d5c68aa249c2c7039a2da6ceb Mon Sep 17 00:00:00 2001
++From 33756fe4b6713bb4f492a80579ce5e520fe5e847 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(-)
++ README.rst                   | 40 +++-------------------------------------
++ docs/cookiecutter_medium.png |  1 +
++ 2 files changed, 4 insertions(+), 37 deletions(-)
++ create mode 120000 docs/cookiecutter_medium.png
 +
 +diff --git a/README.rst b/README.rst
- index 82ea8ab11586..2ee8216c26d3 100644
++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 ../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 --git a/docs/cookiecutter_medium.png b/docs/cookiecutter_medium.png
++new file mode 120000
++index 000000000000..a643810a7e7f
++--- /dev/null
+++++ b/docs/cookiecutter_medium.png
++@@ -0,0 +1 @@
+++../cookiecutter_medium.png
++\ No newline at end of file

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