[Python-modules-commits] [pydispatcher] 02/05: merge patched into master

[Neil Muller]

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

drnlmza-guest pushed a commit to branch master
in repository pydispatcher.

commit 27496928ca65728b9d6444ac0ad5f6bcfc794c2e
Merge: 5e08e66 1273272
Author: Neil Muller <drnlmuller+debian at gmail.com>
Date:   Fri Nov 6 13:01:57 2015 +0200

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 .../0001-Replace-sf-image-with-text-link.patch      | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 docs/index.html                                     |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index cbf509f,0000000..b26001f
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
- e2e92a7b593f19c34edf62772cd7826b53933aae
- e2e92a7b593f19c34edf62772cd7826b53933aae
++1273272fc8e3b08b97997f3b03f73af16b7cf500
++1273272fc8e3b08b97997f3b03f73af16b7cf500
 +e2e92a7b593f19c34edf62772cd7826b53933aae
 +e2e92a7b593f19c34edf62772cd7826b53933aae
 +pydispatcher_2.0.5.orig.tar.gz
 +77cdbd76be5e0a922d52b0108d10c008a8506bd5
 +34437
diff --cc debian/patches/0001-Replace-sf-image-with-text-link.patch
index 0000000,0000000..abb1239
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Replace-sf-image-with-text-link.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 1273272fc8e3b08b97997f3b03f73af16b7cf500 Mon Sep 17 00:00:00 2001
++From: Neil Muller <drnlmuller+debian at gmail.com>
++Date: Fri, 6 Nov 2015 13:01:39 +0200
++Subject: Replace sf image with text link
++
++---
++ docs/index.html | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/index.html b/docs/index.html
++index e57ea29..6cb3804 100644
++--- a/docs/index.html
+++++ b/docs/index.html
++@@ -278,6 +278,6 @@ beyond the first for deletion</li>
++   </ul>
++ </ul>
++ 
++-<p class="footer">A SourceForge Open-Source project: <a href="http://sourceforge.net"><img title="" alt="SourceForge" style="border: 0px solid ; width: 88px; height: 31px;" src="http://sourceforge.net/sflogo.php?group_id=79755&type=1" align="middle" border="0" height="31" width="88"></a></p>
+++<p class="footer">A <a href="http://sourceforge.net">SourceForge Open-Source</a> project.</p>
++ 
++ </body></html>
diff --cc debian/patches/series
index 0000000,0000000..8d00053
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Replace-sf-image-with-text-link.patch

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