[vispy] 10/10: import the 0.3.0 version
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Sat Aug 30 17:17:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository vispy.
commit 401eb4c413a1d73017823f3e76a8114241e7dc54
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sat Aug 30 19:13:02 2014 +0200
import the 0.3.0 version
---
debian/changelog | 2 +-
debian/control | 7 +-
debian/copyright | 77 +++++++
.../0001-fix-the-documentation-compilation.patch | 43 ----
.../0002-use-the-latest-scikit-image-theme.patch | 222 ---------------------
debian/patches/series | 2 -
debian/rules | 2 +-
7 files changed, 85 insertions(+), 270 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c4d381f..a9f2eea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-vispy (0.2.1-1) unstable; urgency=low
+vispy (0.3.0-1) unstable; urgency=low
* Initial release (Closes: #XXXXXX)
diff --git a/debian/control b/debian/control
index 804afad..28f3c54 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,17 @@ Section: science
Priority: extra
Build-Depends: debhelper (>= 9),
dh-python,
+ libfontconfig1,
python-all,
+ python-nose,
python-numpy,
python-opengl,
python-setuptools,
python-sphinx,
python3-all,
+ python3-nose,
+ python3-numpy,
+ python3-opengl,
python3-setuptools
Standards-Version: 3.9.5
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/vispy.git
@@ -97,4 +102,4 @@ Description: OpenGL interactive scientific visualization (documentation)
OpenGL concepts and let you create beautiful visualizations in a few
lines of code. Stay tuned!
.
- This is the common documentation package.
\ No newline at end of file
+ This is the common documentation package.
diff --git a/debian/copyright b/debian/copyright
index 6246e14..bbc2768 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,83 @@ Files: *
Copyright: © 2013-2014, Vispy Development Team
License: BSD-3-clauses
+Files: codegen/headers/egl.h
+Copyright: (c) 2007-2009 The Khronos Group Inc.
+License: Expat
+
+Files: codegen/headers/webgl.idl
+Copyright: ???
+License: ???
+
+Files: doc/ext/numpydoc
+Copyright: ???
+License: ???
+
+Files: doc/themes/scikit-image
+Copyright: ???
+License: ???
+
+Files: examples/basics/scene/modular_shaders/editor.py
+ examples/demo/gloo/jfa/*
+ vispy/scene/visuals/text/_sdf.py
+Copyright:
+License: public-domain
+
+Files: vispy/ext/mpl*
+Copyright: (c) 2014, mpld3
+License: BSD-3-clauses
+
+Files: vispy/ext/png.py
+Copyright: (C) 2006 Johann C. Rocholl <johann at browsershots.org>
+ (C) 2009 David Jones <drj at pobox.com>
+ (C) 2006 Nicko van Someren <nicko at nicko.org>
+License: Expat
+
+
+Files: vispy/ext/py24_ordereddict.py
+Copyright: ???
+License: ???
+
+Files: vispy/ext/six.py
+Copyright: ???
+License: ???
+
+Files: vispy/gloo/gl/_*
+Copyright: AUTOGENERATED ??? howto regenerate
+License:
+
+Files: vispy/scene/visuals/line/vertex.py
+ vispy/scene/visuals/modular_line.py
+ vispy/scene/visuals/rectangle.py
+ vispy/scene/visuals/tests/test_*
+ vispy/scene/visuals/xyz_axis.py
+ vispy/scene/widgets/anchor.py
+ vispy/testing/__init__.py
+ vispy/testing/tests/test_testing.py
+ vispy/util/eq.py
+ vispy/util/tests/test_*
+Comment: no header or malformed header
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and/or associated documentation files (the
+ "Materials"), to deal in the Materials without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Materials, and to
+ permit persons to whom the Materials are furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Materials.
+ .
+ THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ AIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+
License: BSD-3-clauses
Vispy is licensed under the terms of the (new) BSD license:
.
diff --git a/debian/patches/0001-fix-the-documentation-compilation.patch b/debian/patches/0001-fix-the-documentation-compilation.patch
deleted file mode 100644
index 9892813..0000000
--- a/debian/patches/0001-fix-the-documentation-compilation.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Thu, 20 Feb 2014 11:05:08 +0100
-Subject: fix the documentation compilation
-
----
- doc/event.rst | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/doc/event.rst b/doc/event.rst
-index e9c1997..479f3ac 100644
---- a/doc/event.rst
-+++ b/doc/event.rst
-@@ -2,11 +2,11 @@
- The event module
- ================
-
--.. automodule:: vispy.event
-+.. automodule:: vispy.util.event
-
- ----
-
--.. autoclass:: vispy.event.Event
-+.. autoclass:: vispy.util.event.Event
- :members:
-
- .. autoclass:: vispy.app.canvas.MouseEvent
-@@ -24,13 +24,13 @@ The event module
-
- ----
-
--.. autoclass:: vispy.event.EventEmitter
-+.. autoclass:: vispy.util.event.EventEmitter
- :members:
-
-- .. automethod:: vispy.event.EventEmitter.__call__
-+ .. automethod:: vispy.util.event.EventEmitter.__call__
-
- ----
-
--.. autoclass:: vispy.event.EmitterGroup
-+.. autoclass:: vispy.util.event.EmitterGroup
- :members:
-
diff --git a/debian/patches/0002-use-the-latest-scikit-image-theme.patch b/debian/patches/0002-use-the-latest-scikit-image-theme.patch
deleted file mode 100644
index 2c4b9e9..0000000
--- a/debian/patches/0002-use-the-latest-scikit-image-theme.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Thu, 20 Feb 2014 15:06:50 +0100
-Subject: use the latest scikit-image theme
-
----
- doc/themes/scikit-image/layout.html | 12 ++++----
- doc/themes/scikit-image/search.html | 37 ++++++++++++++++--------
- doc/themes/scikit-image/static/css/custom.css | 21 +++++++++-----
- doc/themes/scikit-image/static/js/docversions.js | 21 --------------
- 4 files changed, 45 insertions(+), 46 deletions(-)
- delete mode 100644 doc/themes/scikit-image/static/js/docversions.js
-
-diff --git a/doc/themes/scikit-image/layout.html b/doc/themes/scikit-image/layout.html
-index 1c6163a..58424f2 100644
---- a/doc/themes/scikit-image/layout.html
-+++ b/doc/themes/scikit-image/layout.html
-@@ -2,7 +2,8 @@
- scikit-image/layout.html
- ~~~~~~~~~~~~~~~~~
-
-- Sphinx layout template for the scikit-image theme
-+ Sphinx layout template for the scikit-image theme, written by
-+ Johannes Schönberger.
-
- #}
-
-@@ -74,18 +75,18 @@
- <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
- {%- endif %}
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-- <link rel="shortcut icon" href="http://vispy.org/_static/favicon.ico">
-+ <link rel="shortcut icon" href="{{ pathto('_static/', 1) }}favicon.ico">
- {%- block extrahead %}{% endblock %}
- </head>
- <body class="container">
-- <a href="http://vispy.org" class="logo"><img src="http://vispy.org/_static/img/logo.png" alt=""></a>
-+ <a href="http://scikit-image.org" class="logo"><img src="{{ pathto('_static/', 1) }}img/logo.png" alt=""></a>
- <div class="clearfix"></div>
- <div class="navbar">
- <div class="navbar-inner">
- <ul class="nav">
- {% include 'navbar.html' %}
- </ul>
-- <form class="navbar-form pull-right" action="search.html" method="get">
-+ <form class="navbar-form pull-right" action="{{ pathto('search') }}" method="get">
- <input type="text" class="search span3" name="q" placeholder="Search documentation ...">
- <input type="hidden" name="check_keywords" value="yes" >
- <input type="hidden" name="area" value="default" >
-@@ -104,9 +105,8 @@
- </div>
- <div class="well footer">
- <small>
-- © Copyright the vispy development team.
-+ © Copyright the scikit-image development team.
- Created using <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> and <a href="http://sphinx.pocoo.org/">Sphinx</a>.
-- Theme by <a href="http://scikit-image.org/">scikit-image</a>.
- </small>
- </div>
- </body>
-diff --git a/doc/themes/scikit-image/search.html b/doc/themes/scikit-image/search.html
-index 3a723ef..3697b60 100644
---- a/doc/themes/scikit-image/search.html
-+++ b/doc/themes/scikit-image/search.html
-@@ -4,20 +4,25 @@
-
- Template for the search page.
-
-- :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
-+ :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
- :license: BSD, see LICENSE for details.
- #}
--{% extends "layout.html" %}
-+{%- extends "layout.html" %}
- {% set title = _('Search') %}
- {% set script_files = script_files + ['_static/searchtools.js'] %}
--{% set script_files = script_files + ['searchindex.js'] %}
-+{% block extrahead %}
-+ <script type="text/javascript">
-+ jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
-+ </script>
-+ {# this is used when loading the search index using $.ajax fails,
-+ such as on Chrome for documents on localhost #}
-+ <script type="text/javascript" id="searchindexloader"></script>
-+ {{ super() }}
-+{% endblock %}
- {% block body %}
- <h1 id="search-documentation">{{ _('Search') }}</h1>
- <div id="fallback" class="admonition warning">
-- <script type="text/javascript">
-- $('#fallback').hide();
-- $("input.search").focus();
-- </script>
-+ <script type="text/javascript">$('#fallback').hide();</script>
- <p>
- {% trans %}Please activate JavaScript to enable the search
- functionality.{% endtrans %}
-@@ -25,22 +30,30 @@
- </div>
- <p>
- {% trans %}From here you can search these documents. Enter your search
-- words into the box in the navigation bar and press "Enter". Note that the
-- search function will automatically search for all of the words. Pages
-+ words into the box below and click "search". Note that the search
-+ function will automatically search for all of the words. Pages
- containing fewer words won't appear in the result list.{% endtrans %}
- </p>
-+ <form action="" method="get">
-+ <input type="text" name="q" value="" />
-+ <input type="submit" value="{{ _('search') }}" />
-+ <span id="search-progress" style="padding-left: 10px"></span>
-+ </form>
- {% if search_performed %}
-+ <h2>{{ _('Search Results') }}</h2>
- {% if not search_results %}
-- <p>{{ _('Your search did not match any results.') }}</p>
-+ <p>{{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}</p>
- {% endif %}
- {% endif %}
- <div id="search-results">
- {% if search_results %}
- <ul>
- {% for href, caption, context in search_results %}
-- <li class="well"><a href="{{ pathto(item.href) }}">{{ caption }}</a></li>
-+ <li><a href="{{ pathto(item.href) }}">{{ caption }}</a>
-+ <div class="context">{{ context|e }}</div>
-+ </li>
- {% endfor %}
- </ul>
- {% endif %}
- </div>
--{% endblock %}
-\ No newline at end of file
-+{% endblock %}
-diff --git a/doc/themes/scikit-image/static/css/custom.css b/doc/themes/scikit-image/static/css/custom.css
-index 2d64dbb..0a2d313 100644
---- a/doc/themes/scikit-image/static/css/custom.css
-+++ b/doc/themes/scikit-image/static/css/custom.css
-@@ -41,6 +41,12 @@ h6 {
- font-size: 13px;
- line-height: 15px;
- }
-+blockquote {
-+ border-left: 0;
-+}
-+dt {
-+ font-weight: normal;
-+}
-
- .logo {
- float: left;
-@@ -51,21 +57,18 @@ h6 {
- }
-
- .hero {
-- padding: 10px 25px 15px 25px;
-+ padding: 10px 25px;
- }
-
- .gallery-random {
- float: right;
- line-height: 180px;
-- margin-left: 10px;
- }
- .gallery-random img {
- max-height: 180px;
-- max-width: 180px;
- }
-
- .coins-sample {
-- float: left;
- padding: 5px;
- }
-
-@@ -76,6 +79,10 @@ h6 {
- padding-left: 15px;
- }
-
-+#current {
-+ font-weight: bold;
-+}
-+
- .headerlink {
- margin-left: 10px;
- color: #ddd;
-@@ -226,7 +233,7 @@ p.admonition-title {
- text-align: center !important;
- }
-
--.summary-box {
-- /* Should derive width from span8 */
-- width: 640px;
-+/* misc */
-+div.math {
-+ text-align: center;
- }
-diff --git a/doc/themes/scikit-image/static/js/docversions.js b/doc/themes/scikit-image/static/js/docversions.js
-deleted file mode 100644
-index 951ce3e..0000000
---- a/doc/themes/scikit-image/static/js/docversions.js
-+++ /dev/null
-@@ -1,21 +0,0 @@
--var versions = ['latest', 'v0.1.0'];
--
--function insert_version_links() {
-- for (i = 0; i < versions.length; i++){
-- open_list = '<li>'
-- if (typeof(DOCUMENTATION_OPTIONS) !== 'undefined') {
-- if ((DOCUMENTATION_OPTIONS['VERSION'] == versions[i]) ||
-- (DOCUMENTATION_OPTIONS['VERSION'].match(/dev$/) && (i == 0))) {
-- open_list = '<li id="current">'
-- }
-- }
-- document.write(open_list);
-- document.write('<a href="URL">vispy VERSION</a> </li>\n'
-- .replace('VERSION', versions[i])
-- .replace('URL', 'http://api.vispy.org/en/' + versions[i]));
-- }
--}
--
--function stable_version() {
-- return versions[1];
--}
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fbbf73c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-fix-the-documentation-compilation.patch
-0002-use-the-latest-scikit-image-theme.patch
diff --git a/debian/rules b/debian/rules
index c7d1f6e..f480520 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export DH_VERBOSE=1
export PYBUILD_NAME=vispy
%:
- dh $@ --with python2,sphinxdoc --buildsystem=pybuild
+ dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
override_dh_install:
dh_install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vispy.git
More information about the debian-science-commits
mailing list