[Python-modules-commits] [pydispatcher] 05/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 d137d19a58f1a18379233f424feb1e787014e1ca
Merge: 82da428 c95ef0a
Author: Neil Muller <drnlmuller+debian at gmail.com>
Date:   Fri Nov 6 15:57:15 2015 +0200

    merge patched into master

 debian/.git-dpm                                |  4 ++--
 debian/patches/0002-Change-relative-link.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 docs/index.html                                |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index b26001f,0000000..91e386d
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
- 1273272fc8e3b08b97997f3b03f73af16b7cf500
- 1273272fc8e3b08b97997f3b03f73af16b7cf500
++c95ef0ac0f6cb5d847d621e131a610dba67d9359
++c95ef0ac0f6cb5d847d621e131a610dba67d9359
 +e2e92a7b593f19c34edf62772cd7826b53933aae
 +e2e92a7b593f19c34edf62772cd7826b53933aae
 +pydispatcher_2.0.5.orig.tar.gz
 +77cdbd76be5e0a922d52b0108d10c008a8506bd5
 +34437
diff --cc debian/patches/0002-Change-relative-link.patch
index 0000000,0000000..fcd172a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Change-relative-link.patch
@@@ -1,0 -1,0 +1,24 @@@
++From c95ef0ac0f6cb5d847d621e131a610dba67d9359 Mon Sep 17 00:00:00 2001
++From: Neil Muller <drnlmuller+debian at gmail.com>
++Date: Fri, 6 Nov 2015 15:56:14 +0200
++Subject: Change relative link.
++
++We don't preserve the exact directory structure of upstream's
++docs, so the relative link needs to be adjusted.
++---
++ docs/index.html | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/index.html b/docs/index.html
++index 6cb3804..a504075 100644
++--- a/docs/index.html
+++++ b/docs/index.html
++@@ -132,7 +132,7 @@ encounter this situation.
++ <h2>Documentation</h2>
++ 
++ <p>You can find usage samples in the examples directory of the
++-distribution.  The dispatcher module's <a href="pydoc/pydispatch.dispatcher.html">reference documentation</a> is
+++distribution.  The dispatcher module's <a href="pydispatch.dispatcher.html">reference documentation</a> is
++ currently the major source of information regarding usage.<br>
++ </p>
++ 
diff --cc debian/patches/series
index 8d00053,0000000..e5120d7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Replace-sf-image-with-text-link.patch
++0002-Change-relative-link.patch

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