[Python-modules-commits] [pycryptodome] 16/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 483f624aab8e245f09b9fb17e209b06bb9123ff9
Merge: 310e77d 34680ae
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sun Jun 11 08:22:50 2017 +0100

    merge patched into master

 Doc/src/license.rst                                |  3 ++-
 debian/.git-dpm                                    |  4 ++--
 debian/patches/0001-Fix-Documentation.patch        | 24 +++++++++++++++++-----
 .../patches/0002-Supress-privacy-violations.patch  |  2 +-
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --cc debian/.git-dpm
index f1f4ee9,0000000..d0b6df9
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
- 787f9678bb9f6c2e46fbb599a6e39db0bb0dc218
- 787f9678bb9f6c2e46fbb599a6e39db0bb0dc218
++34680aebe2c082eeac422b81c028e90412b44a64
++34680aebe2c082eeac422b81c028e90412b44a64
 +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/0001-Fix-Documentation.patch
index ed4180f,0000000..304e077
mode 100644,000000..100644
--- a/debian/patches/0001-Fix-Documentation.patch
+++ b/debian/patches/0001-Fix-Documentation.patch
@@@ -1,43 -1,0 +1,57 @@@
- From 4c7d8006921755098bd4d5dd95d6bc1e1a24e53c Mon Sep 17 00:00:00 2001
++From 4fd78bfb1914e98fca35e2ee4a46c6cd182b14fe Mon Sep 17 00:00:00 2001
 +From: Christopher Hoskin <mans0954 at debian.org>
 +Date: Wed, 7 Jun 2017 20:43:23 +0100
 +Subject: =?UTF-8?q?Fix=20Documentation=0A=20*=20Only=20use=20one=20maths?=
 + =?UTF-8?q?=20extension,=20choose=20mathimg=20as=20mathjax=20embedding=20h?=
 + =?UTF-8?q?as=20privacy=20issues=0A=20*=20Remove=20Travis=20and=20AppVeyor?=
-  =?UTF-8?q?=20image=20links=20to=20address=20privacy=20issues?=
++ =?UTF-8?q?=20image=20links=20to=20address=20privacy=20issues=0A=20*=20Use?=
++ =?UTF-8?q?=20debian=20copyright=20file=20for=20licenses?=
 +
 +Origin: upstream, https://github.com/Legrandin/pycryptodome/commit/05eb116ee1effcc39312121386eb047772925d62
 +Bug: https://github.com/Legrandin/pycryptodome/issues/73
 +Last-Update: 2017-07-08
 +---
-  Doc/conf.py | 2 +-
-  README.rst  | 6 ------
-  2 files changed, 1 insertion(+), 7 deletions(-)
++ Doc/conf.py         | 2 +-
++ Doc/src/license.rst | 3 ++-
++ README.rst          | 6 ------
++ 3 files changed, 3 insertions(+), 8 deletions(-)
 +
 +diff --git a/Doc/conf.py b/Doc/conf.py
 +index 7b26049..f159582 100644
 +--- a/Doc/conf.py
 ++++ b/Doc/conf.py
 +@@ -25,7 +25,7 @@ import sys, os
 + 
 + # Add any Sphinx extension module names here, as strings. They can be extensions
 + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 +-extensions = ['sphinx.ext.pngmath', 'sphinx.ext.mathjax']
 ++extensions = ['sphinx.ext.imgmath']
 + 
 + # Add any paths that contain templates here, relative to this directory.
 + templates_path = ['_templates']
++diff --git a/Doc/src/license.rst b/Doc/src/license.rst
++index 25acf59..9a492fa 100644
++--- a/Doc/src/license.rst
+++++ b/Doc/src/license.rst
++@@ -1,5 +1,6 @@
++ License
++ -------
++ 
++-.. include:: ../../LICENSE.rst
+++`Copyright <../../copyright>`_
+++
++ 
 +diff --git a/README.rst b/README.rst
 +index 85e89cf..bb18953 100644
 +--- a/README.rst
 ++++ b/README.rst
 +@@ -1,9 +1,3 @@
 +-.. image:: https://travis-ci.org/Legrandin/pycryptodome.svg?branch=master
 +-   :target: https://travis-ci.org/Legrandin/pycryptodome
 +-
 +-.. image:: https://ci.appveyor.com/api/projects/status/mbxyqdodw9ylfib9/branch/master?svg=true
 +-   :target: https://ci.appveyor.com/project/Legrandin/pycryptodome
 +-
 + PyCryptodome
 + ============
 + 
diff --cc debian/patches/0002-Supress-privacy-violations.patch
index bee0275,0000000..2ad05af
mode 100644,000000..100644
--- a/debian/patches/0002-Supress-privacy-violations.patch
+++ b/debian/patches/0002-Supress-privacy-violations.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 787f9678bb9f6c2e46fbb599a6e39db0bb0dc218 Mon Sep 17 00:00:00 2001
++From 34680aebe2c082eeac422b81c028e90412b44a64 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 f159582..76d8744 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.

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