[sfepy] 01/06: Fix the computation of "top_dir" in version.py. (Closes: #857491)
Anton Gladky
gladk at moszumanska.debian.org
Thu Oct 5 16:40:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository sfepy.
commit cde99971255c1bd09bafb6c3c5977b0074ff4cdb
Author: Anton Gladky <gladk at debian.org>
Date: Thu Oct 5 18:13:59 2017 +0200
Fix the computation of "top_dir" in version.py. (Closes: #857491)
---
debian/patches/10_fix_path_in_version.patch | 496 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 497 insertions(+)
diff --git a/debian/patches/10_fix_path_in_version.patch b/debian/patches/10_fix_path_in_version.patch
new file mode 100644
index 0000000..fa5d747
--- /dev/null
+++ b/debian/patches/10_fix_path_in_version.patch
@@ -0,0 +1,496 @@
+Description: Fix the computation of "top_dir" in version.py
+Author: Anton Gladky <gladk at debian.org>, Steve M. Robbins <smr at debian.org>
+Bug-Debian: https://bugs.debian.org/857491
+Last-Update: 2017-10-05
+
+Index: sfepy/sfepy/version.py
+===================================================================
+--- sfepy.orig/sfepy/version.py
++++ sfepy/sfepy/version.py
+@@ -27,7 +27,7 @@ def get_basic_info(version=__version__):
+ from sfepy import Config
+
+ # If installed, up_dir is '.', otherwise (in (git) source directory) '..'.
+- for up_dir in ['..', '.']:
++ for up_dir in ['.']:
+ top_dir = op.normpath(op.realpath(op.join(op.dirname(__file__),
+ up_dir)))
+ aux = op.join(top_dir, 'README')
+Index: sfepy/doc/_templates/layout.html
+===================================================================
+--- sfepy.orig/doc/_templates/layout.html
++++ sfepy/doc/_templates/layout.html
+@@ -35,4 +35,17 @@
+
+ {% block footer %}
+ {{ super() }}
++<div class="footer">This page uses <a href="http://analytics.google.com/">
++Google Analytics</a> to collect statistics. You can disable it by blocking
++the JavaScript coming from www.google-analytics.com.
++<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>
++</div>
+ {% endblock %}
+Index: sfepy/doc/gallery_template.html
+===================================================================
+--- sfepy.orig/doc/gallery_template.html
++++ sfepy/doc/gallery_template.html
+@@ -96,5 +96,18 @@
+ © Copyright 2010, Robert Cimrman and Contributors.
+ Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+ </div>
++<div class="footer">This page uses <a href="http://analytics.google.com/">
++Google Analytics</a> to collect statistics. You can disable it by blocking
++the JavaScript coming from www.google-analytics.com.
++<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>
++</div>
+
+ </body>
+Index: sfepy/meshes/various_formats/abaqus_quad.inp
+===================================================================
+--- sfepy.orig/meshes/various_formats/abaqus_quad.inp
++++ sfepy/meshes/various_formats/abaqus_quad.inp
+@@ -1,60 +1,60 @@
+-*Node
+- 1, 60., 0.
+- 2, 75., 0.
+- 3, 53.0330086, 53.0330086
+- 4, 48.2411499, 47.9710274
+- 5, 0., 75.
+- 6, 0., 60.
+- 7, 0., 0.
+- 8, 73.5588989, 14.6317739
+- 9, 69.2909622, 28.7012577
+- 10, 62.3602219, 41.6677666
+- 11, 52.0034637, 39.2650528
+- 12, 55.7918892, 27.3612633
+- 13, 58.3873405, 13.9944496
+- 14, 41.6677666, 62.3602219
+- 15, 28.7012577, 69.2909622
+- 16, 14.6317739, 73.5588989
+- 17, 13.8155003, 58.7185974
+- 18, 27.4312401, 55.7661057
+- 19, 39.5681763, 51.6348419
+- 20, 0., 45.
+- 21, 0., 30.
+- 22, 0., 15.
+- 23, 15., 0.
+- 24, 30., 0.
+- 25, 45., 0.
+- 26, 14.1053638, 44.1662369
+- 27, 14.6026917, 29.5059052
+- 28, 14.8809643, 14.7415533
+- 29, 27.9379501, 42.322258
+- 30, 28.8701019, 28.4671135
+- 31, 29.4874115, 14.298357
+- 32, 40.6320496, 40.2005348
+- 33, 42.3731537, 27.503418
+- 34, 43.8119774, 13.9490557
+-*Element, type=CPS4R
+- 1, 1, 2, 8, 13
+- 2, 13, 8, 9, 12
+- 3, 12, 9, 10, 11
+- 4, 11, 10, 3, 4
+- 5, 3, 14, 19, 4
+- 6, 14, 15, 18, 19
+- 7, 15, 16, 17, 18
+- 8, 16, 5, 6, 17
+- 9, 6, 20, 26, 17
+-10, 20, 21, 27, 26
+-11, 21, 22, 28, 27
+-12, 22, 7, 23, 28
+-13, 17, 26, 29, 18
+-14, 26, 27, 30, 29
+-15, 27, 28, 31, 30
+-16, 28, 23, 24, 31
+-17, 18, 29, 32, 19
+-18, 29, 30, 33, 32
+-19, 30, 31, 34, 33
+-20, 31, 24, 25, 34
+-21, 19, 32, 11, 4
+-22, 32, 33, 12, 11
+-23, 33, 34, 13, 12
+-24, 34, 25, 1, 13
++*Node
++ 1, 60., 0.
++ 2, 75., 0.
++ 3, 53.0330086, 53.0330086
++ 4, 48.2411499, 47.9710274
++ 5, 0., 75.
++ 6, 0., 60.
++ 7, 0., 0.
++ 8, 73.5588989, 14.6317739
++ 9, 69.2909622, 28.7012577
++ 10, 62.3602219, 41.6677666
++ 11, 52.0034637, 39.2650528
++ 12, 55.7918892, 27.3612633
++ 13, 58.3873405, 13.9944496
++ 14, 41.6677666, 62.3602219
++ 15, 28.7012577, 69.2909622
++ 16, 14.6317739, 73.5588989
++ 17, 13.8155003, 58.7185974
++ 18, 27.4312401, 55.7661057
++ 19, 39.5681763, 51.6348419
++ 20, 0., 45.
++ 21, 0., 30.
++ 22, 0., 15.
++ 23, 15., 0.
++ 24, 30., 0.
++ 25, 45., 0.
++ 26, 14.1053638, 44.1662369
++ 27, 14.6026917, 29.5059052
++ 28, 14.8809643, 14.7415533
++ 29, 27.9379501, 42.322258
++ 30, 28.8701019, 28.4671135
++ 31, 29.4874115, 14.298357
++ 32, 40.6320496, 40.2005348
++ 33, 42.3731537, 27.503418
++ 34, 43.8119774, 13.9490557
++*Element, type=CPS4R
++ 1, 1, 2, 8, 13
++ 2, 13, 8, 9, 12
++ 3, 12, 9, 10, 11
++ 4, 11, 10, 3, 4
++ 5, 3, 14, 19, 4
++ 6, 14, 15, 18, 19
++ 7, 15, 16, 17, 18
++ 8, 16, 5, 6, 17
++ 9, 6, 20, 26, 17
++10, 20, 21, 27, 26
++11, 21, 22, 28, 27
++12, 22, 7, 23, 28
++13, 17, 26, 29, 18
++14, 26, 27, 30, 29
++15, 27, 28, 31, 30
++16, 28, 23, 24, 31
++17, 18, 29, 32, 19
++18, 29, 30, 33, 32
++19, 30, 31, 34, 33
++20, 31, 24, 25, 34
++21, 19, 32, 11, 4
++22, 32, 33, 12, 11
++23, 33, 34, 13, 12
++24, 34, 25, 1, 13
+Index: sfepy/meshes/various_formats/abaqus_quad_tri.inp
+===================================================================
+--- sfepy.orig/meshes/various_formats/abaqus_quad_tri.inp
++++ sfepy/meshes/various_formats/abaqus_quad_tri.inp
+@@ -1,65 +1,65 @@
+-*Node
+- 1, 60., 0.
+- 2, 75., 0.
+- 3, 53.0330086, 53.0330086
+- 4, 48.2411499, 47.9710274
+- 5, 0., 75.
+- 6, 0., 60.
+- 7, 0., 0.
+- 8, 73.5588989, 14.6317739
+- 9, 69.2909622, 28.7012577
+- 10, 62.3602219, 41.6677666
+- 11, 52.0034637, 39.2650528
+- 12, 55.7918892, 27.3612633
+- 13, 58.3873405, 13.9944496
+- 14, 41.6677666, 62.3602219
+- 15, 28.7012577, 69.2909622
+- 16, 14.6317739, 73.5588989
+- 17, 13.8155003, 58.7185974
+- 18, 27.4312401, 55.7661057
+- 19, 39.5681763, 51.6348419
+- 20, 0., 45.
+- 21, 0., 30.
+- 22, 0., 15.
+- 23, 15., 0.
+- 24, 30., 0.
+- 25, 45., 0.
+- 26, 14.1053638, 44.1662369
+- 27, 14.6026917, 29.5059052
+- 28, 14.8809643, 14.7415533
+- 29, 27.9379501, 42.322258
+- 30, 28.8701019, 28.4671135
+- 31, 29.4874115, 14.298357
+- 32, 40.6320496, 40.2005348
+- 33, 42.3731537, 27.503418
+- 34, 43.8119774, 13.9490557
+-*Element, type=CPS4
+- 1, 1, 2, 8, 13
+- 2, 13, 8, 9, 12
+- 3, 12, 9, 10, 11
+- 4, 11, 10, 3, 4
+- 5, 3, 14, 19, 4
+- 6, 14, 15, 18, 19
+- 7, 15, 16, 17, 18
+- 8, 16, 5, 6, 17
+- 9, 6, 20, 26, 17
+-10, 20, 21, 27, 26
+-11, 21, 22, 28, 27
+-12, 17, 26, 29, 18
+-13, 26, 27, 30, 29
+-14, 28, 23, 24, 31
+-15, 18, 29, 32, 19
+-16, 30, 31, 34, 33
+-17, 31, 24, 25, 34
+-18, 32, 33, 12, 11
+-19, 33, 34, 13, 12
+-20, 34, 25, 1, 13
+-*Element, type=CPS3
+-21, 32, 4, 19
+-22, 4, 32, 11
+-23, 30, 32, 29
+-24, 32, 30, 33
+-25, 28, 30, 27
+-26, 30, 28, 31
+-27, 7, 28, 22
+-28, 28, 7, 23
++*Node
++ 1, 60., 0.
++ 2, 75., 0.
++ 3, 53.0330086, 53.0330086
++ 4, 48.2411499, 47.9710274
++ 5, 0., 75.
++ 6, 0., 60.
++ 7, 0., 0.
++ 8, 73.5588989, 14.6317739
++ 9, 69.2909622, 28.7012577
++ 10, 62.3602219, 41.6677666
++ 11, 52.0034637, 39.2650528
++ 12, 55.7918892, 27.3612633
++ 13, 58.3873405, 13.9944496
++ 14, 41.6677666, 62.3602219
++ 15, 28.7012577, 69.2909622
++ 16, 14.6317739, 73.5588989
++ 17, 13.8155003, 58.7185974
++ 18, 27.4312401, 55.7661057
++ 19, 39.5681763, 51.6348419
++ 20, 0., 45.
++ 21, 0., 30.
++ 22, 0., 15.
++ 23, 15., 0.
++ 24, 30., 0.
++ 25, 45., 0.
++ 26, 14.1053638, 44.1662369
++ 27, 14.6026917, 29.5059052
++ 28, 14.8809643, 14.7415533
++ 29, 27.9379501, 42.322258
++ 30, 28.8701019, 28.4671135
++ 31, 29.4874115, 14.298357
++ 32, 40.6320496, 40.2005348
++ 33, 42.3731537, 27.503418
++ 34, 43.8119774, 13.9490557
++*Element, type=CPS4
++ 1, 1, 2, 8, 13
++ 2, 13, 8, 9, 12
++ 3, 12, 9, 10, 11
++ 4, 11, 10, 3, 4
++ 5, 3, 14, 19, 4
++ 6, 14, 15, 18, 19
++ 7, 15, 16, 17, 18
++ 8, 16, 5, 6, 17
++ 9, 6, 20, 26, 17
++10, 20, 21, 27, 26
++11, 21, 22, 28, 27
++12, 17, 26, 29, 18
++13, 26, 27, 30, 29
++14, 28, 23, 24, 31
++15, 18, 29, 32, 19
++16, 30, 31, 34, 33
++17, 31, 24, 25, 34
++18, 32, 33, 12, 11
++19, 33, 34, 13, 12
++20, 34, 25, 1, 13
++*Element, type=CPS3
++21, 32, 4, 19
++22, 4, 32, 11
++23, 30, 32, 29
++24, 32, 30, 33
++25, 28, 30, 27
++26, 30, 28, 31
++27, 7, 28, 22
++28, 28, 7, 23
+Index: sfepy/meshes/various_formats/abaqus_tri.inp
+===================================================================
+--- sfepy.orig/meshes/various_formats/abaqus_tri.inp
++++ sfepy/meshes/various_formats/abaqus_tri.inp
+@@ -1,84 +1,84 @@
+-*Node
+- 1, 60., 0.
+- 2, 75., 0.
+- 3, 53.0330086, 53.0330086
+- 4, 48.2411499, 47.9710274
+- 5, 0., 75.
+- 6, 0., 60.
+- 7, 0., 0.
+- 8, 73.5588989, 14.6317739
+- 9, 69.2909622, 28.7012577
+- 10, 62.3602219, 41.6677666
+- 11, 52.0034637, 39.2650528
+- 12, 55.7918892, 27.3612633
+- 13, 58.3873405, 13.9944496
+- 14, 41.6677666, 62.3602219
+- 15, 28.7012577, 69.2909622
+- 16, 14.6317739, 73.5588989
+- 17, 13.8155003, 58.7185974
+- 18, 27.4312401, 55.7661057
+- 19, 39.5681763, 51.6348419
+- 20, 0., 45.
+- 21, 0., 30.
+- 22, 0., 15.
+- 23, 15., 0.
+- 24, 30., 0.
+- 25, 45., 0.
+- 26, 14.1053638, 44.1662369
+- 27, 14.6026917, 29.5059052
+- 28, 14.8809643, 14.7415533
+- 29, 27.9379501, 42.322258
+- 30, 28.8701019, 28.4671135
+- 31, 29.4874115, 14.298357
+- 32, 40.6320496, 40.2005348
+- 33, 42.3731537, 27.503418
+- 34, 43.8119774, 13.9490557
+-*Element, type=CPS3
+- 1, 1, 2, 8
+- 2, 8, 13, 1
+- 3, 13, 8, 9
+- 4, 9, 12, 13
+- 5, 12, 9, 10
+- 6, 10, 11, 12
+- 7, 11, 10, 4
+- 8, 10, 3, 4
+- 9, 3, 14, 4
+-10, 14, 19, 4
+-11, 14, 15, 18
+-12, 18, 19, 14
+-13, 15, 16, 17
+-14, 17, 18, 15
+-15, 16, 5, 6
+-16, 6, 17, 16
+-17, 6, 20, 17
+-18, 20, 26, 17
+-19, 20, 21, 26
+-20, 21, 27, 26
+-21, 21, 22, 27
+-22, 22, 28, 27
+-23, 22, 7, 28
+-24, 7, 23, 28
+-25, 17, 26, 18
+-26, 26, 29, 18
+-27, 26, 27, 29
+-28, 27, 30, 29
+-29, 27, 28, 30
+-30, 28, 31, 30
+-31, 28, 23, 31
+-32, 23, 24, 31
+-33, 18, 29, 19
+-34, 29, 32, 19
+-35, 29, 30, 32
+-36, 30, 33, 32
+-37, 30, 31, 33
+-38, 31, 34, 33
+-39, 31, 24, 34
+-40, 24, 25, 34
+-41, 19, 32, 4
+-42, 32, 11, 4
+-43, 32, 33, 11
+-44, 33, 12, 11
+-45, 33, 34, 12
+-46, 34, 13, 12
+-47, 34, 25, 13
+-48, 25, 1, 13
++*Node
++ 1, 60., 0.
++ 2, 75., 0.
++ 3, 53.0330086, 53.0330086
++ 4, 48.2411499, 47.9710274
++ 5, 0., 75.
++ 6, 0., 60.
++ 7, 0., 0.
++ 8, 73.5588989, 14.6317739
++ 9, 69.2909622, 28.7012577
++ 10, 62.3602219, 41.6677666
++ 11, 52.0034637, 39.2650528
++ 12, 55.7918892, 27.3612633
++ 13, 58.3873405, 13.9944496
++ 14, 41.6677666, 62.3602219
++ 15, 28.7012577, 69.2909622
++ 16, 14.6317739, 73.5588989
++ 17, 13.8155003, 58.7185974
++ 18, 27.4312401, 55.7661057
++ 19, 39.5681763, 51.6348419
++ 20, 0., 45.
++ 21, 0., 30.
++ 22, 0., 15.
++ 23, 15., 0.
++ 24, 30., 0.
++ 25, 45., 0.
++ 26, 14.1053638, 44.1662369
++ 27, 14.6026917, 29.5059052
++ 28, 14.8809643, 14.7415533
++ 29, 27.9379501, 42.322258
++ 30, 28.8701019, 28.4671135
++ 31, 29.4874115, 14.298357
++ 32, 40.6320496, 40.2005348
++ 33, 42.3731537, 27.503418
++ 34, 43.8119774, 13.9490557
++*Element, type=CPS3
++ 1, 1, 2, 8
++ 2, 8, 13, 1
++ 3, 13, 8, 9
++ 4, 9, 12, 13
++ 5, 12, 9, 10
++ 6, 10, 11, 12
++ 7, 11, 10, 4
++ 8, 10, 3, 4
++ 9, 3, 14, 4
++10, 14, 19, 4
++11, 14, 15, 18
++12, 18, 19, 14
++13, 15, 16, 17
++14, 17, 18, 15
++15, 16, 5, 6
++16, 6, 17, 16
++17, 6, 20, 17
++18, 20, 26, 17
++19, 20, 21, 26
++20, 21, 27, 26
++21, 21, 22, 27
++22, 22, 28, 27
++23, 22, 7, 28
++24, 7, 23, 28
++25, 17, 26, 18
++26, 26, 29, 18
++27, 26, 27, 29
++28, 27, 30, 29
++29, 27, 28, 30
++30, 28, 31, 30
++31, 28, 23, 31
++32, 23, 24, 31
++33, 18, 29, 19
++34, 29, 32, 19
++35, 29, 30, 32
++36, 30, 33, 32
++37, 30, 31, 33
++38, 31, 34, 33
++39, 31, 24, 34
++40, 24, 25, 34
++41, 19, 32, 4
++42, 32, 11, 4
++43, 32, 33, 11
++44, 33, 12, 11
++45, 33, 34, 12
++46, 34, 13, 12
++47, 34, 25, 13
++48, 25, 1, 13
diff --git a/debian/patches/series b/debian/patches/series
index b4e6505..7a996e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_remove_google_analytics.patch
+10_fix_path_in_version.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sfepy.git
More information about the debian-science-commits
mailing list