[Python-modules-commits] [nbconvert] 09/11: merge patched into master

[Gordon Ball]

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

chronitis-guest pushed a commit to branch master
in repository nbconvert.

commit 33b7ffc69c96d8471b9cc9a411865380caf01f77
Merge: cbebf56 7ae61ab
Author: Gordon Ball <gordon at chronitis.net>
Date:   Thu Jan 26 13:47:38 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...nloading-CSS-from-the-web-since-we-can-co.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 --
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 6d199ba,0000000..9e653a4
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
- 6d7635b620deb251c9c9fde14305d4fb81c9ae51
- 6d7635b620deb251c9c9fde14305d4fb81c9ae51
++7ae61abe37ce6ec940226d2bb53a0c414addbd66
++7ae61abe37ce6ec940226d2bb53a0c414addbd66
 +77ac5d9046b9e679b3d5107b19d4f2139b6a1262
 +77ac5d9046b9e679b3d5107b19d4f2139b6a1262
 +nbconvert_5.1.1.orig.tar.gz
 +229f1209b2e437ea9d189cc13b496160d43f08bb
 +360978
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Disable-downloading-CSS-from-the-web-since-we-can-co.patch
index 0000000,0000000..47f2e78
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Disable-downloading-CSS-from-the-web-since-we-can-co.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 7ae61abe37ce6ec940226d2bb53a0c414addbd66 Mon Sep 17 00:00:00 2001
++From: Gordon Ball <gordon at chronitis.net>
++Date: Thu, 26 Jan 2017 13:47:34 +0100
++Subject: Disable downloading CSS from the web, since we can copy it directly
++ from the notebook package instead
++
++---
++ setup.py | 2 --
++ 1 file changed, 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 6acc808..58a6d7f 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -143,8 +143,6 @@ def css_first(command):
++             return command.run(self)
++     return CSSFirst
++ 
++-cmdclass['build'] = css_first(build)
++-cmdclass['sdist'] = css_first(sdist)
++ cmdclass['bdist_egg'] = bdist_egg if 'bdist_egg' in sys.argv else bdist_egg_disabled
++ 
++ for d, _, _ in os.walk(pjoin(pkg_root, 'templates')):
diff --cc debian/patches/series
index 6762db1,0000000..630a6d5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Require-ipython-5.patch
++0002-Disable-downloading-CSS-from-the-web-since-we-can-co.patch

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