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

[Sylvain Pineau]

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

spineau-guest pushed a commit to tag debian/0.22-1
in repository checkbox-ng.

commit 70d4912541ed0b97c7706023ed5c53fb5b150011
Merge: 064b324 0b0c6ce
Author: Sylvain Pineau <sylvain.pineau at canonical.com>
Date:   Mon Dec 7 14:15:23 2015 +0100

    merge patched into master

 PKG-INFO                              |    2 +-
 checkbox_ng.egg-info/PKG-INFO         |    2 +-
 checkbox_ng.egg-info/SOURCES.txt      |    6 -
 checkbox_ng.egg-info/entry_points.txt |   11 +-
 checkbox_ng.egg-info/requires.txt     |    3 +-
 checkbox_ng/__init__.py               |    2 +-
 checkbox_ng/certification.py          |    5 +-
 checkbox_ng/commands/cli.py           |    8 +-
 checkbox_ng/commands/newcli.py        |   37 +-
 checkbox_ng/commands/service.py       |  132 ---
 checkbox_ng/commands/sru.py           |  333 +++----
 checkbox_ng/commands/test_sru.py      |   32 +-
 checkbox_ng/config.py                 |   10 +
 checkbox_ng/dbus_ex/__init__.py       |   81 --
 checkbox_ng/dbus_ex/decorators.py     |  391 --------
 checkbox_ng/dbus_ex/service.py        |  689 --------------
 checkbox_ng/dbus_ex/test_dbus.py      |   47 -
 checkbox_ng/launchpad.py              |    5 +-
 checkbox_ng/main.py                   |    8 -
 checkbox_ng/misc.py                   |  228 ++++-
 checkbox_ng/service.py                | 1586 ---------------------------------
 checkbox_ng/test_main.py              |    7 +-
 checkbox_ng/test_misc.py              |   44 +-
 checkbox_ng/tools.py                  |   22 -
 debian/.git-dpm                       |    6 +-
 debian/patches/documentation-theme    |    2 +-
 docs/changelog.rst                    |   22 +-
 setup.py                              |    4 +-
 28 files changed, 458 insertions(+), 3267 deletions(-)

diff --cc debian/.git-dpm
index d324989,0000000..b0b1ec4
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
- 458deb49a2bd069e5cd4e87b836755aed78ddfc9
- 458deb49a2bd069e5cd4e87b836755aed78ddfc9
- d9b886d42df8ace088da9835eb28549f40f7bcc1
++0b0c6ced8ba44046dc7a682e90f6190bf7dbcd9f
++0b0c6ced8ba44046dc7a682e90f6190bf7dbcd9f
++5600bed911f559e611fdf68c3f082c2394190936
 +5600bed911f559e611fdf68c3f082c2394190936
 +checkbox-ng_0.22.orig.tar.gz
 +7ed715c474d04e7a11f7572e0df416d536eca36c
 +57877
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/documentation-theme
index 96710ba,0000000..ef5b0c0
mode 100644,000000..100644
--- a/debian/patches/documentation-theme
+++ b/debian/patches/documentation-theme
@@@ -1,32 -1,0 +1,32 @@@
- From 458deb49a2bd069e5cd4e87b836755aed78ddfc9 Mon Sep 17 00:00:00 2001
++From 0b0c6ced8ba44046dc7a682e90f6190bf7dbcd9f 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