[Python-modules-commits] r27322 - in packages/cloud-sptheme/tags (12 files)
olasd at users.alioth.debian.org
olasd at users.alioth.debian.org
Sat Jan 18 21:19:52 UTC 2014
Date: Saturday, January 18, 2014 @ 21:19:51
Author: olasd
Revision: 27322
[svn-buildpackage] Tagging cloud-sptheme 1.6-1
Added:
packages/cloud-sptheme/tags/1.6-1/
packages/cloud-sptheme/tags/1.6-1/debian/changelog
(from rev 27321, packages/cloud-sptheme/trunk/debian/changelog)
packages/cloud-sptheme/tags/1.6-1/debian/cloud-sptheme-common.doc-base
(from rev 27320, packages/cloud-sptheme/trunk/debian/cloud-sptheme-common.doc-base)
packages/cloud-sptheme/tags/1.6-1/debian/control
(from rev 27315, packages/cloud-sptheme/trunk/debian/control)
packages/cloud-sptheme/tags/1.6-1/debian/patches/0002-add-missing-table_styling.css.patch
(from rev 27281, packages/cloud-sptheme/trunk/debian/patches/0002-add-missing-table_styling.css.patch)
packages/cloud-sptheme/tags/1.6-1/debian/patches/0003-Remove-cookies-and-tracking.patch
(from rev 27281, packages/cloud-sptheme/trunk/debian/patches/0003-Remove-cookies-and-tracking.patch)
packages/cloud-sptheme/tags/1.6-1/debian/patches/0004-make_helper.py-python3-conversion.patch
(from rev 27281, packages/cloud-sptheme/trunk/debian/patches/0004-make_helper.py-python3-conversion.patch)
Deleted:
packages/cloud-sptheme/tags/1.6-1/debian/changelog
packages/cloud-sptheme/tags/1.6-1/debian/control
packages/cloud-sptheme/tags/1.6-1/debian/patches/0002-add-missing-table_styling.css.patch
packages/cloud-sptheme/tags/1.6-1/debian/patches/0003-Remove-cookies-and-tracking.patch
packages/cloud-sptheme/tags/1.6-1/debian/patches/0004-make_helper.py-python3-conversion.patch
Deleted: packages/cloud-sptheme/tags/1.6-1/debian/changelog
===================================================================
--- packages/cloud-sptheme/trunk/debian/changelog 2014-01-18 10:59:55 UTC (rev 27280)
+++ packages/cloud-sptheme/tags/1.6-1/debian/changelog 2014-01-18 21:19:51 UTC (rev 27322)
@@ -1,5 +0,0 @@
-cloud-sptheme (1.6-1) UNRELEASED; urgency=medium
-
- * Initial release. (Closes: #734952)
-
- -- Nicolas Dandrimont <olasd at debian.org> Sat, 11 Jan 2014 04:38:06 +0100
Copied: packages/cloud-sptheme/tags/1.6-1/debian/changelog (from rev 27321, packages/cloud-sptheme/trunk/debian/changelog)
===================================================================
--- packages/cloud-sptheme/tags/1.6-1/debian/changelog (rev 0)
+++ packages/cloud-sptheme/tags/1.6-1/debian/changelog 2014-01-18 21:19:51 UTC (rev 27322)
@@ -0,0 +1,5 @@
+cloud-sptheme (1.6-1) unstable; urgency=medium
+
+ * Initial release. (Closes: #734952)
+
+ -- Nicolas Dandrimont <olasd at debian.org> Sat, 18 Jan 2014 22:13:27 +0100
Copied: packages/cloud-sptheme/tags/1.6-1/debian/cloud-sptheme-common.doc-base (from rev 27320, packages/cloud-sptheme/trunk/debian/cloud-sptheme-common.doc-base)
===================================================================
--- packages/cloud-sptheme/tags/1.6-1/debian/cloud-sptheme-common.doc-base (rev 0)
+++ packages/cloud-sptheme/tags/1.6-1/debian/cloud-sptheme-common.doc-base 2014-01-18 21:19:51 UTC (rev 27322)
@@ -0,0 +1,9 @@
+Document: cloud-sptheme
+Title: The Cloud Sphinx theme
+Author: Eli Collins
+Abstract: Documentation for the Cloud Sphinx theme
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/cloud-sptheme-common/html/index.html
+Files: /usr/share/doc/cloud-sptheme-common/html/*.html
Deleted: packages/cloud-sptheme/tags/1.6-1/debian/control
===================================================================
--- packages/cloud-sptheme/trunk/debian/control 2014-01-18 10:59:55 UTC (rev 27280)
+++ packages/cloud-sptheme/tags/1.6-1/debian/control 2014-01-18 21:19:51 UTC (rev 27322)
@@ -1,89 +0,0 @@
-Source: cloud-sptheme
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Nicolas Dandrimont <olasd at debian.org>
-Build-Depends:
- debhelper (>= 9),
- dh-python,
- python-all,
- python3-all,
- python-sphinx,
- python3-sphinx,
- python-setuptools,
- python3-setuptools
-Standards-Version: 3.9.5
-X-Python-Version: >= 2.6
-Homepage: http://pythonhosted.org/cloud_sptheme/
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/cloud-sptheme/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/cloud-sptheme/trunk/
-
-Package: python-cloud-sptheme
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, cloud-sptheme-common
-Description: Cloud Sphinx theme and related extensions
- cloud_sptheme contains a Sphinx theme named "Cloud", and some related
- Sphinx extensions. Cloud and its extensions are primarily oriented
- towards generating html documentation for Python libraries. It provides
- numerous small enhancements to make the html documentation more
- interactive, and improve the layout on mobile devices.
- .
- In addition to the Cloud theme, this package provides a few extra Sphinx
- extensions which may be useful when documenting Python projects; and
- should be theme-agnostic:
- .
- cloud_sptheme.ext.autodoc_sections
- Patches the sphinx.ext.autodoc to handle RST section headers inside
- docstrings.
- cloud_sptheme.ext.issue_tracker
- Adds a special :issue: role for quickly linking to your project's
- issue tracker.
- cloud_sptheme.ext.escaped_samp_literals
- Patches Sphinx to permit escaped {} characters within a :samp: role.
- cloud_sptheme.ext.table_styling
- Enhances .. table directive to support per-column text alignment and
- other layout features.
- .
- This package contains the Python 2 version of cloud_sptheme.
-
-Package: python3-cloud-sptheme
-Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, cloud-sptheme-common
-Description: Cloud Sphinx theme and related extensions (python3 version)
- cloud_sptheme contains a Sphinx theme named "Cloud", and some related
- Sphinx extensions. Cloud and its extensions are primarily oriented
- towards generating html documentation for Python libraries. It provides
- numerous small enhancements to make the html documentation more
- interactive, and improve the layout on mobile devices.
- .
- In addition to the Cloud theme, this package provides a few extra Sphinx
- extensions which may be useful when documenting Python projects; and
- should be theme-agnostic:
- .
- cloud_sptheme.ext.autodoc_sections
- Patches the sphinx.ext.autodoc to handle RST section headers inside
- docstrings.
- cloud_sptheme.ext.issue_tracker
- Adds a special :issue: role for quickly linking to your project's
- issue tracker.
- cloud_sptheme.ext.escaped_samp_literals
- Patches Sphinx to permit escaped {} characters within a :samp: role.
- cloud_sptheme.ext.table_styling
- Enhances .. table directive to support per-column text alignment and
- other layout features.
- .
- This package contains the Python 3 version of cloud_sptheme.
-
-Package: cloud-sptheme-common
-Architecture: all
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}, libjs-jquery-cookie
-Description: Cloud Sphinx theme and related extensions (theme files and docs)
- cloud_sptheme contains a Sphinx theme named "Cloud", and some related
- Sphinx extensions. Cloud and its extensions are primarily oriented
- towards generating html documentation for Python libraries. It provides
- numerous small enhancements to make the html documentation more
- interactive, and improve the layout on mobile devices.
- .
- This package contains the theme files, shared by the python2 and
- python3 versions of the package. It also contains the module
- documentation.
Copied: packages/cloud-sptheme/tags/1.6-1/debian/control (from rev 27315, packages/cloud-sptheme/trunk/debian/control)
===================================================================
--- packages/cloud-sptheme/tags/1.6-1/debian/control (rev 0)
+++ packages/cloud-sptheme/tags/1.6-1/debian/control 2014-01-18 21:19:51 UTC (rev 27322)
@@ -0,0 +1,89 @@
+Source: cloud-sptheme
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Nicolas Dandrimont <olasd at debian.org>
+Build-Depends:
+ debhelper (>= 9),
+ dh-python,
+ python-all,
+ python3-all,
+ python-sphinx,
+ python3-sphinx,
+ python-setuptools,
+ python3-setuptools
+Standards-Version: 3.9.5
+X-Python-Version: >= 2.6
+Homepage: http://pythonhosted.org/cloud_sptheme/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/cloud-sptheme/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/cloud-sptheme/trunk/
+
+Package: python-cloud-sptheme
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, cloud-sptheme-common (= ${source:Version})
+Description: Cloud Sphinx theme and related extensions
+ cloud_sptheme contains a Sphinx theme named "Cloud", and some related
+ Sphinx extensions. Cloud and its extensions are primarily oriented
+ towards generating html documentation for Python libraries. It provides
+ numerous small enhancements to make the html documentation more
+ interactive, and improve the layout on mobile devices.
+ .
+ In addition to the Cloud theme, this package provides a few extra Sphinx
+ extensions which may be useful when documenting Python projects; and
+ should be theme-agnostic:
+ .
+ cloud_sptheme.ext.autodoc_sections
+ Patches the sphinx.ext.autodoc to handle RST section headers inside
+ docstrings.
+ cloud_sptheme.ext.issue_tracker
+ Adds a special :issue: role for quickly linking to your project's
+ issue tracker.
+ cloud_sptheme.ext.escaped_samp_literals
+ Patches Sphinx to permit escaped {} characters within a :samp: role.
+ cloud_sptheme.ext.table_styling
+ Enhances .. table directive to support per-column text alignment and
+ other layout features.
+ .
+ This package contains the Python 2 version of cloud_sptheme.
+
+Package: python3-cloud-sptheme
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}, cloud-sptheme-common (= ${source:Version})
+Description: Cloud Sphinx theme and related extensions (python3 version)
+ cloud_sptheme contains a Sphinx theme named "Cloud", and some related
+ Sphinx extensions. Cloud and its extensions are primarily oriented
+ towards generating html documentation for Python libraries. It provides
+ numerous small enhancements to make the html documentation more
+ interactive, and improve the layout on mobile devices.
+ .
+ In addition to the Cloud theme, this package provides a few extra Sphinx
+ extensions which may be useful when documenting Python projects; and
+ should be theme-agnostic:
+ .
+ cloud_sptheme.ext.autodoc_sections
+ Patches the sphinx.ext.autodoc to handle RST section headers inside
+ docstrings.
+ cloud_sptheme.ext.issue_tracker
+ Adds a special :issue: role for quickly linking to your project's
+ issue tracker.
+ cloud_sptheme.ext.escaped_samp_literals
+ Patches Sphinx to permit escaped {} characters within a :samp: role.
+ cloud_sptheme.ext.table_styling
+ Enhances .. table directive to support per-column text alignment and
+ other layout features.
+ .
+ This package contains the Python 3 version of cloud_sptheme.
+
+Package: cloud-sptheme-common
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Cloud Sphinx theme and related extensions (theme files and docs)
+ cloud_sptheme contains a Sphinx theme named "Cloud", and some related
+ Sphinx extensions. Cloud and its extensions are primarily oriented
+ towards generating html documentation for Python libraries. It provides
+ numerous small enhancements to make the html documentation more
+ interactive, and improve the layout on mobile devices.
+ .
+ This package contains the theme files, shared by the python2 and
+ python3 versions of the package. It also contains the documentation for
+ the theme and the associated extensions.
Deleted: packages/cloud-sptheme/tags/1.6-1/debian/patches/0002-add-missing-table_styling.css.patch
===================================================================
--- packages/cloud-sptheme/trunk/debian/patches/0002-add-missing-table_styling.css.patch 2014-01-18 10:59:55 UTC (rev 27280)
+++ packages/cloud-sptheme/tags/1.6-1/debian/patches/0002-add-missing-table_styling.css.patch 2014-01-18 21:19:51 UTC (rev 27322)
@@ -1,43 +0,0 @@
-Description: Add missing table_styling.css
-Author: Nicolas Dandrimont <olasd at debian.org>
-Forwarded: not-needed
-
-Index: cloud-sptheme-1.6/cloud_sptheme/ext/table_styling.css
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ cloud-sptheme-1.6/cloud_sptheme/ext/table_styling.css 2014-01-11 06:18:48.708094227 +0100
-@@ -0,0 +1,18 @@
-+/* css fragment used by cloud_sptheme.ext.table_styling
-+ * for themes which don't derive from base cloud theme
-+ */
-+table.docutils .left-align { text-align: left; }
-+table.docutils .center-align { text-align: center; }
-+table.docutils .right-align { text-align: right; }
-+table.docutils .justify-align { text-align: justify; }
-+table.docutils .nowrap { white-space: nowrap; }
-+
-+table.docutils .no-left-divider { border-left-width: 0; }
-+table.docutils .single-left-divider { border-left-width: 2px; border-left-style: solid; }
-+table.docutils .double-left-divider { border-left-width: 6px; border-left-style: double; }
-+
-+table.docutils .no-right-divider,
-+table.docutils .single-right-divider,
-+table.docutils .double-right-divider { border-right-width: 0; }
-+table.docutils .single-right-divider:last-child { border-right-width: 2px; border-right-style: solid; }
-+table.docutils .double-right-divider:last-child { border-right-width: 6px; border-right-style: double; }
-Index: cloud-sptheme-1.6/setup.py
-===================================================================
---- cloud-sptheme-1.6.orig/setup.py 2014-01-11 06:18:24.428143436 +0100
-+++ cloud-sptheme-1.6/setup.py 2014-01-11 06:19:48.607972825 +0100
-@@ -24,6 +24,11 @@
- setup(
- #package info
- packages = find_packages(),
-+ package_data = {
-+ "cloud_sptheme": [
-+ "ext/*.css",
-+ ]
-+ },
- zip_safe=False,
-
- install_requires=[ "sphinx>=1.1"],
Copied: packages/cloud-sptheme/tags/1.6-1/debian/patches/0002-add-missing-table_styling.css.patch (from rev 27281, packages/cloud-sptheme/trunk/debian/patches/0002-add-missing-table_styling.css.patch)
===================================================================
--- packages/cloud-sptheme/tags/1.6-1/debian/patches/0002-add-missing-table_styling.css.patch (rev 0)
+++ packages/cloud-sptheme/tags/1.6-1/debian/patches/0002-add-missing-table_styling.css.patch 2014-01-18 21:19:51 UTC (rev 27322)
@@ -0,0 +1,43 @@
+Description: Add missing table_styling.css
+Author: Nicolas Dandrimont <olasd at debian.org>
+Forwarded: https://bitbucket.org/ecollins/cloud_sptheme/pull-request/2/install-the-table_stylingcss-file
+
+Index: cloud-sptheme-1.6/cloud_sptheme/ext/table_styling.css
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ cloud-sptheme-1.6/cloud_sptheme/ext/table_styling.css 2014-01-11 06:18:48.708094227 +0100
+@@ -0,0 +1,18 @@
++/* css fragment used by cloud_sptheme.ext.table_styling
++ * for themes which don't derive from base cloud theme
++ */
++table.docutils .left-align { text-align: left; }
++table.docutils .center-align { text-align: center; }
++table.docutils .right-align { text-align: right; }
++table.docutils .justify-align { text-align: justify; }
++table.docutils .nowrap { white-space: nowrap; }
++
++table.docutils .no-left-divider { border-left-width: 0; }
++table.docutils .single-left-divider { border-left-width: 2px; border-left-style: solid; }
++table.docutils .double-left-divider { border-left-width: 6px; border-left-style: double; }
++
++table.docutils .no-right-divider,
++table.docutils .single-right-divider,
++table.docutils .double-right-divider { border-right-width: 0; }
++table.docutils .single-right-divider:last-child { border-right-width: 2px; border-right-style: solid; }
++table.docutils .double-right-divider:last-child { border-right-width: 6px; border-right-style: double; }
+Index: cloud-sptheme-1.6/setup.py
+===================================================================
+--- cloud-sptheme-1.6.orig/setup.py 2014-01-11 06:18:24.428143436 +0100
++++ cloud-sptheme-1.6/setup.py 2014-01-11 06:19:48.607972825 +0100
+@@ -24,6 +24,11 @@
+ setup(
+ #package info
+ packages = find_packages(),
++ package_data = {
++ "cloud_sptheme": [
++ "ext/*.css",
++ ]
++ },
+ zip_safe=False,
+
+ install_requires=[ "sphinx>=1.1"],
Deleted: packages/cloud-sptheme/tags/1.6-1/debian/patches/0003-Remove-cookies-and-tracking.patch
===================================================================
--- packages/cloud-sptheme/trunk/debian/patches/0003-Remove-cookies-and-tracking.patch 2014-01-18 10:59:55 UTC (rev 27280)
+++ packages/cloud-sptheme/tags/1.6-1/debian/patches/0003-Remove-cookies-and-tracking.patch 2014-01-18 21:19:51 UTC (rev 27322)
@@ -1,89 +0,0 @@
-Description: Remove Google Analytics
-Author: Nicolas Dandrimont <olasd at debian.org>
-Forwarded: not-needed
-
-Index: cloud-sptheme-1.6/cloud_sptheme/themes/cloud/layout.html
-===================================================================
---- cloud-sptheme-1.6.orig/cloud_sptheme/themes/cloud/layout.html 2013-09-22 00:00:12.000000000 +0200
-+++ cloud-sptheme-1.6/cloud_sptheme/themes/cloud/layout.html 2014-01-11 06:55:28.820021614 +0100
-@@ -20,8 +20,7 @@
- {% set reldelim2 = reldim2 is not defined and ' ' or reldelim2 %}
-
- {# add script file to instrument collapsable sections and other features #}
--{% set script_files = script_files + ['_static/jquery.cookie.js',
-- '_static/cloud.js'] %}
-+{% set script_files = script_files + ['_static/cloud.js'] %}
-
- {# add font stylesheets #}
- {% set css_files = css_files + [theme_fontcssurl] %}
-@@ -58,38 +57,9 @@
- {% block extrahead -%}
- {{ super() }}
- <meta name="viewport" content="width=device-width, initial-scale=1">
-- {%- if theme_googleanalytics_id -%}
--<script type="text/javascript">
--var ga_enabled = !$.cookie('disable-ga');
--if(ga_enabled){
-- var _gaq = _gaq || [];
-- _gaq.push(['_setAccount', '{{ theme_googleanalytics_id }}']);
-- _gaq.push(['_setCookiePath', '{{ theme_googleanalytics_path }}']);
-- _gaq.push(['_setDetectFlash', false]);
-- _gaq.push(['_trackPageview']);
-- (function() {
-- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-- })();
--}
--</script>
-- {%- endif %}
- {%- endblock %}
-
- {% block footer -%}
- {{ super() }}
-- {%- if theme_googleanalytics_id -%}
--<script type="text/javascript">
-- if(ga_enabled){
-- document.write("<div class=\"footer\">This page uses <a href=\"http://analytics.google.com\">Google Analytics</a> to collect statistics. ");
-- document.write("Click <button title=\"set cookie to disable analytics for this site\" class=\"link\" onclick=\"$.cookie('disable-ga', 'true', {expires: 3650, path: '{{ theme_googleanalytics_path }}'}); window.location.reload(); return false; \">here</button> to disable analytics for this site.");
-- document.write("</div>");
-- }else{
-- document.write("<div class=\"footer\">Google Analytics has been disabled. ");
-- document.write("Click <button title=\"set cookie to re-enable analytics for this site\" class=\"link\" onclick=\"$.cookie('disable-ga', null, {path: '{{ theme_googleanalytics_path }}'}); window.location.reload(); return false; \">here</button> to re-enable analytics for this site.");
-- };
--</script>
-- {%- endif %}
- <!-- cloud_sptheme 1.4 -->
- {%- endblock %}
-Index: cloud-sptheme-1.6/cloud_sptheme/themes/cloud/static/cloud.js_t
-===================================================================
---- cloud-sptheme-1.6.orig/cloud_sptheme/themes/cloud/static/cloud.js_t 2014-01-18 11:14:39.713457855 +0100
-+++ cloud-sptheme-1.6/cloud_sptheme/themes/cloud/static/cloud.js_t 2014-01-18 11:16:18.337421275 +0100
-@@ -144,15 +144,11 @@
-
- var show_btn = $('#sidebar-show', holder);
- var hide_btn = $('#sidebar-hide', holder);
-- /* FIXME: when url_root is a relative path, this sets cookie in wrong spot.
-- need to detect relative roots, and combine with document.location.path */
-- var copts = { expires: 7, path: DOCUMENTATION_OPTIONS.url_root };
-
- show_btn.click(function (){
- doc.removeClass("collapsed-sidebar");
- hide_btn.show();
- show_btn.hide();
-- $.cookie("sidebar", "expanded", copts);
- $(window).trigger("cloud-sidebar-toggled", false);
- });
-
-@@ -160,11 +156,9 @@
- doc.addClass("collapsed-sidebar");
- show_btn.show();
- hide_btn.hide();
-- $.cookie("sidebar", "collapsed", copts);
- $(window).trigger("cloud-sidebar-toggled", true);
- });
-
-- var state = $.cookie("sidebar");
- {% if theme_defaultcollapsed | tobool %}
- if(!state)
- state = "collapsed";
Copied: packages/cloud-sptheme/tags/1.6-1/debian/patches/0003-Remove-cookies-and-tracking.patch (from rev 27281, packages/cloud-sptheme/trunk/debian/patches/0003-Remove-cookies-and-tracking.patch)
===================================================================
--- packages/cloud-sptheme/tags/1.6-1/debian/patches/0003-Remove-cookies-and-tracking.patch (rev 0)
+++ packages/cloud-sptheme/tags/1.6-1/debian/patches/0003-Remove-cookies-and-tracking.patch 2014-01-18 21:19:51 UTC (rev 27322)
@@ -0,0 +1,89 @@
+Description: Remove cookies and tracking
+Author: Nicolas Dandrimont <olasd at debian.org>
+Forwarded: not-needed
+
+Index: cloud-sptheme-1.6/cloud_sptheme/themes/cloud/layout.html
+===================================================================
+--- cloud-sptheme-1.6.orig/cloud_sptheme/themes/cloud/layout.html 2013-09-22 00:00:12.000000000 +0200
++++ cloud-sptheme-1.6/cloud_sptheme/themes/cloud/layout.html 2014-01-11 06:55:28.820021614 +0100
+@@ -20,8 +20,7 @@
+ {% set reldelim2 = reldim2 is not defined and ' ' or reldelim2 %}
+
+ {# add script file to instrument collapsable sections and other features #}
+-{% set script_files = script_files + ['_static/jquery.cookie.js',
+- '_static/cloud.js'] %}
++{% set script_files = script_files + ['_static/cloud.js'] %}
+
+ {# add font stylesheets #}
+ {% set css_files = css_files + [theme_fontcssurl] %}
+@@ -58,38 +57,9 @@
+ {% block extrahead -%}
+ {{ super() }}
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+- {%- if theme_googleanalytics_id -%}
+-<script type="text/javascript">
+-var ga_enabled = !$.cookie('disable-ga');
+-if(ga_enabled){
+- var _gaq = _gaq || [];
+- _gaq.push(['_setAccount', '{{ theme_googleanalytics_id }}']);
+- _gaq.push(['_setCookiePath', '{{ theme_googleanalytics_path }}']);
+- _gaq.push(['_setDetectFlash', false]);
+- _gaq.push(['_trackPageview']);
+- (function() {
+- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+- })();
+-}
+-</script>
+- {%- endif %}
+ {%- endblock %}
+
+ {% block footer -%}
+ {{ super() }}
+- {%- if theme_googleanalytics_id -%}
+-<script type="text/javascript">
+- if(ga_enabled){
+- document.write("<div class=\"footer\">This page uses <a href=\"http://analytics.google.com\">Google Analytics</a> to collect statistics. ");
+- document.write("Click <button title=\"set cookie to disable analytics for this site\" class=\"link\" onclick=\"$.cookie('disable-ga', 'true', {expires: 3650, path: '{{ theme_googleanalytics_path }}'}); window.location.reload(); return false; \">here</button> to disable analytics for this site.");
+- document.write("</div>");
+- }else{
+- document.write("<div class=\"footer\">Google Analytics has been disabled. ");
+- document.write("Click <button title=\"set cookie to re-enable analytics for this site\" class=\"link\" onclick=\"$.cookie('disable-ga', null, {path: '{{ theme_googleanalytics_path }}'}); window.location.reload(); return false; \">here</button> to re-enable analytics for this site.");
+- };
+-</script>
+- {%- endif %}
+ <!-- cloud_sptheme 1.4 -->
+ {%- endblock %}
+Index: cloud-sptheme-1.6/cloud_sptheme/themes/cloud/static/cloud.js_t
+===================================================================
+--- cloud-sptheme-1.6.orig/cloud_sptheme/themes/cloud/static/cloud.js_t 2014-01-18 11:14:39.713457855 +0100
++++ cloud-sptheme-1.6/cloud_sptheme/themes/cloud/static/cloud.js_t 2014-01-18 11:16:18.337421275 +0100
+@@ -144,15 +144,11 @@
+
+ var show_btn = $('#sidebar-show', holder);
+ var hide_btn = $('#sidebar-hide', holder);
+- /* FIXME: when url_root is a relative path, this sets cookie in wrong spot.
+- need to detect relative roots, and combine with document.location.path */
+- var copts = { expires: 7, path: DOCUMENTATION_OPTIONS.url_root };
+
+ show_btn.click(function (){
+ doc.removeClass("collapsed-sidebar");
+ hide_btn.show();
+ show_btn.hide();
+- $.cookie("sidebar", "expanded", copts);
+ $(window).trigger("cloud-sidebar-toggled", false);
+ });
+
+@@ -160,11 +156,9 @@
+ doc.addClass("collapsed-sidebar");
+ show_btn.show();
+ hide_btn.hide();
+- $.cookie("sidebar", "collapsed", copts);
+ $(window).trigger("cloud-sidebar-toggled", true);
+ });
+
+- var state = $.cookie("sidebar");
+ {% if theme_defaultcollapsed | tobool %}
+ if(!state)
+ state = "collapsed";
Deleted: packages/cloud-sptheme/tags/1.6-1/debian/patches/0004-make_helper.py-python3-conversion.patch
===================================================================
--- packages/cloud-sptheme/trunk/debian/patches/0004-make_helper.py-python3-conversion.patch 2014-01-18 10:59:55 UTC (rev 27280)
+++ packages/cloud-sptheme/tags/1.6-1/debian/patches/0004-make_helper.py-python3-conversion.patch 2014-01-18 21:19:51 UTC (rev 27322)
@@ -1,92 +0,0 @@
-Index: cloud-sptheme-1.6/cloud_sptheme/make_helper.py
-===================================================================
---- cloud-sptheme-1.6.orig/cloud_sptheme/make_helper.py 2013-09-13 19:43:05.000000000 +0200
-+++ cloud-sptheme-1.6/cloud_sptheme/make_helper.py 2014-01-11 07:10:42.782169247 +0100
-@@ -6,6 +6,7 @@
- #imports
- #===============================================================
- #core
-+from __future__ import print_function
- import logging; log = logging.getLogger(__name__)
- import os,sys
- from string import Template
-@@ -150,16 +151,16 @@
- #targets
- #===============================================================
- def target_help(self):
-- print "Please use \`make <target>' where <target> is one of"
-- print " clean remove all compiled files"
-- print " html to make standalone HTML files"
-- print " servehtml to serve standalone HTML files on port 8000"
--# print " pickle to make pickle files"
--# print " json to make JSON files"
-- print " htmlhelp to make HTML files and a HTML help project"
--# print " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
--# print " changes to make an overview over all changed/added/deprecated items"
--# print " linkcheck to check all external links for integrity"
-+ print("Please use \`make <target>' where <target> is one of")
-+ print(" clean remove all compiled files")
-+ print(" html to make standalone HTML files")
-+ print(" servehtml to serve standalone HTML files on port 8000")
-+# print(" pickle to make pickle files")
-+# print(" json to make JSON files")
-+ print(" htmlhelp to make HTML files and a HTML help project")
-+# print(" latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter")
-+# print(" changes to make an overview over all changed/added/deprecated items")
-+# print(" linkcheck to check all external links for integrity")
-
- def target_clean(self):
- rmpath(self.BUILD)
-@@ -180,10 +181,17 @@
- from paste.urlparser import StaticURLParser
- except ImportError:
- # fall back to stdlib server
-- import SimpleHTTPServer as s
-+ if sys.version_info[0] >= 3:
-+ import http.server as s
-+ HTTPServer = s.HTTPServer
-+ else:
-+ import SimpleHTTPServer as s
-+ HTTPServer = s.BaseHTTPServer.HTTPServer
-+
- os.chdir(path)
-- print "Serving files from %r on port %r" % (path, port)
-- s.BaseHTTPServer.HTTPServer(('',port), s.SimpleHTTPRequestHandler).serve_forever()
-+ print("Serving files from %r on port %r" % (path, port))
-+
-+ HTTPServer(('',port), s.SimpleHTTPRequestHandler).serve_forever()
- else:
- serve(StaticURLParser(path), host="0.0.0.0", port=port)
-
-@@ -191,8 +199,8 @@
-
- ##def target_latex(self):
- ## build("latex")
-- ## print "Run \`make all-pdf' or \`make all-ps' in that directory to" \
-- ## "run these through (pdf)latex."
-+ ## print("Run \`make all-pdf' or \`make all-ps' in that directory to" \
-+ ## "run these through (pdf)latex.")
- ##
- ##def target_pdf():
- ## assert os.name == "posix", "pdf build support not automated for your os"
-@@ -200,7 +208,7 @@
- ## target = BUILD / "latex"
- ## target.chdir()
- ## subprocess.call(['make', 'all-pdf'])
-- ## print "pdf built"
-+ ## print("pdf built")
-
- #===============================================================
- #helpers
-@@ -217,9 +225,9 @@
-
- rc = subprocess.call([self.SPHINXBUILD, "-b", name] + ALLSPHINXOPTS + [ target ])
- if rc:
-- print "Sphinx-Build returned error, exiting."
-+ print("Sphinx-Build returned error, exiting.")
- sys.exit(rc)
-- print "Build finished. The %s pages are in %r." % (name, target,)
-+ print("Build finished. The %s pages are in %r." % (name, target,))
- return target
-
- def get_paper_opts(self):
Copied: packages/cloud-sptheme/tags/1.6-1/debian/patches/0004-make_helper.py-python3-conversion.patch (from rev 27281, packages/cloud-sptheme/trunk/debian/patches/0004-make_helper.py-python3-conversion.patch)
===================================================================
--- packages/cloud-sptheme/tags/1.6-1/debian/patches/0004-make_helper.py-python3-conversion.patch (rev 0)
+++ packages/cloud-sptheme/tags/1.6-1/debian/patches/0004-make_helper.py-python3-conversion.patch 2014-01-18 21:19:51 UTC (rev 27322)
@@ -0,0 +1,96 @@
+Description: Convert make_helper.py to python3 syntax
+Author: Nicolas Dandrimont <olasd at debian.org>
+Forwarded: https://bitbucket.org/ecollins/cloud_sptheme/pull-request/3/move-make_helperpy-to-python3-syntax
+
+Index: cloud-sptheme-1.6/cloud_sptheme/make_helper.py
+===================================================================
+--- cloud-sptheme-1.6.orig/cloud_sptheme/make_helper.py 2013-09-13 19:43:05.000000000 +0200
++++ cloud-sptheme-1.6/cloud_sptheme/make_helper.py 2014-01-11 07:10:42.782169247 +0100
+@@ -6,6 +6,7 @@
+ #imports
+ #===============================================================
+ #core
++from __future__ import print_function
+ import logging; log = logging.getLogger(__name__)
+ import os,sys
+ from string import Template
+@@ -150,16 +151,16 @@
+ #targets
+ #===============================================================
+ def target_help(self):
+- print "Please use \`make <target>' where <target> is one of"
+- print " clean remove all compiled files"
+- print " html to make standalone HTML files"
+- print " servehtml to serve standalone HTML files on port 8000"
+-# print " pickle to make pickle files"
+-# print " json to make JSON files"
+- print " htmlhelp to make HTML files and a HTML help project"
+-# print " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+-# print " changes to make an overview over all changed/added/deprecated items"
+-# print " linkcheck to check all external links for integrity"
++ print("Please use \`make <target>' where <target> is one of")
++ print(" clean remove all compiled files")
++ print(" html to make standalone HTML files")
++ print(" servehtml to serve standalone HTML files on port 8000")
++# print(" pickle to make pickle files")
++# print(" json to make JSON files")
++ print(" htmlhelp to make HTML files and a HTML help project")
++# print(" latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter")
++# print(" changes to make an overview over all changed/added/deprecated items")
++# print(" linkcheck to check all external links for integrity")
+
+ def target_clean(self):
+ rmpath(self.BUILD)
+@@ -180,10 +181,17 @@
+ from paste.urlparser import StaticURLParser
+ except ImportError:
+ # fall back to stdlib server
+- import SimpleHTTPServer as s
++ if sys.version_info[0] >= 3:
++ import http.server as s
++ HTTPServer = s.HTTPServer
++ else:
++ import SimpleHTTPServer as s
++ HTTPServer = s.BaseHTTPServer.HTTPServer
++
+ os.chdir(path)
+- print "Serving files from %r on port %r" % (path, port)
+- s.BaseHTTPServer.HTTPServer(('',port), s.SimpleHTTPRequestHandler).serve_forever()
++ print("Serving files from %r on port %r" % (path, port))
++
++ HTTPServer(('',port), s.SimpleHTTPRequestHandler).serve_forever()
+ else:
+ serve(StaticURLParser(path), host="0.0.0.0", port=port)
+
+@@ -191,8 +199,8 @@
+
+ ##def target_latex(self):
+ ## build("latex")
+- ## print "Run \`make all-pdf' or \`make all-ps' in that directory to" \
+- ## "run these through (pdf)latex."
++ ## print("Run \`make all-pdf' or \`make all-ps' in that directory to" \
++ ## "run these through (pdf)latex.")
+ ##
+ ##def target_pdf():
+ ## assert os.name == "posix", "pdf build support not automated for your os"
+@@ -200,7 +208,7 @@
+ ## target = BUILD / "latex"
+ ## target.chdir()
+ ## subprocess.call(['make', 'all-pdf'])
+- ## print "pdf built"
++ ## print("pdf built")
+
+ #===============================================================
+ #helpers
+@@ -217,9 +225,9 @@
+
+ rc = subprocess.call([self.SPHINXBUILD, "-b", name] + ALLSPHINXOPTS + [ target ])
+ if rc:
+- print "Sphinx-Build returned error, exiting."
++ print("Sphinx-Build returned error, exiting.")
+ sys.exit(rc)
+- print "Build finished. The %s pages are in %r." % (name, target,)
++ print("Build finished. The %s pages are in %r." % (name, target,))
+ return target
+
+ def get_paper_opts(self):
More information about the Python-modules-commits
mailing list