[Python-modules-commits] [pycryptodome] 07/18: merge patched into master

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository pycryptodome.

commit b1c043ba36015936ee452682cb4293bf70a8c22e
Merge: 3381692 470bc85
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sun Jun 11 07:07:51 2017 +0100

    merge patched into master

 Doc/conf.py                                        |  3 ---
 debian/.git-dpm                                    |  4 ++--
 .../patches/0002-Supress-privacy-violations.patch  | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index d5f180f,0000000..4a5a0c7
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
- 94c7a70aa4508a343eacd9d9c29ac25bebf1e62f
- 94c7a70aa4508a343eacd9d9c29ac25bebf1e62f
++470bc8569cfa78d880d8cae186b44c48ad1583d4
++470bc8569cfa78d880d8cae186b44c48ad1583d4
 +223540de1154f40034a4be1703ef751522f99d5a
 +223540de1154f40034a4be1703ef751522f99d5a
 +pycryptodome_3.4.6.orig.tar.gz
 +9e6d984562df9c3781dfefe2eec46c4e36c65902
 +6494442
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Supress-privacy-violations.patch
index 0000000,0000000..3e7ae48
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Supress-privacy-violations.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 470bc8569cfa78d880d8cae186b44c48ad1583d4 Mon Sep 17 00:00:00 2001
++From: Christopher Hoskin <mans0954 at debian.org>
++Date: Sun, 11 Jun 2017 07:07:24 +0100
++Subject: Supress privacy violations
++
++---
++ Doc/conf.py | 3 ---
++ 1 file changed, 3 deletions(-)
++
++diff --git a/Doc/conf.py b/Doc/conf.py
++index 2b2be7d..42f3040 100644
++--- a/Doc/conf.py
+++++ b/Doc/conf.py
++@@ -103,9 +103,6 @@ html_theme = 'alabaster'
++ # further.  For a list of options available for each theme, see the
++ # documentation.
++ html_theme_options = {
++-        "github_user" : "Legrandin",
++-        "github_repo" : "pycryptodome",
++-        "github_banner" : "true",
++ }
++ 
++ # Add any paths that contain custom themes here, relative to this directory.
diff --cc debian/patches/series
index dc61448,0000000..9752f4e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Fix-Documentation.patch
++0002-Supress-privacy-violations.patch

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