[adios] 186/207: WIP: update patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:58 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 d44611b17161567ac1e60ef90f71cebe636ccd09
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun May 3 10:46:25 2015 +0100
WIP: update patches
---
debian/patches/debian_paths.patch | 37 +++-----
debian/patches/exclude-cmake.patch | 41 +++------
debian/patches/mpi4py_fix.patch | 16 ++--
debian/patches/netcdf-fix.patch | 10 +--
debian/patches/pkgconfig.patch | 53 +++++++----
debian/patches/python3.patch | 180 +++++++++++++++++++++++--------------
debian/patches/series | 2 +-
7 files changed, 186 insertions(+), 153 deletions(-)
diff --git a/debian/patches/debian_paths.patch b/debian/patches/debian_paths.patch
index 9a45479..3d878a5 100644
--- a/debian/patches/debian_paths.patch
+++ b/debian/patches/debian_paths.patch
@@ -3,10 +3,10 @@ Description: Change paths to match Debian and FHS
Forwarded: no
Last-Updated: 2013-12-09
-Index: adios-1.7.0/utils/skel/lib/skel_makefile.py
+Index: adios-1.8.0/utils/skel/lib/skel_makefile.py
===================================================================
---- adios-1.7.0.orig/utils/skel/lib/skel_makefile.py
-+++ adios-1.7.0/utils/skel/lib/skel_makefile.py
+--- adios-1.8.0.orig/utils/skel/lib/skel_makefile.py
++++ adios-1.8.0/utils/skel/lib/skel_makefile.py
@@ -67,7 +67,7 @@ def generate_makefile_from_yaml (args):
# Only proceed if outfilename does not already exist, or if -f was used
@@ -25,10 +25,10 @@ Index: adios-1.7.0/utils/skel/lib/skel_makefile.py
bindir = os.path.abspath(os.path.dirname(sys.argv[0]))
-Index: adios-1.7.0/utils/skel/lib/skel_settings.py
+Index: adios-1.8.0/utils/skel/lib/skel_settings.py
===================================================================
---- adios-1.7.0.orig/utils/skel/lib/skel_settings.py
-+++ adios-1.7.0/utils/skel/lib/skel_settings.py
+--- adios-1.8.0.orig/utils/skel/lib/skel_settings.py
++++ adios-1.8.0/utils/skel/lib/skel_settings.py
@@ -54,7 +54,7 @@ def create_settings_dir_if_needed():
skel_settings_dir_name = os.path.expanduser ('~/.skel')
if not os.path.exists (skel_settings_dir_name):
@@ -38,10 +38,10 @@ Index: adios-1.7.0/utils/skel/lib/skel_settings.py
print('Created ' + skel_settings_dir_name)
-Index: adios-1.7.0/utils/gpp/ad_config.py
+Index: adios-1.8.0/utils/gpp/ad_config.py
===================================================================
---- adios-1.7.0.orig/utils/gpp/ad_config.py
-+++ adios-1.7.0/utils/gpp/ad_config.py
+--- adios-1.8.0.orig/utils/gpp/ad_config.py
++++ adios-1.8.0/utils/gpp/ad_config.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
from __future__ import absolute_import, division, print_function, unicode_literals
@@ -56,26 +56,13 @@ Index: adios-1.7.0/utils/gpp/ad_config.py
return self.vardict [varfullpath]
return None
-Index: adios-1.7.0/utils/gpp/type_mapper.py
+Index: adios-1.8.0/utils/gpp/type_mapper.py
===================================================================
---- adios-1.7.0.orig/utils/gpp/type_mapper.py
-+++ adios-1.7.0/utils/gpp/type_mapper.py
+--- adios-1.8.0.orig/utils/gpp/type_mapper.py
++++ adios-1.8.0/utils/gpp/type_mapper.py
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env python
c_types = {
'string' : 'string',
-Index: adios-1.7.0/utils/skel/bin/skel_extract.py
-===================================================================
---- adios-1.7.0.orig/utils/skel/bin/skel_extract.py
-+++ adios-1.7.0/utils/skel/bin/skel_extract.py
-@@ -113,7 +113,7 @@ def extract_R (skel_output, select, rank
- # check the selected fields
- for field in selected_fields:
- if not field in keys:
-- print 'Invalid selection, field ' + field
-+ print('Invalid selection, field ' + field)
- return
-
- #Print the header
diff --git a/debian/patches/exclude-cmake.patch b/debian/patches/exclude-cmake.patch
index 69b0b74..6934b5e 100644
--- a/debian/patches/exclude-cmake.patch
+++ b/debian/patches/exclude-cmake.patch
@@ -23,12 +23,12 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
-Index: adios-1.7.0/Makefile.am
+Index: adios-1.8.0/Makefile.am
===================================================================
---- adios-1.7.0.orig/Makefile.am
-+++ adios-1.7.0/Makefile.am
-@@ -7,8 +7,7 @@ EXTRA_DIST = runconf \
- adios_config \
+--- adios-1.8.0.orig/Makefile.am
++++ adios-1.8.0/Makefile.am
+@@ -8,8 +8,7 @@ EXTRA_DIST = runconf \
+ adios.pc.in \
scripts/create.nssi.config.sh \
scripts/kill.nssi.staging.sh \
- scripts/start.nssi.staging.sh \
@@ -37,19 +37,7 @@ Index: adios-1.7.0/Makefile.am
# wrappers/matlab/Makefile \
# wrappers/matlab/adios.m \
-@@ -17,9 +16,9 @@ EXTRA_DIST = runconf \
- # wrappers/matlab/adiosread.m \
- # wrappers/matlab/adiosclosec.c \
- # wrappers/matlab/adiosopenc.c \
--# wrappers/matlab/adiosreadc.c
-+# wrappers/matlab/adiosreadc.c
-
--bin_SCRIPTS = adios_config
-+bin_SCRIPTS = adios_config
-
- if HAVE_NSSI
- bin_SCRIPTS += scripts/create.nssi.config.sh \
-@@ -27,7 +26,7 @@ if HAVE_NSSI
+@@ -28,7 +27,7 @@ if HAVE_NSSI
scripts/start.nssi.staging.sh
endif
@@ -58,11 +46,11 @@ Index: adios-1.7.0/Makefile.am
#install-data-hook:
# echo -n "VERSIONSTRING=\"$(PACKAGE) version $(VERSION) svn revision " >> adios_config.flags
-Index: adios-1.7.0/Makefile.in
+Index: adios-1.8.0/Makefile.in
===================================================================
---- adios-1.7.0.orig/Makefile.in
-+++ adios-1.7.0/Makefile.in
-@@ -422,8 +422,7 @@ EXTRA_DIST = runconf \
+--- adios-1.8.0.orig/Makefile.in
++++ adios-1.8.0/Makefile.in
+@@ -436,8 +436,7 @@ EXTRA_DIST = runconf \
adios.pc \
scripts/create.nssi.config.sh \
scripts/kill.nssi.staging.sh \
@@ -72,12 +60,3 @@ Index: adios-1.7.0/Makefile.in
# wrappers/matlab/Makefile \
-@@ -435,7 +434,7 @@ EXTRA_DIST = runconf \
- # wrappers/matlab/adiosopenc.c \
- # wrappers/matlab/adiosreadc.c
- bin_SCRIPTS = adios_config $(am__append_1)
--sysconf_DATA = scripts/FindADIOS.cmake
-+sysconf_DATA =
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
diff --git a/debian/patches/mpi4py_fix.patch b/debian/patches/mpi4py_fix.patch
index 16794fd..0538c18 100644
--- a/debian/patches/mpi4py_fix.patch
+++ b/debian/patches/mpi4py_fix.patch
@@ -3,23 +3,23 @@ Description: Fix for missing MPI_Message in MPI < 3
Last-Updated: 2014-05-19
Forwarded: no
-Index: adios-1.7.0/wrappers/numpy/adios.pyx
+Index: adios-1.8.0/wrappers/numpy/adios.pyx
===================================================================
---- adios-1.7.0.orig/wrappers/numpy/adios.pyx
-+++ adios-1.7.0/wrappers/numpy/adios.pyx
-@@ -17,6 +17,8 @@ cimport numpy as np
- ##import mpi4py.MPI as MPI
- ##cimport mpi4py.MPI as MPI
+--- adios-1.8.0.orig/wrappers/numpy/adios.pyx
++++ adios-1.8.0/wrappers/numpy/adios.pyx
+@@ -15,6 +15,8 @@ cimport numpy as np
+ #import mpi4py.MPI_as MPI_
+ #cimport mpi4py.MPI_as MPI
+cdef extern from '../compat.h': pass
+
import cython
cimport cython
-Index: adios-1.7.0/wrappers/numpy/compat.h
+Index: adios-1.8.0/wrappers/numpy/compat.h
===================================================================
--- /dev/null
-+++ adios-1.7.0/wrappers/numpy/compat.h
++++ adios-1.8.0/wrappers/numpy/compat.h
@@ -0,0 +1,9 @@
+/* Added to fix missing MPI_Message in older openmpi on Debian, etc
+ * Added mckinstry at debian.org, 2014-05-19
diff --git a/debian/patches/netcdf-fix.patch b/debian/patches/netcdf-fix.patch
index 60f1082..d427f06 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.7.0/utils/bp2ncd/Makefile.in
+Index: adios-1.8.0/utils/bp2ncd/Makefile.in
===================================================================
---- adios-1.7.0.orig/utils/bp2ncd/Makefile.in
-+++ adios-1.7.0/utils/bp2ncd/Makefile.in
-@@ -109,12 +109,12 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
+--- adios-1.8.0.orig/utils/bp2ncd/Makefile.in
++++ adios-1.8.0/utils/bp2ncd/Makefile.in
+@@ -115,12 +115,12 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
ACLOCAL = @ACLOCAL@
ADIOSLIB_CFLAGS = @ADIOSLIB_CFLAGS@
ADIOSLIB_CPPFLAGS = @ADIOSLIB_CPPFLAGS@
@@ -23,7 +23,7 @@ Index: adios-1.7.0/utils/bp2ncd/Makefile.in
ADIOSLIB_LDFLAGS = @ADIOSLIB_LDFLAGS@
ADIOSLIB_SEQ_CFLAGS = @ADIOSLIB_SEQ_CFLAGS@
ADIOSLIB_SEQ_CPPFLAGS = @ADIOSLIB_SEQ_CPPFLAGS@
-@@ -367,7 +367,7 @@ bp2ncd_SOURCES = bp2ncd.c
+@@ -380,7 +380,7 @@ bp2ncd_SOURCES = bp2ncd.c
@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/pkgconfig.patch b/debian/patches/pkgconfig.patch
index 541924b..741848a 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -3,10 +3,10 @@ Description: pkgconfig support for ADIOS in Debian
Last-Updated: 2014-06-15
Forwarded: no
-Index: adios-1.7.0/adios.pc.in
+Index: adios-1.8.0/adios.pc.in
===================================================================
--- /dev/null
-+++ adios-1.7.0/adios.pc.in
++++ adios-1.8.0/adios.pc.in
@@ -0,0 +1,53 @@
+# Standard defines for pkg-config
+prefix=@prefix@
@@ -61,36 +61,57 @@ Index: adios-1.7.0/adios.pc.in
+Cflags: -I${prefix}/include @ADIOSLIB_CPPFLAGS@ @ADIOSLIB_CFLAGS@
+Libs: ${ADIOS_CLIB}
+Libs.private: -ldl
-Index: adios-1.7.0/configure.ac
+Index: adios-1.8.0/configure.ac
===================================================================
---- adios-1.7.0.orig/configure.ac
-+++ adios-1.7.0/configure.ac
-@@ -747,6 +747,7 @@ AC_CONFIG_FILES([Makefile
- examples/Fortran/global-array/Makefile
- examples/Fortran/global-array-time/Makefile
+--- adios-1.8.0.orig/configure.ac
++++ adios-1.8.0/configure.ac
+@@ -830,6 +830,7 @@ AC_CONFIG_FILES([Makefile
+ examples/Fortran/schema/Makefile
+ adios_config
adios_config.flags
+ adios.pc
])
AC_OUTPUT
-Index: adios-1.7.0/Makefile.in
+Index: adios-1.8.0/Makefile.in
===================================================================
---- adios-1.7.0.orig/Makefile.in
-+++ adios-1.7.0/Makefile.in
-@@ -87,7 +87,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+--- adios-1.8.0.orig/Makefile.in
++++ adios-1.8.0/Makefile.in
+@@ -94,7 +94,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = utils/skel/lib/skel_have_adios_timing.py \
-- adios_config.flags
-+ adios_config.flags adios.pc
+- adios_config adios_config.flags
++ adios_config adios_config.flags adios.pc
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
-@@ -419,6 +419,7 @@ SUBDIRS = src utils tests examples
+@@ -433,6 +433,7 @@ SUBDIRS = src utils tests examples
EXTRA_DIST = runconf \
KNOWN_BUGS \
- adios_config \
+ adios_config.in \
+ adios.pc \
scripts/create.nssi.config.sh \
scripts/kill.nssi.staging.sh \
scripts/start.nssi.staging.sh \
+Index: adios-1.8.0/Makefile.am
+===================================================================
+--- adios-1.8.0.orig/Makefile.am
++++ adios-1.8.0/Makefile.am
+@@ -5,6 +5,7 @@ SUBDIRS=src utils tests examples
+ EXTRA_DIST = runconf \
+ KNOWN_BUGS \
+ adios_config.in \
++ adios.pc.in \
+ scripts/create.nssi.config.sh \
+ scripts/kill.nssi.staging.sh \
+ scripts/start.nssi.staging.sh \
+@@ -19,7 +20,7 @@ EXTRA_DIST = runconf \
+ # wrappers/matlab/adiosopenc.c \
+ # wrappers/matlab/adiosreadc.c
+
+-bin_SCRIPTS = adios_config
++bin_SCRIPTS = adios_config
+
+ if HAVE_NSSI
+ bin_SCRIPTS += scripts/create.nssi.config.sh \
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 92e32f0..0360bc5 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:2014-06-14
Forwarded: no
-Index: adios-1.7.0/utils/skel/bin/skel
+Index: adios-1.8.0/utils/skel/bin/skel
===================================================================
---- adios-1.7.0.orig/utils/skel/bin/skel
-+++ adios-1.7.0/utils/skel/bin/skel
+--- adios-1.8.0.orig/utils/skel/bin/skel
++++ adios-1.8.0/utils/skel/bin/skel
@@ -1,5 +1,7 @@
#!/usr/bin/env python
@@ -15,19 +15,19 @@ Index: adios-1.7.0/utils/skel/bin/skel
import sys
import os.path
-@@ -154,7 +156,7 @@ def main(argv=None):
- skel_submit.generate_submit_scripts_with_args (parser)
- return 0
-
-- print 'Unknown subcommand, exiting.'
-+ print('Unknown subcommand, exiting.')
-
+@@ -56,7 +58,7 @@ def main(argv=None):
+ skel_settings.create_settings_dir_if_needed()
+ parser = get_parser()
- if __name__ == "__main__":
-Index: adios-1.7.0/utils/skel/bin/skel_extract.py
+- # Look for skel help (or no args), and print the list of subcommands...
++ # Look fo( skel help (or no args), and print the list of subcommands...
+ if (len(sys.argv) == 1) or (sys.argv[1] == 'help' and len(sys.argv) == 2):
+ print parser.description
+ return 0
+Index: adios-1.8.0/utils/skel/bin/skel_extract.py
===================================================================
---- adios-1.7.0.orig/utils/skel/bin/skel_extract.py
-+++ adios-1.7.0/utils/skel/bin/skel_extract.py
+--- adios-1.8.0.orig/utils/skel/bin/skel_extract.py
++++ adios-1.8.0/utils/skel/bin/skel_extract.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -60,10 +60,10 @@ Index: adios-1.7.0/utils/skel/bin/skel_extract.py
return iteration
-Index: adios-1.7.0/utils/skel/lib/skelconf.py
+Index: adios-1.8.0/utils/skel/lib/skelconf.py
===================================================================
---- adios-1.7.0.orig/utils/skel/lib/skelconf.py
-+++ adios-1.7.0/utils/skel/lib/skelconf.py
+--- adios-1.8.0.orig/utils/skel/lib/skelconf.py
++++ adios-1.8.0/utils/skel/lib/skelconf.py
@@ -1,5 +1,5 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
import xml.dom.minidom
@@ -80,10 +80,10 @@ Index: adios-1.7.0/utils/skel/lib/skelconf.py
raise SystemExit
self.config_node = nodes[0]
-Index: adios-1.7.0/utils/gpp/ad_config.py
+Index: adios-1.8.0/utils/gpp/ad_config.py
===================================================================
---- adios-1.7.0.orig/utils/gpp/ad_config.py
-+++ adios-1.7.0/utils/gpp/ad_config.py
+--- adios-1.8.0.orig/utils/gpp/ad_config.py
++++ adios-1.8.0/utils/gpp/ad_config.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
import xml.dom.minidom
@@ -116,10 +116,10 @@ Index: adios-1.7.0/utils/gpp/ad_config.py
cleandims = []
#print ' get_dimensions of var '+self.get_fullpath()
for d in dims:
-Index: adios-1.7.0/utils/gpp/gpp.py
+Index: adios-1.8.0/utils/gpp/gpp.py
===================================================================
---- adios-1.7.0.orig/utils/gpp/gpp.py
-+++ adios-1.7.0/utils/gpp/gpp.py
+--- adios-1.8.0.orig/utils/gpp/gpp.py
++++ adios-1.8.0/utils/gpp/gpp.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -140,7 +140,7 @@ Index: adios-1.7.0/utils/gpp/gpp.py
return 'failure'
-@@ -244,7 +244,7 @@ def main (argv=None):
+@@ -247,7 +247,7 @@ def main (argv=None):
# Must be called with one argument, the name of the xml file
if len (sys.argv) != 2:
@@ -149,7 +149,7 @@ Index: adios-1.7.0/utils/gpp/gpp.py
return 1
-@@ -265,7 +265,7 @@ def main (argv=None):
+@@ -268,7 +268,7 @@ def main (argv=None):
elif lang == 'c' or lang == 'cpp':
generate_c (config)
else:
@@ -158,10 +158,10 @@ Index: adios-1.7.0/utils/gpp/gpp.py
raise SystemExit
-Index: adios-1.7.0/utils/skel/lib/adios.py
+Index: adios-1.8.0/utils/skel/lib/adios.py
===================================================================
---- adios-1.7.0.orig/utils/skel/lib/adios.py
-+++ adios-1.7.0/utils/skel/lib/adios.py
+--- adios-1.8.0.orig/utils/skel/lib/adios.py
++++ adios-1.8.0/utils/skel/lib/adios.py
@@ -1,5 +1,5 @@
+from __future__ import print_function
import xml.dom.minidom
@@ -196,10 +196,10 @@ Index: adios-1.7.0/utils/skel/lib/adios.py
cleandims = []
for d in dims:
-Index: adios-1.7.0/utils/skel/lib/argparse.py
+Index: adios-1.8.0/utils/skel/lib/argparse.py
===================================================================
---- adios-1.7.0.orig/utils/skel/lib/argparse.py
-+++ adios-1.7.0/utils/skel/lib/argparse.py
+--- adios-1.8.0.orig/utils/skel/lib/argparse.py
++++ adios-1.8.0/utils/skel/lib/argparse.py
@@ -81,7 +81,6 @@ __all__ = [
'ZERO_OR_MORE',
]
@@ -208,10 +208,10 @@ Index: adios-1.7.0/utils/skel/lib/argparse.py
import copy as _copy
import os as _os
import re as _re
-Index: adios-1.7.0/utils/skel/lib/skel_install.py
+Index: adios-1.8.0/utils/skel/lib/skel_install.py
===================================================================
---- adios-1.7.0.orig/utils/skel/lib/skel_install.py
-+++ adios-1.7.0/utils/skel/lib/skel_install.py
+--- adios-1.8.0.orig/utils/skel/lib/skel_install.py
++++ adios-1.8.0/utils/skel/lib/skel_install.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -219,10 +219,10 @@ Index: adios-1.7.0/utils/skel/lib/skel_install.py
import skel_settings
def main(argv=None):
-Index: adios-1.7.0/utils/skel/lib/skel_makefile.py
+Index: adios-1.8.0/utils/skel/lib/skel_makefile.py
===================================================================
---- adios-1.7.0.orig/utils/skel/lib/skel_makefile.py
-+++ adios-1.7.0/utils/skel/lib/skel_makefile.py
+--- adios-1.8.0.orig/utils/skel/lib/skel_makefile.py
++++ adios-1.8.0/utils/skel/lib/skel_makefile.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
@@ -264,10 +264,10 @@ Index: adios-1.7.0/utils/skel/lib/skel_makefile.py
generate_makefiles_fortran (params)
-Index: adios-1.7.0/utils/skel/lib/skel_params.py
+Index: adios-1.8.0/utils/skel/lib/skel_params.py
===================================================================
---- adios-1.7.0.orig/utils/skel/lib/skel_params.py
-+++ adios-1.7.0/utils/skel/lib/skel_params.py
+--- adios-1.8.0.orig/utils/skel/lib/skel_params.py
++++ adios-1.8.0/utils/skel/lib/skel_params.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -322,10 +322,10 @@ Index: adios-1.7.0/utils/skel/lib/skel_params.py
return 999
generate_param_file (args.project, outfilename, config, args.group)
-Index: adios-1.7.0/utils/skel/lib/skel_settings.py
+Index: adios-1.8.0/utils/skel/lib/skel_settings.py
===================================================================
---- adios-1.7.0.orig/utils/skel/lib/skel_settings.py
-+++ adios-1.7.0/utils/skel/lib/skel_settings.py
+--- adios-1.8.0.orig/utils/skel/lib/skel_settings.py
++++ adios-1.8.0/utils/skel/lib/skel_settings.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -353,10 +353,10 @@ Index: adios-1.7.0/utils/skel/lib/skel_settings.py
def main(argv=None):
-Index: adios-1.7.0/utils/skel/lib/skel_source.py
+Index: adios-1.8.0/utils/skel/lib/skel_source.py
===================================================================
---- adios-1.7.0.orig/utils/skel/lib/skel_source.py
-+++ adios-1.7.0/utils/skel/lib/skel_source.py
+--- adios-1.8.0.orig/utils/skel/lib/skel_source.py
++++ adios-1.8.0/utils/skel/lib/skel_source.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -510,10 +510,10 @@ Index: adios-1.7.0/utils/skel/lib/skel_source.py
return
# Determine the target language
-Index: adios-1.7.0/utils/skel/lib/skel_submit.py
+Index: adios-1.8.0/utils/skel/lib/skel_submit.py
===================================================================
---- adios-1.7.0.orig/utils/skel/lib/skel_submit.py
-+++ adios-1.7.0/utils/skel/lib/skel_submit.py
+--- adios-1.8.0.orig/utils/skel/lib/skel_submit.py
++++ adios-1.8.0/utils/skel/lib/skel_submit.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -550,10 +550,10 @@ Index: adios-1.7.0/utils/skel/lib/skel_submit.py
return 1
generate_submit_scripts_from_xml (params)
-Index: adios-1.7.0/utils/skel/lib/skel_xml.py
+Index: adios-1.8.0/utils/skel/lib/skel_xml.py
===================================================================
---- adios-1.7.0.orig/utils/skel/lib/skel_xml.py
-+++ adios-1.7.0/utils/skel/lib/skel_xml.py
+--- adios-1.8.0.orig/utils/skel/lib/skel_xml.py
++++ adios-1.8.0/utils/skel/lib/skel_xml.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -579,10 +579,10 @@ Index: adios-1.7.0/utils/skel/lib/skel_xml.py
return 999
skel_file = open (outfilename, 'w')
-Index: adios-1.7.0/wrappers/numpy/tests/test_adios.py
+Index: adios-1.8.0/wrappers/numpy/tests/test_adios.py
===================================================================
---- adios-1.7.0.orig/wrappers/numpy/tests/test_adios.py
-+++ adios-1.7.0/wrappers/numpy/tests/test_adios.py
+--- adios-1.8.0.orig/wrappers/numpy/tests/test_adios.py
++++ adios-1.8.0/wrappers/numpy/tests/test_adios.py
@@ -5,11 +5,12 @@ Example:
$ python ./test_adios.py
"""
@@ -636,10 +636,10 @@ Index: adios-1.7.0/wrappers/numpy/tests/test_adios.py
-print "\n>>> Done.\n"
+print("\n>>> Done.\n")
-Index: adios-1.7.0/wrappers/numpy/tests/test_adios_mpi.py
+Index: adios-1.8.0/wrappers/numpy/tests/test_adios_mpi.py
===================================================================
---- adios-1.7.0.orig/wrappers/numpy/tests/test_adios_mpi.py
-+++ adios-1.7.0/wrappers/numpy/tests/test_adios_mpi.py
+--- adios-1.8.0.orig/wrappers/numpy/tests/test_adios_mpi.py
++++ adios-1.8.0/wrappers/numpy/tests/test_adios_mpi.py
@@ -4,7 +4,7 @@ Example:
$ mpiexec -n 4 python ./test_adios_mpi.py
@@ -699,10 +699,10 @@ Index: adios-1.7.0/wrappers/numpy/tests/test_adios_mpi.py
- print "\n>>> Done.\n"
+ print( "\n>>> Done.\n")
-Index: adios-1.7.0/wrappers/numpy/tests/test_adios_timestep.py
+Index: adios-1.8.0/wrappers/numpy/tests/test_adios_timestep.py
===================================================================
---- adios-1.7.0.orig/wrappers/numpy/tests/test_adios_timestep.py
-+++ adios-1.7.0/wrappers/numpy/tests/test_adios_timestep.py
+--- adios-1.8.0.orig/wrappers/numpy/tests/test_adios_timestep.py
++++ adios-1.8.0/wrappers/numpy/tests/test_adios_timestep.py
@@ -4,12 +4,12 @@ Example:
$ python ./test_adios.py
@@ -759,10 +759,10 @@ Index: adios-1.7.0/wrappers/numpy/tests/test_adios_timestep.py
-print "\n>>> Done.\n"
+print("\n>>> Done.\n")
-Index: adios-1.7.0/wrappers/numpy/setup.py
+Index: adios-1.8.0/wrappers/numpy/setup.py
===================================================================
---- adios-1.7.0.orig/wrappers/numpy/setup.py
-+++ adios-1.7.0/wrappers/numpy/setup.py
+--- adios-1.8.0.orig/wrappers/numpy/setup.py
++++ adios-1.8.0/wrappers/numpy/setup.py
@@ -20,12 +20,14 @@ m1 = Extension('adios',
extra_objects = [])
@@ -780,10 +780,10 @@ Index: adios-1.7.0/wrappers/numpy/setup.py
if path.startswith('-L'):
m1.library_dirs.append(path.replace('-L', '', 1))
if path.startswith('-l'):
-Index: adios-1.7.0/wrappers/numpy/setup_mpi.py
+Index: adios-1.8.0/wrappers/numpy/setup_mpi.py
===================================================================
---- adios-1.7.0.orig/wrappers/numpy/setup_mpi.py
-+++ adios-1.7.0/wrappers/numpy/setup_mpi.py
+--- adios-1.8.0.orig/wrappers/numpy/setup_mpi.py
++++ adios-1.8.0/wrappers/numpy/setup_mpi.py
@@ -20,12 +20,14 @@ m1 = Extension('adios_mpi',
extra_objects = [])
@@ -801,3 +801,49 @@ Index: adios-1.7.0/wrappers/numpy/setup_mpi.py
if path.startswith('-L'):
m1.library_dirs.append(path.replace('-L', '', 1))
if path.startswith('-l'):
+Index: adios-1.8.0/utils/skel/bin/skel
+===================================================================
+--- adios-1.8.0.orig/utils/skel/bin/skel
++++ adios-1.8.0/utils/skel/bin/skel
+@@ -60,7 +60,7 @@ def main(argv=None):
+
+ # Look fo( skel help (or no args), and print the list of subcommands...
+ if (len(sys.argv) == 1) or (sys.argv[1] == 'help' and len(sys.argv) == 2):
+- print parser.description
++ print(parser.description)
+ return 0
+
+ # install does not require a project, so let's just check for it directly
+@@ -85,8 +85,8 @@ def main(argv=None):
+ elif sys.argv[2] == 'xml':
+ sys.argv = ["skel", "xml", "junk", "-h"]
+ else:
+- print "Unknown help topic"
+- print parser.description
++ print("Unknown help topic")
++ print(parser.description)
+ exit(1)
+
+ #args = parse_command_line()
+@@ -156,7 +156,7 @@ def main(argv=None):
+ return 0
+
+ # Unrecognized subcommand, print the help message
+- print parser.description
++ print(parser.description)
+ return 0
+
+
+Index: adios-1.8.0/utils/skel/bin/skel_extract.py
+===================================================================
+--- adios-1.8.0.orig/utils/skel/bin/skel_extract.py
++++ adios-1.8.0/utils/skel/bin/skel_extract.py
+@@ -113,7 +113,7 @@ def extract_R (skel_output, select, rank
+ # check the selected fields
+ for field in selected_fields:
+ if not field in keys:
+- print 'Invalid selection, field ' + field
++ print('Invalid selection, field ' + field)
+ return
+
+ #Print the header
diff --git a/debian/patches/series b/debian/patches/series
index 43c2d60..16c4c4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,4 @@ python3.patch
debian_paths.patch
mpi4py_fix.patch
pkgconfig.patch
-exclude-cmake.patch
+# exclude-cmake.patch
--
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