[Python-modules-commits] [pycryptodome] 03/03: merge patched-stretch-backports into stretch-backports

[Tristan Seligmann]

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

mithrandi pushed a commit to branch stretch-backports
in repository pycryptodome.

commit bd51d067404d348795fb41b0b609716e3f4a136c
Merge: 0c2e725 968c17e
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Jan 13 15:10:19 2018 +0200

    merge patched-stretch-backports into stretch-backports

 Doc/conf.py                                         |  1 -
 debian/.git-dpm                                     |  4 ++--
 debian/changelog                                    |  1 +
 ...Remove-unsupported-in-stretch-theme-option.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 6b09580,0000000..b8c1df0
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
- 88da766a52cff7965f847f51f82a25afcd283a5d
- 88da766a52cff7965f847f51f82a25afcd283a5d
++968c17e3040e9fb4d06b8c153afb951ab263f8a4
++968c17e3040e9fb4d06b8c153afb951ab263f8a4
 +d14794536e3f86e5740f8cdb584d15d8a07ad0d7
 +d14794536e3f86e5740f8cdb584d15d8a07ad0d7
 +pycryptodome_3.4.7.orig.tar.gz
 +19e7035789179fd2574fb36baf2ea548323f5b40
 +6483140
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 0ae6752,0000000..a8bc5f5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,0 +1,26 @@@
 +pycryptodome (3.4.7-1~bpo9+1) stretch-backports; urgency=medium
 +
++  * Team upload.
 +  * Rebuild for stretch-backports.
 +
 + -- Tristan Seligmann <mithrandi at debian.org>  Sat, 13 Jan 2018 15:04:46 +0200
 +
 +pycryptodome (3.4.7-1) unstable; urgency=medium
 +
 +  * New upstream release (3.4.7)
 +  * Use secure URI in debian/watch
 +  * Remove new-package-should-not-package-python2-module lintian override
 +  * Update extra-license-file lintian override (Sphinx now appears to create a
 +    copy of the source file with extension rst.txt)
 +  * Bump Standards-Version from 3.9.8 to 4.1.1 (no change required)
 +  * Add missing build dependency on python3-sphinx-rtd-theme
 +
 + -- Christopher Hoskin <mans0954 at debian.org>  Sat, 04 Nov 2017 10:24:18 +0000
 +
 +pycryptodome (3.4.6-1) unstable; urgency=low
 +
 +  * source package automatically created by stdeb 0.8.5
 +  * Initial release. (Closes: #864294: ITP: pycryptodome --
 +    cryptographic library for Python)
 +
 + -- Christopher Hoskin <mans0954 at debian.org>  Sun, 11 Jun 2017 20:51:56 +0100
diff --cc debian/patches/0003-Remove-unsupported-in-stretch-theme-option.patch
index 0000000,0000000..30c4778
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Remove-unsupported-in-stretch-theme-option.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 968c17e3040e9fb4d06b8c153afb951ab263f8a4 Mon Sep 17 00:00:00 2001
++From: Tristan Seligmann <mithrandi at debian.org>
++Date: Sat, 13 Jan 2018 15:10:15 +0200
++Subject: Remove unsupported (in stretch) theme option.
++
++---
++ Doc/conf.py | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/Doc/conf.py b/Doc/conf.py
++index b92c844..6c8574a 100644
++--- a/Doc/conf.py
+++++ b/Doc/conf.py
++@@ -112,7 +112,6 @@ html_theme = 'sphinx_rtd_theme'
++ # further.  For a list of options available for each theme, see the
++ # documentation.
++ html_theme_options = {
++-    'navigation_depth' : 5,
++ }
++ 
++ # Add any paths that contain custom themes here, relative to this directory.
diff --cc debian/patches/series
index 9752f4e,0000000..86da5b4
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Fix-Documentation.patch
 +0002-Supress-privacy-violations.patch
++0003-Remove-unsupported-in-stretch-theme-option.patch

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