[Python-modules-commits] [python-icalendar] 11/13: merge patched into master

[Christoph Egger]

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

christoph pushed a commit to branch master
in repository python-icalendar.

commit 0155c4fe5b1f45a0bcb531b08e1cdb8cc4630512
Merge: 32b98a8 76a50eb
Author: Christoph Egger <christoph at christoph-egger.org>
Date:   Wed Nov 1 15:58:01 2017 +0100

    merge patched into master

 README.rst                                        |  5 -----
 debian/.git-dpm                                   |  4 ++--
 debian/patches/0001-Remove-travis-ci-webbug.patch | 25 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index eb5e4ca,0000000..1880f14
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
- d607b6c075dd427884cf0b229003430a92be2805
- d607b6c075dd427884cf0b229003430a92be2805
++76a50eb68500d26a6e873d813dcab29891258565
++76a50eb68500d26a6e873d813dcab29891258565
 +d607b6c075dd427884cf0b229003430a92be2805
 +d607b6c075dd427884cf0b229003430a92be2805
 +python-icalendar_3.11.7.orig.tar.gz
 +e23aaeb2da0846228c111c6e0f0710bdadc60323
 +78330
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-travis-ci-webbug.patch
index 0000000,0000000..4c52d20
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-travis-ci-webbug.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 76a50eb68500d26a6e873d813dcab29891258565 Mon Sep 17 00:00:00 2001
++From: Christoph Egger <christoph at christoph-egger.org>
++Date: Wed, 1 Nov 2017 15:57:32 +0100
++Subject: Remove travis-ci webbug
++
++---
++ README.rst | 5 -----
++ 1 file changed, 5 deletions(-)
++
++diff --git a/README.rst b/README.rst
++index 90ba236..3b3ed37 100644
++--- a/README.rst
+++++ b/README.rst
++@@ -16,11 +16,6 @@ with Python.
++ 
++ ----
++ 
++-
++-.. image:: https://travis-ci.org/collective/icalendar.svg?branch=master
++-    :target: https://travis-ci.org/collective/icalendar
++-
++-
++ Roadmap
++ =======
++ 
diff --cc debian/patches/series
index 0000000,0000000..4914aa7
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-travis-ci-webbug.patch

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