[Python-modules-commits] [deap] 05/08: reapplied fix-docs.patch

Daniel Stender danstender-guest at moszumanska.debian.org
Fri Oct 16 17:47:00 UTC 2015


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

danstender-guest pushed a commit to branch master
in repository deap.

commit ba7bc3ea05c564a24ee58c0215405358f028b652
Merge: 7e349ec cccef63
Author: Daniel Stender <debian at danielstender.com>
Date:   Fri Oct 16 19:29:05 2015 +0200

    reapplied fix-docs.patch

 debian/.git-dpm                    |  4 +-
 debian/patches/0001-fix-docs.patch | 99 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 doc/_templates/layout.html         | 12 +----
 doc/conf.py                        | 10 ++--
 doc/examples/pso_basic.rst         | 19 --------
 6 files changed, 109 insertions(+), 36 deletions(-)

diff --cc debian/.git-dpm
index b08608f,0000000..e22a274
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
- cd6d4cb6de7bc5d56feb2b983fc9e3d51307103d
- cd6d4cb6de7bc5d56feb2b983fc9e3d51307103d
++cccef6357535a69f53b2e0f9ceae9790cf2ae14c
++cccef6357535a69f53b2e0f9ceae9790cf2ae14c
 +cd6d4cb6de7bc5d56feb2b983fc9e3d51307103d
 +cd6d4cb6de7bc5d56feb2b983fc9e3d51307103d
 +deap_1.0.1.orig.tar.gz
 +1d5ae42173f9ae721c626661ba71efd4bfe45887
 +848514
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-fix-docs.patch
index 0000000,0000000..638167d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-fix-docs.patch
@@@ -1,0 -1,0 +1,99 @@@
++From cccef6357535a69f53b2e0f9ceae9790cf2ae14c Mon Sep 17 00:00:00 2001
++From: Daniel Stender <debian at danielstender.com>
++Date: Fri, 16 Oct 2015 19:28:48 +0200
++Subject: fix-docs
++
++   privacy breaches and minor flaws, extlinks extension, don't produce PDFs
++   Forwarded: not-needed
++---
++ doc/_templates/layout.html | 12 ++----------
++ doc/conf.py                | 10 +++++-----
++ doc/examples/pso_basic.rst | 19 -------------------
++ 3 files changed, 7 insertions(+), 34 deletions(-)
++
++diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
++index 41cccd5..7c98e3b 100644
++--- a/doc/_templates/layout.html
+++++ b/doc/_templates/layout.html
++@@ -11,7 +11,7 @@
++ {% endblock %}
++ 
++ {% block rootrellink %}
++-    <li><a href="http://code.google.com/p/deap/"><img src="{{ pathto('_static/deap_icon-39x55.png', 1) }}" style="height: 30px; vertical-align: middle; padding-right: 1em;" />Project Homepage</a>{{ reldelim1 }}</li>
+++    <li><a href="http://code.google.com/p/deap/"><img src="{{ pathto('_static/deap_icon_16x16.ico', 1) }}" style="height: 30px; vertical-align: middle; padding-right: 1em;" />Project Homepage</a>{{ reldelim1 }}</li>
++ 	<li><a href="{{ pathto('index') }}">{{ shorttitle }}</a>{{ reldelim1 }} </li>
++ {% endblock %}
++ 
++@@ -25,13 +25,5 @@
++     <br />
++     Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> {{ sphinx_version|e }}.
++ </div>
++-<script type="text/javascript">
++-  (function() {
++-     var ga = document.createElement('script');
++-         ga.src = ('https:' == document.location.protocol ?
++-                'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
++-    ga.setAttribute('async', 'true');
++-    document.documentElement.firstChild.appendChild(ga);
++-  })();
++-</script>
+++
++ {% endblock %}
++diff --git a/doc/conf.py b/doc/conf.py
++index a16130e..99b7bb2 100644
++--- a/doc/conf.py
+++++ b/doc/conf.py
++@@ -37,6 +37,8 @@ else:
++       extensions += ['matplotlib.sphinxext.only_directives',
++                      'matplotlib.sphinxext.plot_directive']
++ 
+++plot_formats = [('png', 80), ('hires.png', 200)]
+++
++ # Add any paths that contain templates here, relative to this directory.
++ templates_path = ['_templates']
++ 
++@@ -127,11 +129,9 @@ plot_html_show_formats = True
++ 
++ # -- Options for extlinks extension ----------------------------------------------
++ 
++-import subprocess
++-branch = str(subprocess.check_output(["hg", "branch"])[:-1])
++-extlinks = {'example': ('https://code.google.com/p/deap/source/browse/examples/%s.py?name='+branch,
++-                      'examples/')}
++-
+++#import subprocess
+++#branch = str(subprocess.check_output(["hg", "branch"])[:-1])
+++extlinks = {'example': ('https://github.com/DEAP/deap/blob/master/examples/%s.py','examples/')}
++ 
++ # -- Options for HTML output ---------------------------------------------------
++ 
++diff --git a/doc/examples/pso_basic.rst b/doc/examples/pso_basic.rst
++index 01a488a..6232bca 100644
++--- a/doc/examples/pso_basic.rst
+++++ b/doc/examples/pso_basic.rst
++@@ -97,25 +97,6 @@ Conclusion
++ 
++ The full PSO basic example can be found here : :example:`pso/basic`.
++ 
++-This is a video of the algorithm in action, plotted with matplotlib_. 
++-The red dot represents the best solution found so far.
++-
++-.. _matplotlib: http://matplotlib.org/
++-
++-.. raw:: html
++-
++-	<center>
++-	<object style="height: 390px; width: 640px">
++-	<param name="movie" value="http://www.youtube.com/v/f3MW2krobpo?version=3&feature=player_detailpage">
++-	<param name="allowFullScreen" value="true">
++-	<param name="allowScriptAccess" value="always">
++-	<embed src="http://www.youtube.com/v/f3MW2krobpo?version=3&feature=player_detailpage" 
++-		   type="application/x-shockwave-flash" allowfullscreen="true" 
++-		   allowScriptAccess="always" 
++-		   width="640" height="360">
++-	</object>
++-	</center>
++-
++ References
++ ==========
++ 
diff --cc debian/patches/series
index 0000000,0000000..b6565dd
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-fix-docs.patch

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



More information about the Python-modules-commits mailing list