[Python-modules-commits] [quark-sphinx-theme] 08/10: merge patched into master

[Felix Krull]

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

fkrull-guest pushed a commit to branch master
in repository quark-sphinx-theme.

commit 19f27171b076be0b2b699c4d89371b57ab69ca24
Merge: 8a9e18c 6aae827
Author: Felix Krull <f_krull at gmx.de>
Date:   Fri Jul 22 01:29:20 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../patches/remove-tests-tinycss-dependency.patch  | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 0d0b4bb,0000000..befc7e7
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
- c16fde27246052a33c5a4db137dc883589a943e1
- c16fde27246052a33c5a4db137dc883589a943e1
++6aae827c57d83f53cc7e7828cd1528a3448fb5f4
++6aae827c57d83f53cc7e7828cd1528a3448fb5f4
 +c16fde27246052a33c5a4db137dc883589a943e1
 +c16fde27246052a33c5a4db137dc883589a943e1
 +quark-sphinx-theme_0.3.2.orig.tar.bz2
 +bbce92afdd26d588c8107fcae1d6dc300c0e0d82
 +15019
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove-tests-tinycss-dependency.patch
index 0000000,0000000..35eb969
new file mode 100644
--- /dev/null
+++ b/debian/patches/remove-tests-tinycss-dependency.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 6aae827c57d83f53cc7e7828cd1528a3448fb5f4 Mon Sep 17 00:00:00 2001
++From: Felix Krull <f_krull at gmx.de>
++Date: Fri, 22 Jul 2016 01:20:43 +0200
++Subject: Remove the tests' dependency on tinycss.
++
++Forwarded: not-needed
++Patch-Name: remove-tests-tinycss-dependency.patch
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index cca1a0c..c26f2d1 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -43,5 +43,5 @@ setup(
++     },
++ 
++     test_suite='test',
++-    tests_require=['sphinx', 'html5lib', 'tinycss'],
+++    tests_require=['sphinx', 'html5lib'],
++ )
diff --cc debian/patches/series
index 0000000,0000000..cbf17a0
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++remove-tests-tinycss-dependency.patch

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