[Python-modules-commits] [checkbox-ng] 04/09: merge patched into master

[Sylvain Pineau]

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

spineau-guest pushed a commit to branch master
in repository checkbox-ng.

commit e181126960a97e5cb83c889776a96a36fc4e6317
Merge: 25be9e6 f8ea6dc
Author: Sylvain Pineau <sylvain.pineau at canonical.com>
Date:   Wed Jan 6 12:18:58 2016 +0100

    merge patched into master

 PKG-INFO                              |  2 +-
 checkbox_ng.egg-info/PKG-INFO         |  2 +-
 checkbox_ng.egg-info/entry_points.txt | 10 +++++-----
 checkbox_ng/__init__.py               |  2 +-
 debian/.git-dpm                       |  6 +++---
 debian/patches/documentation-theme    |  2 +-
 setup.cfg                             |  2 +-
 setup.py                              |  2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --cc debian/.git-dpm
index c2b7d3d,0000000..67dd09b
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
- 0b0c6ced8ba44046dc7a682e90f6190bf7dbcd9f
- 0b0c6ced8ba44046dc7a682e90f6190bf7dbcd9f
- 5600bed911f559e611fdf68c3f082c2394190936
++f8ea6dc10f846150932e4b721b7767afe02e1131
++f8ea6dc10f846150932e4b721b7767afe02e1131
++06b6d539687fce97abdcf04ab67d2a512bd54d3c
 +06b6d539687fce97abdcf04ab67d2a512bd54d3c
 +checkbox-ng_0.23.orig.tar.gz
 +fc478bd2b365fb94453db3805f28b2c14da61d97
 +57900
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/documentation-theme
index ef5b0c0,0000000..d3c0576
mode 100644,000000..100644
--- a/debian/patches/documentation-theme
+++ b/debian/patches/documentation-theme
@@@ -1,32 -1,0 +1,32 @@@
- From 0b0c6ced8ba44046dc7a682e90f6190bf7dbcd9f Mon Sep 17 00:00:00 2001
++From f8ea6dc10f846150932e4b721b7767afe02e1131 Mon Sep 17 00:00:00 2001
 +From: Zygmunt Krynicki <zygmunt.krynicki at canonical.com>
 +Date: Thu, 8 Oct 2015 08:38:22 -0700
 +Subject: Revert the documentation theme back to default
 +
 + CheckboxNG uses a customized sphinx theme that is not included in the release
 + tarball. The theme is customized for "ubuntu" colors and this is not required
 + in Debian.
 +Origin: upstream
 +Forwarded: not-needed
 +Last-Update: 2015-07-21
 +
 +Patch-Name: documentation-theme
 +---
 + docs/conf.py | 4 +---
 + 1 file changed, 1 insertion(+), 3 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 6140e70..34e88e1 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -132,9 +132,7 @@ pygments_style = 'sphinx'
 + 
 + # -- Options for HTML output -------------------------------------------------
 + 
 +-html_theme_path = ['_templates']
 +-html_theme = 'ubuntu1204'
 +-html_theme_options = {}
 ++html_theme = 'default'
 + 
 + # The theme to use for HTML and HTML Help pages.  See the documentation for
 + # a list of builtin themes.

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