[Python-modules-commits] [pygments] 04/05: merge patched into master

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository pygments.

commit 79e035debffddc0ba740549d8e4f881b3002d80e
Merge: 2151bfb d13653c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Jan 25 17:45:03 2016 +0300

    merge patched into master

 debian/.git-dpm                        | 6 +++---
 debian/patches/change_docs_theme.patch | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index d3aea67,0000000..923d477
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
- 41619bd44acdfd66fb9c56ce3dae3d84c28ea862
- 41619bd44acdfd66fb9c56ce3dae3d84c28ea862
- 5af00867c24200bf923105deb40df521563084b2
++d13653c37be5e94d69ad9bf18f70e9c3521226e7
++d13653c37be5e94d69ad9bf18f70e9c3521226e7
++e1bbd84663c3946ad7ca47f6df19638afb5b6eb2
 +e1bbd84663c3946ad7ca47f6df19638afb5b6eb2
 +pygments_2.0.1+dfsg.orig.tar.gz
 +4d697edf6fa3f9c5bd58be4554fa01679f35b471
 +936249
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/change_docs_theme.patch
index d2c32de,0000000..b368778
mode 100644,000000..100644
--- a/debian/patches/change_docs_theme.patch
+++ b/debian/patches/change_docs_theme.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 41619bd44acdfd66fb9c56ce3dae3d84c28ea862 Mon Sep 17 00:00:00 2001
++From d13653c37be5e94d69ad9bf18f70e9c3521226e7 Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 10:34:58 -0700
 +Subject: change_docs_theme
 +
 +Patch-Name: change_docs_theme.patch
 +---
 + doc/conf.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/doc/conf.py b/doc/conf.py
 +index 4ac487f..79be2e3 100644
 +--- a/doc/conf.py
 ++++ b/doc/conf.py
 +@@ -93,7 +93,7 @@ exclude_patterns = ['_build']
 + 
 + # The theme to use for HTML and HTML Help pages.  See the documentation for
 + # a list of builtin themes.
 +-html_theme = 'pygments14'
 ++html_theme = 'default'
 + 
 + # Theme options are theme-specific and customize the look and feel of a theme
 + # further.  For a list of options available for each theme, see the

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