[adios] 91/207: Refresh patch
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:43 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 35f8e0c7042cb71011a306a757cb8acb7ce08138
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Feb 19 05:46:48 2014 +0000
Refresh patch
---
debian/patches/python3.patch | 92 +++++++++++++++++++++++++++-----------------
1 file changed, 56 insertions(+), 36 deletions(-)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index b27ed52..b51d977 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -5,8 +5,8 @@ Forwarded: no
Index: adios-1.6.0/utils/skel/bin/skel
===================================================================
---- adios-1.6.0.orig/utils/skel/bin/skel 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/skel/bin/skel 2014-02-17 09:37:08.563121337 +0000
+--- adios-1.6.0.orig/utils/skel/bin/skel 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/skel/bin/skel 2014-02-19 05:45:34.575412865 +0000
@@ -1,5 +1,7 @@
#!/usr/bin/env python
@@ -35,8 +35,8 @@ Index: adios-1.6.0/utils/skel/bin/skel
if __name__ == "__main__":
Index: adios-1.6.0/utils/skel/bin/skel_extract.py
===================================================================
---- adios-1.6.0.orig/utils/skel/bin/skel_extract.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/skel/bin/skel_extract.py 2014-02-17 09:37:08.563121337 +0000
+--- adios-1.6.0.orig/utils/skel/bin/skel_extract.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/skel/bin/skel_extract.py 2014-02-19 05:45:34.575412865 +0000
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -55,8 +55,8 @@ Index: adios-1.6.0/utils/skel/bin/skel_extract.py
#Print the header
Index: adios-1.6.0/utils/skel/lib/skelconf.py
===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skelconf.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/skel/lib/skelconf.py 2014-02-17 09:37:08.563121337 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skelconf.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/skel/lib/skelconf.py 2014-02-19 05:45:34.575412865 +0000
@@ -1,5 +1,5 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
import xml.dom.minidom
@@ -75,8 +75,8 @@ Index: adios-1.6.0/utils/skel/lib/skelconf.py
Index: adios-1.6.0/utils/gpp/ad_config.py
===================================================================
---- adios-1.6.0.orig/utils/gpp/ad_config.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/gpp/ad_config.py 2014-02-17 09:37:08.567119882 +0000
+--- adios-1.6.0.orig/utils/gpp/ad_config.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/gpp/ad_config.py 2014-02-19 05:45:34.579412965 +0000
@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
import xml.dom.minidom
@@ -111,8 +111,8 @@ Index: adios-1.6.0/utils/gpp/ad_config.py
for d in dims:
Index: adios-1.6.0/utils/gpp/gpp.py
===================================================================
---- adios-1.6.0.orig/utils/gpp/gpp.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/gpp/gpp.py 2014-02-17 09:37:08.567119882 +0000
+--- adios-1.6.0.orig/utils/gpp/gpp.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/gpp/gpp.py 2014-02-19 05:45:34.579412965 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -153,8 +153,8 @@ Index: adios-1.6.0/utils/gpp/gpp.py
Index: adios-1.6.0/utils/skel/lib/adios.py
===================================================================
---- adios-1.6.0.orig/utils/skel/lib/adios.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/skel/lib/adios.py 2014-02-17 09:37:08.567119882 +0000
+--- adios-1.6.0.orig/utils/skel/lib/adios.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/skel/lib/adios.py 2014-02-19 05:45:34.579412965 +0000
@@ -1,5 +1,5 @@
+from __future__ import print_function
import xml.dom.minidom
@@ -191,8 +191,8 @@ Index: adios-1.6.0/utils/skel/lib/adios.py
Index: adios-1.6.0/utils/skel/lib/argparse.py
===================================================================
---- adios-1.6.0.orig/utils/skel/lib/argparse.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/skel/lib/argparse.py 2014-02-17 09:37:08.567119882 +0000
+--- adios-1.6.0.orig/utils/skel/lib/argparse.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/skel/lib/argparse.py 2014-02-19 05:45:34.579412965 +0000
@@ -81,7 +81,6 @@
'ZERO_OR_MORE',
]
@@ -203,8 +203,8 @@ Index: adios-1.6.0/utils/skel/lib/argparse.py
import re as _re
Index: adios-1.6.0/utils/skel/lib/skel_install.py
===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_install.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_install.py 2014-02-17 09:37:08.571118424 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_install.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/skel/lib/skel_install.py 2014-02-19 05:45:34.583413063 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -214,8 +214,8 @@ Index: adios-1.6.0/utils/skel/lib/skel_install.py
def main(argv=None):
Index: adios-1.6.0/utils/skel/lib/skel_makefile.py
===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_makefile.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_makefile.py 2014-02-17 09:37:08.571118424 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_makefile.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/skel/lib/skel_makefile.py 2014-02-19 05:45:34.583413063 +0000
@@ -1,5 +1,7 @@
#!/usr/bin/env python
@@ -239,8 +239,8 @@ Index: adios-1.6.0/utils/skel/lib/skel_makefile.py
Index: adios-1.6.0/utils/skel/lib/skel_params.py
===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_params.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_params.py 2014-02-17 09:37:08.571118424 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_params.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/skel/lib/skel_params.py 2014-02-19 05:45:34.583413063 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -249,8 +249,8 @@ Index: adios-1.6.0/utils/skel/lib/skel_params.py
import argparse
Index: adios-1.6.0/utils/skel/lib/skel_settings.py
===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_settings.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_settings.py 2014-02-17 09:37:08.571118424 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_settings.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/skel/lib/skel_settings.py 2014-02-19 05:45:34.583413063 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -280,8 +280,8 @@ Index: adios-1.6.0/utils/skel/lib/skel_settings.py
def main(argv=None):
Index: adios-1.6.0/utils/skel/lib/skel_source.py
===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_source.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_source.py 2014-02-17 09:37:08.575116968 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_source.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/skel/lib/skel_source.py 2014-02-19 05:45:34.583413063 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -399,8 +399,8 @@ Index: adios-1.6.0/utils/skel/lib/skel_source.py
for f in frees:
Index: adios-1.6.0/utils/skel/lib/skel_submit.py
===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_submit.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_submit.py 2014-02-17 09:37:08.575116968 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_submit.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/skel/lib/skel_submit.py 2014-02-19 05:46:22.448723232 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -408,10 +408,30 @@ Index: adios-1.6.0/utils/skel/lib/skel_submit.py
import argparse
import os
+@@ -123,7 +123,7 @@
+
+ # Only proceed if outfilename does not already exist, or if -f was used
+ if os.path.exists (outfilename) and not args.force:
+- print "%s exists, aborting. Delete the file or use -f to overwrite." % outfilename
++ print( "%s exists, aborting. Delete the file or use -f to overwrite." % outfilename)
+ return 999
+
+ skel_file = open (outfilename, 'w')
+@@ -157,8 +157,8 @@
+ try:
+ params = skelconf.skelConfig (args.project + '_params.xml')
+ except (IOError):
+- print "Error reading " + args.project + "_params.xml. Try running skel params " + args.project + " first,"
+- print "then check that " + args.project + "_params.xml exists."
++ print("Error reading " + args.project + "_params.xml. Try running skel params " + args.project + " first,")
++ print("then check that " + args.project + "_params.xml exists.")
+ return 1
+
+ generate_submit_scripts_from_xml (params)
Index: adios-1.6.0/utils/skel/lib/skel_xml.py
===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_xml.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_xml.py 2014-02-17 09:37:08.575116968 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_xml.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/utils/skel/lib/skel_xml.py 2014-02-19 05:45:34.583413063 +0000
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -421,8 +441,8 @@ Index: adios-1.6.0/utils/skel/lib/skel_xml.py
import xml.dom.minidom
Index: adios-1.6.0/wrappers/numpy/example/ncdf2bp.py
===================================================================
---- adios-1.6.0.orig/wrappers/numpy/example/ncdf2bp.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/wrappers/numpy/example/ncdf2bp.py 2014-02-17 09:37:08.575116968 +0000
+--- adios-1.6.0.orig/wrappers/numpy/example/ncdf2bp.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/wrappers/numpy/example/ncdf2bp.py 2014-02-19 05:45:34.587413165 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -431,8 +451,8 @@ Index: adios-1.6.0/wrappers/numpy/example/ncdf2bp.py
import numpy as np
Index: adios-1.6.0/wrappers/numpy/test/adios_noxml_test.py
===================================================================
---- adios-1.6.0.orig/wrappers/numpy/test/adios_noxml_test.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/wrappers/numpy/test/adios_noxml_test.py 2014-02-17 09:37:08.579115520 +0000
+--- adios-1.6.0.orig/wrappers/numpy/test/adios_noxml_test.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/wrappers/numpy/test/adios_noxml_test.py 2014-02-19 05:45:34.587413165 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -450,8 +470,8 @@ Index: adios-1.6.0/wrappers/numpy/test/adios_noxml_test.py
write_int(fd, "size", size)
Index: adios-1.6.0/wrappers/numpy/test/adios_read_test.py
===================================================================
---- adios-1.6.0.orig/wrappers/numpy/test/adios_read_test.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/wrappers/numpy/test/adios_read_test.py 2014-02-17 09:37:08.579115520 +0000
+--- adios-1.6.0.orig/wrappers/numpy/test/adios_read_test.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/wrappers/numpy/test/adios_read_test.py 2014-02-19 05:45:34.587413165 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+
@@ -468,8 +488,8 @@ Index: adios-1.6.0/wrappers/numpy/test/adios_read_test.py
f.close()
Index: adios-1.6.0/wrappers/numpy/test/adios_write_test.py
===================================================================
---- adios-1.6.0.orig/wrappers/numpy/test/adios_write_test.py 2014-02-17 09:37:08.583114078 +0000
-+++ adios-1.6.0/wrappers/numpy/test/adios_write_test.py 2014-02-17 09:37:08.579115520 +0000
+--- adios-1.6.0.orig/wrappers/numpy/test/adios_write_test.py 2014-02-19 05:45:34.591413273 +0000
++++ adios-1.6.0/wrappers/numpy/test/adios_write_test.py 2014-02-19 05:45:34.587413165 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
--
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