[adios] 70/207: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository adios.
commit b48f37070e652d07b71c38b834a873677aa17a16
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Dec 9 19:20:05 2013 +0000
refresh patches
---
debian/patches/debian_paths.patch | 18 +++----
debian/patches/mpi_in_place.patch | 16 +++---
debian/patches/netcdf-fix.patch | 10 ++--
debian/patches/python3.patch | 108 +++++++++++++++++++-------------------
debian/patches/security.patch | 14 ++---
5 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/debian/patches/debian_paths.patch b/debian/patches/debian_paths.patch
index dc34ac8..0f44283 100644
--- a/debian/patches/debian_paths.patch
+++ b/debian/patches/debian_paths.patch
@@ -3,11 +3,11 @@ Description: Change paths to match Debian and FHS
Forwarded: no
Last-Updated: 2013-12-09
-Index: adios-1.5.0/utils/skel/lib/skel_makefile.py
+Index: adios.git/utils/skel/lib/skel_makefile.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_makefile.py 2013-12-09 17:27:34.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_makefile.py 2013-12-09 18:35:34.000000000 +0000
-@@ -32,7 +32,7 @@
+--- adios.git.orig/utils/skel/lib/skel_makefile.py 2013-12-09 19:19:02.000000000 +0000
++++ adios.git/utils/skel/lib/skel_makefile.py 2013-12-09 19:19:02.000000000 +0000
+@@ -34,7 +34,7 @@
makefile_template_name = '~/.skel/templates/Makefile.default.tpl'
makefile_template = open(os.path.expanduser(makefile_template_name), 'r')
@@ -16,7 +16,7 @@ Index: adios-1.5.0/utils/skel/lib/skel_makefile.py
for template_line in makefile_template:
-@@ -70,10 +70,10 @@
+@@ -72,10 +72,10 @@
# Makefile generation no longer depends on the target, just using default here.
#makefile_template_name = os.path.dirname (sys.argv[0]) + '/../etc/skel/templates/Makefile.' + platform + '.tpl'
@@ -29,16 +29,16 @@ Index: adios-1.5.0/utils/skel/lib/skel_makefile.py
for template_line in makefile_template:
-Index: adios-1.5.0/utils/skel/lib/skel_settings.py
+Index: adios.git/utils/skel/lib/skel_settings.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_settings.py 2013-12-09 17:27:34.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_settings.py 2013-12-09 18:36:28.000000000 +0000
+--- adios.git.orig/utils/skel/lib/skel_settings.py 2013-12-09 19:19:02.000000000 +0000
++++ adios.git/utils/skel/lib/skel_settings.py 2013-12-09 19:19:40.000000000 +0000
@@ -54,7 +54,7 @@
skel_settings_dir_name = os.path.expanduser ('~/.skel')
if not os.path.exists (skel_settings_dir_name):
bindir = os.path.dirname (sys.argv[0])
- shutil.copytree (bindir + '/../etc/skel', skel_settings_dir_name)
+ shutil.copytree ('/etc/adios/skel', skel_settings_dir_name)
- print 'Created ' + skel_settings_dir_name
+ print('Created ' + skel_settings_dir_name)
diff --git a/debian/patches/mpi_in_place.patch b/debian/patches/mpi_in_place.patch
index 23cb42f..9ae27d7 100644
--- a/debian/patches/mpi_in_place.patch
+++ b/debian/patches/mpi_in_place.patch
@@ -3,11 +3,11 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2013-04-10
Forwarded: no
-Index: adios-1.4.1/src/write/adios_mpi_lustre.c
+Index: adios.git/src/write/adios_mpi_lustre.c
===================================================================
---- adios-1.4.1.orig/src/write/adios_mpi_lustre.c 2013-04-08 19:30:12.000000000 +0100
-+++ adios-1.4.1/src/write/adios_mpi_lustre.c 2013-04-10 11:24:30.000000000 +0100
-@@ -842,7 +842,11 @@
+--- adios.git.orig/src/write/adios_mpi_lustre.c 2013-12-09 18:44:57.000000000 +0000
++++ adios.git/src/write/adios_mpi_lustre.c 2013-12-09 18:44:57.000000000 +0000
+@@ -744,7 +744,11 @@
,fd->group->name, md->old_pg_root
);
MPI_Scatter (offsets, 3, MPI_LONG_LONG
@@ -19,7 +19,7 @@ Index: adios-1.4.1/src/write/adios_mpi_lustre.c
,0, md->group_comm
);
md->b.read_pg_offset = offsets [0];
-@@ -936,7 +940,11 @@
+@@ -838,7 +842,11 @@
else
offsets [0] = fd->write_size_bytes;
@@ -31,7 +31,7 @@ Index: adios-1.4.1/src/write/adios_mpi_lustre.c
,offsets, 1, MPI_LONG_LONG
,0, md->group_comm
);
-@@ -959,7 +967,11 @@
+@@ -861,7 +869,11 @@
md->b.pg_index_offset = offsets [md->size - 1]
+ last_offset;
MPI_Scatter (offsets, 1, MPI_LONG_LONG
@@ -43,7 +43,7 @@ Index: adios-1.4.1/src/write/adios_mpi_lustre.c
,0, md->group_comm
);
fd->base_offset = offsets [0];
-@@ -1238,7 +1250,11 @@
+@@ -1140,7 +1152,11 @@
else
offsets [0] = fd->write_size_bytes;
@@ -55,7 +55,7 @@ Index: adios-1.4.1/src/write/adios_mpi_lustre.c
,offsets, 1, MPI_LONG_LONG
,0, md->group_comm
);
-@@ -1254,7 +1270,11 @@
+@@ -1156,7 +1172,11 @@
md->b.pg_index_offset = offsets [md->size - 1]
+ last_offset;
MPI_Scatter (offsets, 1, MPI_LONG_LONG
diff --git a/debian/patches/netcdf-fix.patch b/debian/patches/netcdf-fix.patch
index 280073b..c4b182d 100644
--- a/debian/patches/netcdf-fix.patch
+++ b/debian/patches/netcdf-fix.patch
@@ -4,11 +4,11 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662995
Forwarded: no
Last-Updated: 2012-03-09
-Index: adios-1.3/utils/bp2ncd/Makefile.in
+Index: adios.git/utils/bp2ncd/Makefile.in
===================================================================
---- adios-1.3.orig/utils/bp2ncd/Makefile.in 2012-03-09 16:24:05.000000000 +0000
-+++ adios-1.3/utils/bp2ncd/Makefile.in 2012-03-09 16:57:37.000000000 +0000
-@@ -92,12 +92,12 @@
+--- adios.git.orig/utils/bp2ncd/Makefile.in 2013-12-09 18:45:09.000000000 +0000
++++ adios.git/utils/bp2ncd/Makefile.in 2013-12-09 18:45:08.000000000 +0000
+@@ -98,12 +98,12 @@
ACLOCAL = @ACLOCAL@
ADIOSLIB_CFLAGS = @ADIOSLIB_CFLAGS@
ADIOSLIB_CPPFLAGS = @ADIOSLIB_CPPFLAGS@
@@ -23,7 +23,7 @@ Index: adios-1.3/utils/bp2ncd/Makefile.in
ADIOSLIB_LDFLAGS = @ADIOSLIB_LDFLAGS@
ADIOSLIB_SEQ_CFLAGS = @ADIOSLIB_SEQ_CFLAGS@
ADIOSLIB_SEQ_CPPFLAGS = @ADIOSLIB_SEQ_CPPFLAGS@
-@@ -324,7 +324,7 @@
+@@ -325,7 +325,7 @@
@USE_PARALLEL_COMPILER_TRUE at bp2ncd_LDFLAGS = $(ADIOSLIB_LDFLAGS) -static-libtool-libs
@USE_PARALLEL_COMPILER_FALSE at bp2ncd_LDADD = $(top_builddir)/src/libadios_internal_nompi.a \
@USE_PARALLEL_COMPILER_FALSE@ $(ADIOSLIB_INT_LDADD)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index ecde8b1..e68b277 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -3,10 +3,10 @@ Description: Make the python code python2-3 agnostic.
Last-Updated:2013-12-09
Forwarded: no
-Index: adios-1.5.0/utils/skel/bin/skel
+Index: adios.git/utils/skel/bin/skel
===================================================================
---- adios-1.5.0.orig/utils/skel/bin/skel 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/skel/bin/skel 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/utils/skel/bin/skel 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/skel/bin/skel 2013-12-09 18:45:13.000000000 +0000
@@ -1,5 +1,7 @@
#!/usr/bin/env python
@@ -44,10 +44,10 @@ Index: adios-1.5.0/utils/skel/bin/skel
if __name__ == "__main__":
-Index: adios-1.5.0/utils/skel/bin/skel_extract.py
+Index: adios.git/utils/skel/bin/skel_extract.py
===================================================================
---- adios-1.5.0.orig/utils/skel/bin/skel_extract.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/skel/bin/skel_extract.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/utils/skel/bin/skel_extract.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/skel/bin/skel_extract.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -64,10 +64,10 @@ Index: adios-1.5.0/utils/skel/bin/skel_extract.py
return
#Print the header
-Index: adios-1.5.0/utils/skel/lib/skelconf.py
+Index: adios.git/utils/skel/lib/skelconf.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skelconf.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skelconf.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/utils/skel/lib/skelconf.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/skel/lib/skelconf.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,5 +1,5 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
import xml.dom.minidom
@@ -84,10 +84,10 @@ Index: adios-1.5.0/utils/skel/lib/skelconf.py
raise SystemExit
self.config_node = nodes[0]
-Index: adios-1.5.0/utils/gpp/ad_config.py
+Index: adios.git/utils/gpp/ad_config.py
===================================================================
---- adios-1.5.0.orig/utils/gpp/ad_config.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/gpp/ad_config.py 2013-12-09 15:59:59.000000000 +0000
+--- adios.git.orig/utils/gpp/ad_config.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/gpp/ad_config.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
import xml.dom.minidom
@@ -129,10 +129,10 @@ Index: adios-1.5.0/utils/gpp/ad_config.py
cleandims = []
for d in dims:
-Index: adios-1.5.0/utils/gpp/gpp.py
+Index: adios.git/utils/gpp/gpp.py
===================================================================
---- adios-1.5.0.orig/utils/gpp/gpp.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/gpp/gpp.py 2013-12-09 15:57:58.000000000 +0000
+--- adios.git.orig/utils/gpp/gpp.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/gpp/gpp.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -171,10 +171,10 @@ Index: adios-1.5.0/utils/gpp/gpp.py
raise SystemExit
-Index: adios-1.5.0/utils/skel/lib/adios.py
+Index: adios.git/utils/skel/lib/adios.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/adios.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/adios.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/utils/skel/lib/adios.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/skel/lib/adios.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,5 +1,5 @@
+from __future__ import print_function
import xml.dom.minidom
@@ -209,10 +209,10 @@ Index: adios-1.5.0/utils/skel/lib/adios.py
cleandims = []
for d in dims:
-Index: adios-1.5.0/utils/skel/lib/argparse.py
+Index: adios.git/utils/skel/lib/argparse.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/argparse.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/argparse.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/utils/skel/lib/argparse.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/skel/lib/argparse.py 2013-12-09 18:45:14.000000000 +0000
@@ -81,7 +81,6 @@
'ZERO_OR_MORE',
]
@@ -221,10 +221,10 @@ Index: adios-1.5.0/utils/skel/lib/argparse.py
import copy as _copy
import os as _os
import re as _re
-Index: adios-1.5.0/utils/skel/lib/skel_install.py
+Index: adios.git/utils/skel/lib/skel_install.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_install.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_install.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/utils/skel/lib/skel_install.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/skel/lib/skel_install.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -232,10 +232,10 @@ Index: adios-1.5.0/utils/skel/lib/skel_install.py
import skel_settings
def main(argv=None):
-Index: adios-1.5.0/utils/skel/lib/skel_makefile.py
+Index: adios.git/utils/skel/lib/skel_makefile.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_makefile.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_makefile.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/utils/skel/lib/skel_makefile.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/skel/lib/skel_makefile.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,5 +1,7 @@
#!/usr/bin/env python
@@ -257,20 +257,20 @@ Index: adios-1.5.0/utils/skel/lib/skel_makefile.py
generate_makefiles_fortran (params)
-Index: adios-1.5.0/utils/skel/lib/skel_params.py
+Index: adios.git/utils/skel/lib/skel_params.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_params.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_params.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/utils/skel/lib/skel_params.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/skel/lib/skel_params.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
import sys
import os
import argparse
-Index: adios-1.5.0/utils/skel/lib/skel_settings.py
+Index: adios.git/utils/skel/lib/skel_settings.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_settings.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_settings.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/utils/skel/lib/skel_settings.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/skel/lib/skel_settings.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -298,10 +298,10 @@ Index: adios-1.5.0/utils/skel/lib/skel_settings.py
def main(argv=None):
-Index: adios-1.5.0/utils/skel/lib/skel_source.py
+Index: adios.git/utils/skel/lib/skel_source.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_source.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_source.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/utils/skel/lib/skel_source.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/skel/lib/skel_source.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -417,10 +417,10 @@ Index: adios-1.5.0/utils/skel/lib/skel_source.py
frees.add ('\nfree (' + v.get_gwrite() + ');')
for f in frees:
-Index: adios-1.5.0/utils/skel/lib/skel_submit.py
+Index: adios.git/utils/skel/lib/skel_submit.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_submit.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_submit.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/utils/skel/lib/skel_submit.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/skel/lib/skel_submit.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -428,10 +428,10 @@ Index: adios-1.5.0/utils/skel/lib/skel_submit.py
import argparse
import os
-Index: adios-1.5.0/utils/skel/lib/skel_xml.py
+Index: adios.git/utils/skel/lib/skel_xml.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_xml.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_xml.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/utils/skel/lib/skel_xml.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/utils/skel/lib/skel_xml.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -439,20 +439,20 @@ Index: adios-1.5.0/utils/skel/lib/skel_xml.py
import argparse
import xml.dom.minidom
-Index: adios-1.5.0/wrappers/numpy/example/ncdf2bp.py
+Index: adios.git/wrappers/numpy/example/ncdf2bp.py
===================================================================
---- adios-1.5.0.orig/wrappers/numpy/example/ncdf2bp.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/wrappers/numpy/example/ncdf2bp.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/wrappers/numpy/example/ncdf2bp.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/wrappers/numpy/example/ncdf2bp.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
from adios import *
from scipy.io import netcdf
import numpy as np
-Index: adios-1.5.0/wrappers/numpy/test/adios_noxml_test.py
+Index: adios.git/wrappers/numpy/test/adios_noxml_test.py
===================================================================
---- adios-1.5.0.orig/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -468,10 +468,10 @@ Index: adios-1.5.0/wrappers/numpy/test/adios_noxml_test.py
set_group_size(fd, groupsize)
write_int(fd, "NX", NX)
write_int(fd, "size", size)
-Index: adios-1.5.0/wrappers/numpy/test/adios_read_test.py
+Index: adios.git/wrappers/numpy/test/adios_read_test.py
===================================================================
---- adios-1.5.0.orig/wrappers/numpy/test/adios_read_test.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/wrappers/numpy/test/adios_read_test.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/wrappers/numpy/test/adios_read_test.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/wrappers/numpy/test/adios_read_test.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+
@@ -486,10 +486,10 @@ Index: adios-1.5.0/wrappers/numpy/test/adios_read_test.py
+print(v.read())
f.close()
-Index: adios-1.5.0/wrappers/numpy/test/adios_write_test.py
+Index: adios.git/wrappers/numpy/test/adios_write_test.py
===================================================================
---- adios-1.5.0.orig/wrappers/numpy/test/adios_write_test.py 2013-12-09 15:47:49.000000000 +0000
-+++ adios-1.5.0/wrappers/numpy/test/adios_write_test.py 2013-12-09 15:47:55.000000000 +0000
+--- adios.git.orig/wrappers/numpy/test/adios_write_test.py 2013-12-09 18:45:14.000000000 +0000
++++ adios.git/wrappers/numpy/test/adios_write_test.py 2013-12-09 18:45:14.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
diff --git a/debian/patches/security.patch b/debian/patches/security.patch
index 02d8099..df00613 100644
--- a/debian/patches/security.patch
+++ b/debian/patches/security.patch
@@ -1,8 +1,8 @@
-Index: adios-1.3/utils/bpls/bpls.c
+Index: adios.git/utils/bpls/bpls.c
===================================================================
---- adios-1.3.orig/utils/bpls/bpls.c 2012-03-05 13:40:01.000000000 +0000
-+++ adios-1.3/utils/bpls/bpls.c 2012-03-05 13:55:10.000000000 +0000
-@@ -364,7 +364,7 @@
+--- adios.git.orig/utils/bpls/bpls.c 2013-12-09 18:45:05.000000000 +0000
++++ adios.git/utils/bpls/bpls.c 2013-12-09 18:45:04.000000000 +0000
+@@ -374,7 +374,7 @@
#define PRINT_DIMS(str, v, n, loopvar) printf("%s = { ", str); \
@@ -11,7 +11,7 @@ Index: adios-1.3/utils/bpls/bpls.c
printf("}")
void printSettings(void) {
-@@ -756,7 +756,7 @@
+@@ -850,7 +850,7 @@
strcat(xtics, ")\n");
fprintf(out_plot, "start = -0.5\npos(x) = start + x * 1\nset boxwidth 1\nset style fill solid border 5#5lt6#6\n");
@@ -20,7 +20,7 @@ Index: adios-1.3/utils/bpls/bpls.c
fprintf(out_plot, "plot '%s' using 3 smooth frequency w boxes\n", hist_file);
fprintf(out_plot, "pause -1 'Press Enter to quit'\n");
}
-@@ -1283,7 +1283,7 @@
+@@ -1425,7 +1425,7 @@
case adios_long_double:
//fprintf(outf,(f ? format : "%g "), ((double *) data)[item]);
@@ -29,7 +29,7 @@ Index: adios-1.3/utils/bpls/bpls.c
break;
// TO DO
-@@ -1351,7 +1351,7 @@
+@@ -1493,7 +1493,7 @@
case adios_long_double:
//fprintf(outf,(f ? format : "%g "), ((double *) data)[item]);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git
More information about the debian-science-commits
mailing list