[Python-modules-commits] [nose2] 05/16: merge patched into master

[Pierre-Elliott Bécue]

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

peb-guest pushed a commit to branch master
in repository nose2.

commit 3df5ae6620be9ea33427a5862690124969d7086c
Merge: 47c0d21 e79ca63
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Sat Dec 23 18:17:37 2017 +0100

    merge patched into master

 README.rst                                         | 24 -------------
 debian/.git-dpm                                    |  4 +--
 ...1-removes_external_images_from_readme_rst.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 44 insertions(+), 26 deletions(-)

diff --cc debian/.git-dpm
index b7467a7,0000000..2ffc9a9
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
- 9932a698755a353ea9f6d806c5ca7afca16a0d00
- 9932a698755a353ea9f6d806c5ca7afca16a0d00
++e79ca639c41365afd890645a06431a8a3c5e4367
++e79ca639c41365afd890645a06431a8a3c5e4367
 +9932a698755a353ea9f6d806c5ca7afca16a0d00
 +9932a698755a353ea9f6d806c5ca7afca16a0d00
 +nose2_0.7.3.orig.tar.gz
 +abf36bb4e87c852ec9918b501cabc8b58ec494e8
 +139822
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-removes_external_images_from_readme_rst.patch
index 0000000,0000000..62d1ad4
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-removes_external_images_from_readme_rst.patch
@@@ -1,0 -1,0 +1,41 @@@
++From e79ca639c41365afd890645a06431a8a3c5e4367 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue at crans.org>
++Date: Sat, 23 Dec 2017 18:17:06 +0100
++Subject: removes_external_images_from_readme_rst
++
++---
++ README.rst | 24 ------------------------
++ 1 file changed, 24 deletions(-)
++
++diff --git a/README.rst b/README.rst
++index 4ba6f61..c38602b 100644
++--- a/README.rst
+++++ b/README.rst
++@@ -1,27 +1,3 @@
++-.. image:: https://travis-ci.org/nose-devs/nose2.png?branch=master
++-    :target: https://travis-ci.org/nose-devs/nose2
++-    :alt: Build Status
++-    
++-.. image:: https://coveralls.io/repos/nose-devs/nose2/badge.png?branch=master
++-    :target: https://coveralls.io/r/nose-devs/nose2?branch=master
++-    :alt: Coverage Status
++-    
++-.. image:: https://landscape.io/github/nose-devs/nose2/master/landscape.png
++-   :target: https://landscape.io/github/nose-devs/nose2/master
++-   :alt: Code Health
++-    
++-.. image:: https://img.shields.io/pypi/v/nose2.svg
++-    :target: https://pypi.org/project/nose2/
++-    :alt: Latest PyPI version
++-
++-.. image:: https://www.versioneye.com/user/projects/52037a30632bac57a00257ea/badge.png
++-    :target: https://www.versioneye.com/user/projects/52037a30632bac57a00257ea/
++-    :alt: Dependencies Status    
++-
++-.. image:: https://badges.gitter.im/gitterHQ/gitter.png
++-    :target: https://gitter.im/nose2
++-    :alt: Gitter Channel
++-
++ Welcome to nose2
++ ================
++ 
diff --cc debian/patches/series
index 0000000,0000000..5ba9e9e
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-removes_external_images_from_readme_rst.patch

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