[Python-modules-commits] [python-attrs] 11/15: merge patched into master

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository python-attrs.

commit 72a52d233f2b5e3b5237914be3beaad6c7779c59
Merge: e47589a 01bd851
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Fri Jun 30 03:58:27 2017 +0200

    merge patched into master

 CHANGELOG.rst                                      |  2 +-
 debian/.git-dpm                                    |  4 ++--
 .../patches/0003-Link-to-local-copy-of-logo.patch  | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index bfc408b,0000000..bb5e10f
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
- 3b8aee49df1c6d64ed95e45b20fc463cc2af8be2
- 3b8aee49df1c6d64ed95e45b20fc463cc2af8be2
++01bd851dd032ff2a050f489aa2efa59aadbc4a3b
++01bd851dd032ff2a050f489aa2efa59aadbc4a3b
 +5f47c131690f268c584cb69b4f88d6b50986b57e
 +5f47c131690f268c584cb69b4f88d6b50986b57e
 +python-attrs_17.2.0.orig.tar.gz
 +d8c4c3268524de54410fbe4f3a32db9c9de0c843
 +70313
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Link-to-local-copy-of-logo.patch
index 0000000,0000000..c957cf3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Link-to-local-copy-of-logo.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 01bd851dd032ff2a050f489aa2efa59aadbc4a3b Mon Sep 17 00:00:00 2001
++From: Tristan Seligmann <mithrandi at mithrandi.net>
++Date: Fri, 30 Jun 2017 03:58:13 +0200
++Subject: Link to local copy of logo.
++
++---
++ CHANGELOG.rst | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/CHANGELOG.rst b/CHANGELOG.rst
++index fc9148a..fddd1e8 100644
++--- a/CHANGELOG.rst
+++++ b/CHANGELOG.rst
++@@ -39,7 +39,7 @@ To encourage more participation, the project has also been moved into a `dedicat
++ 
++ ``attrs`` also has a logo now!
++ 
++-.. image:: http://www.attrs.org/en/latest/_static/attrs_logo.png
+++.. image:: _static/attrs_logo.png
++    :alt: attrs logo
++ 
++ 
diff --cc debian/patches/series
index 443058a,0000000..a7fbf03
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Point-intersphinx_mapping-at-local-Python-docs.patch
 +0002-Add-build-directory-to-sys.path-for-autodoc.patch
++0003-Link-to-local-copy-of-logo.patch

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